Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a44d5dc authored by Neal Nguyen's avatar Neal Nguyen
Browse files

Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources. 

Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code:
- database/DatabaseCursorTest.java
- database/DatabaseStatementTest.java
- net/UriTest.java
parent 35ec7863

core/tests/coretests/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -5,10 +5,14 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests



# Include all test java files.

LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_SRC_FILES := \

	$(call all-java-files-under, src) \

	src/android/os/IAidlTest.aidl



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_PACKAGE_NAME := FrameworksCoreTests



LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)

core/tests/coretests/AndroidManifest.xml

+221 −4
Original line number Diff line number Diff line
@@ -16,6 +16,46 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.frameworks.coretests">



    <permission android:name="com.android.frameworks.coretests.permission.TEST_GRANTED"

        android:protectionLevel="normal"

            android:label="@string/permlab_testGranted"

            android:description="@string/permdesc_testGranted">

        <meta-data android:name="com.android.frameworks.coretests.string" android:value="foo" />

        <meta-data android:name="com.android.frameworks.coretests.boolean" android:value="true" />

        <meta-data android:name="com.android.frameworks.coretests.integer" android:value="100" />

        <meta-data android:name="com.android.frameworks.coretests.color" android:value="#ff000000" />

        <meta-data android:name="com.android.frameworks.coretests.float" android:value="100.1" />

        <meta-data android:name="com.android.frameworks.coretests.reference" android:resource="@xml/metadata" />

    </permission>

    <permission android:name="com.android.frameworks.coretests.permission.TEST_DENIED"

        android:protectionLevel="normal"

            android:label="@string/permlab_testDenied"

            android:description="@string/permdesc_testDenied" />



    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

    <uses-permission android:name="android.permission.BROADCAST_STICKY" />

    <uses-permission android:name="android.permission.CLEAR_APP_CACHE" />

    <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />

    <uses-permission android:name="android.permission.DELETE_CACHE_FILES" />

    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.READ_LOGS"/>

    <uses-permission android:name="android.permission.READ_PHONE_STATE" />

    <uses-permission android:name="android.permission.READ_SMS"/>

    <uses-permission android:name="android.permission.USE_CREDENTIALS" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SMS"/>

    <uses-permission android:name="android.permission.TEST_GRANTED" />

    <uses-permission android:name="com.google.android.googleapps.permission.ACCESS_GOOGLE_PASSWORD" />

    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />

    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.ALL_SERVICES" />



    <uses-permission android:name="android.permission.RECEIVE_SMS"/>

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -28,12 +68,8 @@ 
    <!-- location test permissions -->

    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>

    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

    

    <uses-permission android:name="android.permission.HARDWARE_TEST" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <uses-permission android:name="android.permission.ACCESSIBILITY_EVENT_VIEW_TYPES" />

    <uses-permission android:name="android.permission.ACCESSIBILITY_EVENT_TRANSITION_TYPES" />

    <uses-permission android:name="android.permission.ACCESSIBILITY_EVENT_NOTIFICATION_TYPES" />
@@ -975,6 +1011,187 @@ 
            </intent-filter>            

        </activity>

        





        <!-- Activity-level metadata -->

        <meta-data android:name="com.android.frameworks.coretests.isApp" android:value="true" />

        <meta-data android:name="com.android.frameworks.coretests.string" android:value="foo" />

        <meta-data android:name="com.android.frameworks.coretests.boolean" android:value="true" />

        <meta-data android:name="com.android.frameworks.coretests.integer" android:value="100" />

        <meta-data android:name="com.android.frameworks.coretests.color" android:value="#ff000000" />

        <meta-data android:name="com.android.frameworks.coretests.float" android:value="100.1" />

        <meta-data android:name="com.android.frameworks.coretests.reference"

                   android:resource="@xml/metadata_app" />



        <activity android:name="AndroidPerformanceTests" android:label="Android Performance Tests">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.UNIT_TEST" />

            </intent-filter>

        </activity>



        <!-- Application components used for activity tests -->



        <activity android:name="android.app.activity.TestedActivity"

                android:process=":remoteActivity">

        </activity>

        <activity android:name="android.app.activity.LocalActivity" android:multiprocess="true">

            <meta-data android:name="com.android.frameworks.coretests.string" android:value="foo" />

            <meta-data android:name="com.android.frameworks.coretests.boolean" android:value="true" />

            <meta-data android:name="com.android.frameworks.coretests.integer" android:value="100" />

            <meta-data android:name="com.android.frameworks.coretests.color" android:value="#ff000000" />

            <meta-data android:name="com.android.frameworks.coretests.float" android:value="100.1" />

            <meta-data android:name="com.android.frameworks.coretests.reference" android:resource="@xml/metadata" />

        </activity>

        <activity android:name="android.app.activity.TestedScreen"

                android:process=":remoteScreen">

        </activity>

        <activity android:name="android.app.activity.LocalScreen" android:multiprocess="true">

        </activity>

        <activity android:name="android.app.activity.ClearTop" android:multiprocess="true"

                android:launchMode="singleTop">

        </activity>

        <activity android:name="android.app.activity.LocalDialog" android:multiprocess="true"

                android:theme="@android:style/Theme.Dialog">

        </activity>

        <activity android:name="android.app.activity.SubActivityScreen">

        </activity>

        <activity android:name="android.app.activity.RemoteSubActivityScreen"

                android:process=":remoteActivity">

        </activity>

        <activity android:name="android.app.activity.LaunchpadActivity" android:multiprocess="true">

        </activity>

        <activity android:name="android.app.activity.LaunchpadTabActivity" android:multiprocess="true">

        </activity>



        <receiver android:name="android.app.activity.AbortReceiver">

            <intent-filter android:priority="1">

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ABORT" />

            </intent-filter>

        </receiver>

        <receiver android:name="android.app.activity.LocalReceiver">

            <intent-filter android:priority="-1">

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ABORT" />

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ALL" />

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_REPEAT" />

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_LOCAL" />

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_FAIL_REGISTER" />

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_FAIL_BIND" />

            </intent-filter>

            <meta-data android:name="com.android.frameworks.coretests.string" android:value="foo" />

            <meta-data android:name="com.android.frameworks.coretests.boolean" android:value="true" />

            <meta-data android:name="com.android.frameworks.coretests.integer" android:value="100" />

            <meta-data android:name="com.android.frameworks.coretests.color" android:value="#ff000000" />

            <meta-data android:name="com.android.frameworks.coretests.float" android:value="100.1" />

            <meta-data android:name="com.android.frameworks.coretests.reference" android:resource="@xml/metadata" />

        </receiver>

        <receiver android:name="android.app.activity.ResultReceiver">

            <intent-filter>

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_RESULT" />

            </intent-filter>

        </receiver>

        <receiver android:name="android.app.activity.LocalGrantedReceiver"

                android:permission="com.android.frameworks.coretests.permission.TEST_GRANTED">

            <intent-filter android:priority="-1">

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_LOCAL_GRANTED" />

            </intent-filter>

        </receiver>

        <receiver android:name="android.app.activity.LocalDeniedReceiver"

                android:permission="com.android.frameworks.coretests.permission.TEST_DENIED">

            <intent-filter android:priority="-1">

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_LOCAL_DENIED" />

            </intent-filter>

        </receiver>

        <receiver android:name="android.app.activity.RemoteReceiver"

                android:process=":remoteReceiver">

            <intent-filter android:priority="2">

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ABORT" />

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_ALL" />

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_REPEAT" />

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_REMOTE" />

            </intent-filter>

        </receiver>

        <receiver android:name="android.app.activity.RemoteGrantedReceiver"

                android:permission="com.android.frameworks.coretests.permission.TEST_GRANTED">

            <intent-filter android:priority="2">

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_REMOTE_GRANTED" />

            </intent-filter>

        </receiver>

        <receiver android:name="android.app.activity.RemoteDeniedReceiver"

                android:permission="com.android.frameworks.coretests.permission.TEST_DENIED">

            <intent-filter android:priority="2">

                <action android:name="com.android.frameworks.coretests.activity.BROADCAST_REMOTE_DENIED" />

            </intent-filter>

        </receiver>

        <service android:name="android.app.activity.LocalService">

            <intent-filter>

                <action android:name="com.android.frameworks.coretests.activity.SERVICE_LOCAL" />

            </intent-filter>

            <meta-data android:name="com.android.frameworks.coretests.string" android:value="foo" />

            <meta-data android:name="com.android.frameworks.coretests.boolean" android:value="true" />

            <meta-data android:name="com.android.frameworks.coretests.integer" android:value="100" />

            <meta-data android:name="com.android.frameworks.coretests.color" android:value="#ff000000" />

            <meta-data android:name="com.android.frameworks.coretests.float" android:value="100.1" />

            <meta-data android:name="com.android.frameworks.coretests.reference" android:resource="@xml/metadata" />

        </service>

        <service android:name="android.app.activity.LocalDeniedService"

                android:permission="com.android.frameworks.coretests.permission.TEST_DENIED">

            <intent-filter>

                <action android:name="com.android.frameworks.coretests.activity.SERVICE_LOCAL_DENIED" />

            </intent-filter>

        </service>

        <service android:name="android.app.activity.LocalGrantedService"

                android:permission="com.android.frameworks.coretests.permission.TEST_GRANTED">

            <intent-filter>

                <action android:name="com.android.frameworks.coretests.activity.SERVICE_LOCAL_GRANTED" />

            </intent-filter>

        </service>



        <provider android:name="android.app.activity.LocalProvider"

                android:authorities="com.android.frameworks.coretests.LocalProvider">

            <meta-data android:name="com.android.frameworks.coretests.string" android:value="foo" />

            <meta-data android:name="com.android.frameworks.coretests.boolean" android:value="true" />

            <meta-data android:name="com.android.frameworks.coretests.integer" android:value="100" />

            <meta-data android:name="com.android.frameworks.coretests.color" android:value="#ff000000" />

            <meta-data android:name="com.android.frameworks.coretests.float" android:value="100.1" />

            <meta-data android:name="com.android.frameworks.coretests.reference" android:resource="@xml/metadata" />

        </provider>



        <!-- Application components used for content tests -->

        <provider android:name="android.content.MemoryFileProvider"

                android:authorities="android.content.MemoryFileProvider"

                android:process=":MemoryFileProvider">

        </provider>



        <!-- Application components used for os tests -->



        <service android:name="android.os.MessengerService"

                android:process=":messengerService">

        </service>



        <!-- Application components used for search manager tests -->



        <activity android:name="android.app.activity.SearchableActivity"

                android:label="Searchable Activity">

            <intent-filter>

                <action android:name="android.intent.action.SEARCH" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="android.app.searchable"

                    android:resource="@xml/searchable" />

        </activity>



        <provider android:name="android.app.SuggestionProvider"

                android:authorities="android.app.SuggestionProvider">

        </provider>



        <!-- Used to test IPC. -->

        <service android:name="com.android.frameworks.coretests.binder.BinderTestService"

                 android:process="binder.BinderTestService" />

        <service android:name="com.android.frameworks.coretests.binder.BinderPerformanceService"

                 android:process="binder.BinderPerformanceService" />

        <service android:name="com.android.frameworks.coretests.binder.BinderVsMessagingService"

                 android:process="binder.BinderVsMessagingService" />

    </application>



    <instrumentation