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

Commit d11b713a authored by Benjamin Franz's avatar Benjamin Franz
Browse files

Change build targets for settings tests 

1. Split existing tests into fully automatable (unit/) and not fully
automatable (app/)
2. Revert previous changes to test runners on app/
3. Fix some typos in readme

This will enable us to add the fully automatable test target
SettingsUnitTests to the continuous integration tests on the platform.

Change-Id: I0f42c59fde84891e4bfc379150c2f0c61ce1329f
parent 11805d15

tests/Android.mk

+3 −17
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests

LOCAL_CERTIFICATE := platform



LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle



LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target



# Include all test java files.

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



LOCAL_PACKAGE_NAME := SettingsTests



LOCAL_INSTRUMENTATION_FOR := Settings



include $(BUILD_PACKAGE)
 
# Include all makefiles in subdirectories

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

tests/app/Android.mk

0 → 100644
+17 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



# We only want this apk build for tests.

LOCAL_MODULE_TAGS := tests

LOCAL_CERTIFICATE := platform



LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle



# Include all test java files.

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



LOCAL_PACKAGE_NAME := SettingsTests



LOCAL_INSTRUMENTATION_FOR := Settings



include $(BUILD_PACKAGE)

tests/AndroidManifest.xml→tests/app/AndroidManifest.xml

+7 −2
Original line number Diff line number Diff line
@@ -51,9 +51,14 @@ 
        </activity>

    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="android.test.InstrumentationTestRunner"

        android:targetPackage="com.android.settings"

        android:label="Settings Test Cases">

        android:label="Settings App Tests">

    </instrumentation>



    <instrumentation android:name="SettingsLaunchPerformance"

        android:targetPackage="com.android.settings"

        android:label="Settings Launch Performance">

    </instrumentation>



</manifest>