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

Commit fd355795 authored by Bonian Chen's avatar Bonian Chen Committed by android-build-merger
Browse files

Merge "[Settings] Enable support on testing" am: 84a2951a 

am: 08dcb51c

Change-Id: I07d2017ef71d2ce17d4a414d26efff9894d93d63
parents 944b8b33 08dcb51c

tests/robotests/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -60,9 +60,12 @@ android_robolectric_test { 
    static_libs: [

        "SettingsLib-robo-testutils",

	"android-support-annotations",

        "androidx.test.core",

        "androidx.test.runner",

        "androidx.test.ext.junit",

    ],



    java_resource_dirs: ["config"],

    java_resource_dirs: ["config", "resources"],



    instrumentation_for: "SettingsRoboTestStub",

tests/robotests/config/robolectric.properties

+2 −1
Original line number Diff line number Diff line 
sdk=NEWEST_SDK

shadows=\

   com.android.settings.testutils.shadow.ShadowThreadUtils
 
   com.android.settings.testutils.shadow.ShadowThreadUtils \

   com.android.settings.network.ShadowServiceManagerExtend

tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker

0 → 100644
+1 −0
Original line number Diff line number Diff line 
org.robolectric.android.internal.NoOpThreadChecker

tests/robotests/resources/META-INF/services/androidx.test.internal.platform.app.ActivityInvoker

0 → 100644
+1 −0
Original line number Diff line number Diff line 
org.robolectric.android.internal.LocalActivityInvoker

tests/robotests/resources/META-INF/services/androidx.test.internal.platform.content.PermissionGranter

0 → 100644
+1 −0
Original line number Diff line number Diff line 
org.robolectric.android.internal.LocalPermissionGranter