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

Commit 0dc59e78 authored by Brett Chabot's avatar Brett Chabot
Browse files

More framework tests cleanup. 

Move all tests for android.* classes from tests/AndroidTests and
tests/CoreTests into framework/base/<core|graphics>/tests.

Consolidate all tests for java.* classes to tests/CoreTests.
Eventually hopefully these will be moved to dalvik/ somewhere.

Remove tests/AndroidTests entirely.

Change-Id: I86584d086ab7bd045bb38a10b699907805298a95
parent 2d8234b7

core/tests/coretests/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ LOCAL_MODULE_TAGS := tests 
# Include all test java files.

LOCAL_SRC_FILES := \

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

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

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

	src/android/os/IAidlTest.aidl



LOCAL_STATIC_JAVA_LIBRARIES += android-common
@@ -18,3 +20,4 @@ LOCAL_CERTIFICATE := platform 


include $(BUILD_PACKAGE)



include $(call all-makefiles-under,$(LOCAL_PATH))

core/tests/coretests/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


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

          android:installLocation="internalOnly"

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

          package="com.android.frameworks.coretests"

          android:sharedUserId="com.android.uid.test">



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

        android:protectionLevel="normal"

tests/AndroidTests/res/values/bools.xml→core/tests/coretests/DisabledTestApp/AndroidManifest.xml

+12 −4
Original line number Diff line number Diff line
@@ -13,8 +13,16 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

        android:sharedUserId="com.android.uid.test">



<resources>

	<bool name="trueRes">true</bool>

	<bool name="falseRes">false</bool>

</resources>
 
    <application enabled="false">



        <!-- Used to test package component enabling and disabling -->

        <activity android:name=".DisabledActivity" android:enabled="false" >

        </activity>

        <activity android:name=".EnabledActivity" >

        </activity>

    </application>

</manifest>

tests/AndroidTests/DisabledTestApp/src/com/android/unit_tests/disabled_app/EnabledActivity.java→core/tests/coretests/DisabledTestApp/src/com/android/frameworks/coretests/disabled_app/EnabledActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.unit_tests.disabled_app;

package com.android.frameworks.coretests.disabled_app;



import android.app.Activity;