Merge "Use external/robolectric-shadows/run_robotests.mk" (d120065f) · Commits · e / os / android_frameworks_base

packages/SettingsLib/tests/robotests/Android.mk

+17 −19

Original line number	Diff line number	Diff line
		@@ -12,12 +12,10 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.


		############################################################
		# SettingsLib Shell app just for Robolectric test target. #
		############################################################
		LOCAL_PATH := $(call my-dir)

		include $(CLEAR_VARS)

		LOCAL_PACKAGE_NAME := SettingsLibShell
		@@ -25,8 +23,7 @@ LOCAL_MODULE_TAGS := optional

		LOCAL_PRIVILEGED_MODULE := true

		LOCAL_RESOURCE_DIR := \
		$(LOCAL_PATH)/res
		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

		LOCAL_USE_AAPT2 := true

		@@ -39,20 +36,19 @@ include $(BUILD_PACKAGE)
		#############################################
		include $(CLEAR_VARS)

		LOCAL_MODULE := SettingsLibRoboTests

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

		# Include the testing libraries (JUnit4 + Robolectric libs).
		LOCAL_STATIC_JAVA_LIBRARIES := \
		mockito-robolectric-prebuilt \
		platform-robolectric-android-all-stubs \
		truth-prebuilt
		LOCAL_JAVA_RESOURCE_DIRS := config

		LOCAL_JAVA_LIBRARIES := \
		junit \
		platform-robolectric-3.6.1-prebuilt
		robolectric_android-all-stub \
		Robolectric_all-target \
		mockito-robolectric-prebuilt \
		truth-prebuilt

		LOCAL_INSTRUMENTATION_FOR := SettingsLibShell
		LOCAL_MODULE := SettingsLibRoboTests

		LOCAL_MODULE_TAGS := optional

		@@ -65,13 +61,15 @@ include $(CLEAR_VARS)

		LOCAL_MODULE := RunSettingsLibRoboTests

		LOCAL_SDK_VERSION := current

		LOCAL_STATIC_JAVA_LIBRARIES := \
		SettingsLibRoboTests
		LOCAL_JAVA_LIBRARIES := \
		SettingsLibRoboTests \
		robolectric_android-all-stub \
		Robolectric_all-target \
		mockito-robolectric-prebuilt \
		truth-prebuilt

		LOCAL_TEST_PACKAGE := SettingsLibShell

		LOCAL_ROBOTEST_TIMEOUT := 36000

		include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
		include external/robolectric-shadows/run_robotests.mk
		No newline at end of file

packages/SettingsLib/tests/robotests/config/robolectric.properties

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		manifest=frameworks/base/packages/SettingsLib/tests/robotests/AndroidManifest.xml
		sdk=NEWEST_SDK
		No newline at end of file

packages/SettingsLib/tests/robotests/src/com/android/settingslib/CustomEditTextPreferenceTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,11 +31,9 @@ import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;
		import org.robolectric.util.ReflectionHelpers;

		@RunWith(SettingsLibRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
		public class CustomEditTextPreferenceTest {

		@Mock

packages/SettingsLib/tests/robotests/src/com/android/settingslib/DeviceInfoUtilsTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,10 +25,8 @@ import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		@RunWith(SettingsLibRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
		public class DeviceInfoUtilsTest {

		private Context mContext;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -16,6 +16,13 @@

		package com.android.settingslib;

		import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.anyInt;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.app.Activity;
		import android.content.Context;
		import android.content.Intent;
		@@ -27,6 +34,7 @@ import android.content.res.Resources;
		import android.content.res.TypedArray;
		import android.provider.Settings;
		import android.view.MenuItem;

		import com.android.internal.R;

		import org.junit.Before;
		@@ -37,20 +45,11 @@ import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.Matchers.any;
		import static org.mockito.Matchers.anyInt;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		/**
		* Tests for {@link HelpUtils}.
		*/
		@RunWith(RobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
		public class HelpUtilsTest {
		private static final String TEST_HELP_URL = "intent:#Intent;action=com.android.test;end";
		private static final String PACKAGE_NAME_KEY = "package-name-key";