From 5cf137e0bb90d65b06d6effb6ce87b9019ecf4e3 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Tue, 3 Dec 2019 18:42:49 +0800 Subject: [PATCH] [Settings] Enable support on testing 1. Support ActivityScenario 2. Support add Service through ShadowServiceManager Bug: 140542283 Test: build pass Change-Id: Ib1066394114fb6077e1fa82872f029e6ee2b5da9 --- tests/robotests/Android.bp | 5 +- tests/robotests/config/robolectric.properties | 3 +- ...roidx.test.internal.platform.ThreadChecker | 1 + ...test.internal.platform.app.ActivityInvoker | 1 + ...nternal.platform.content.PermissionGranter | 1 + ...test.internal.platform.os.ControlledLooper | 1 + .../androidx.test.platform.ui.UiController | 1 + .../network/ShadowServiceManagerExtend.java | 53 +++++++++++++++++++ 8 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker create mode 100644 tests/robotests/resources/META-INF/services/androidx.test.internal.platform.app.ActivityInvoker create mode 100644 tests/robotests/resources/META-INF/services/androidx.test.internal.platform.content.PermissionGranter create mode 100644 tests/robotests/resources/META-INF/services/androidx.test.internal.platform.os.ControlledLooper create mode 100644 tests/robotests/resources/META-INF/services/androidx.test.platform.ui.UiController create mode 100644 tests/robotests/src/com/android/settings/network/ShadowServiceManagerExtend.java diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index d7d1d519b0b..3e7aa47f766 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -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", diff --git a/tests/robotests/config/robolectric.properties b/tests/robotests/config/robolectric.properties index e40e51ccbec..ee805c421f6 100644 --- a/tests/robotests/config/robolectric.properties +++ b/tests/robotests/config/robolectric.properties @@ -1,3 +1,4 @@ sdk=NEWEST_SDK shadows=\ - com.android.settings.testutils.shadow.ShadowThreadUtils + com.android.settings.testutils.shadow.ShadowThreadUtils \ + com.android.settings.network.ShadowServiceManagerExtend diff --git a/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker new file mode 100644 index 00000000000..55104eac2a6 --- /dev/null +++ b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker @@ -0,0 +1 @@ +org.robolectric.android.internal.NoOpThreadChecker diff --git a/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.app.ActivityInvoker b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.app.ActivityInvoker new file mode 100644 index 00000000000..e9944b51e44 --- /dev/null +++ b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.app.ActivityInvoker @@ -0,0 +1 @@ +org.robolectric.android.internal.LocalActivityInvoker diff --git a/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.content.PermissionGranter b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.content.PermissionGranter new file mode 100644 index 00000000000..3bcad1cab26 --- /dev/null +++ b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.content.PermissionGranter @@ -0,0 +1 @@ +org.robolectric.android.internal.LocalPermissionGranter diff --git a/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.os.ControlledLooper b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.os.ControlledLooper new file mode 100644 index 00000000000..add33e61124 --- /dev/null +++ b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.os.ControlledLooper @@ -0,0 +1 @@ +org.robolectric.android.internal.LocalControlledLooper \ No newline at end of file diff --git a/tests/robotests/resources/META-INF/services/androidx.test.platform.ui.UiController b/tests/robotests/resources/META-INF/services/androidx.test.platform.ui.UiController new file mode 100644 index 00000000000..523d6eee211 --- /dev/null +++ b/tests/robotests/resources/META-INF/services/androidx.test.platform.ui.UiController @@ -0,0 +1 @@ +org.robolectric.android.internal.LocalUiController diff --git a/tests/robotests/src/com/android/settings/network/ShadowServiceManagerExtend.java b/tests/robotests/src/com/android/settings/network/ShadowServiceManagerExtend.java new file mode 100644 index 00000000000..759de88583e --- /dev/null +++ b/tests/robotests/src/com/android/settings/network/ShadowServiceManagerExtend.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.network; + +import android.os.Binder; +import android.os.IBinder; +import android.os.IInterface; +import android.os.ServiceManager; + +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; +import org.robolectric.shadows.ShadowServiceManager; +import org.robolectric.util.ReflectionHelpers; + +import java.util.HashMap; +import java.util.Map; + +@Implements(value = ServiceManager.class) +public class ShadowServiceManagerExtend extends ShadowServiceManager { + private static final Map EXTRA_SERVICES = new HashMap<>(); + + @Implementation + public static IBinder getService(String name) { + final IBinder iBinder = ShadowServiceManager.getService(name); + if (iBinder == null) { + return EXTRA_SERVICES.get(name); + } + return iBinder; + } + + public static void addService(String name, Class classService, + String fullNameClass) { + final Binder service = new Binder(); + service.attachInterface(ReflectionHelpers.createNullProxy(classService), fullNameClass); + + ShadowServiceManager.addService(name, service); + EXTRA_SERVICES.put(name, service); + } +}