From ce09f5836046a8c987b2ef1cf24be65ccc550d3f Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Wed, 17 Apr 2019 12:36:27 -0700 Subject: [PATCH] Add robotest modules for Settings Use ROBOTEST_FILTER to divide RunSettingsRoboTests into several smaller parts. Bug: 130511490 Test: make -j RunSettingsRoboTests-applications && make -j RunSettingsRoboTests-wifi Change-Id: I16ea575877df7a495de9344971421d221e197b89 --- tests/robotests/Android.mk | 3 + tests/robotests/settings_robotest_modules.mk | 86 ++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 tests/robotests/settings_robotest_modules.mk diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk index 727da064a56..56b2607ab0f 100644 --- a/tests/robotests/Android.mk +++ b/tests/robotests/Android.mk @@ -109,3 +109,6 @@ LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \ LOCAL_ROBOTEST_TIMEOUT := 36000 include external/robolectric-shadows/run_robotests.mk + +# include separate settings robotest moduldes +include $(LOCAL_PATH)/settings_robotest_modules.mk \ No newline at end of file diff --git a/tests/robotests/settings_robotest_modules.mk b/tests/robotests/settings_robotest_modules.mk new file mode 100644 index 00000000000..f7bc07a76ed --- /dev/null +++ b/tests/robotests/settings_robotest_modules.mk @@ -0,0 +1,86 @@ +# This is included by Android.mk located in the same folder. +# It sets up all robotest sub-modules for RunSettingsRoboTests, +# where the name of each target is defined based on the package +# name under com.android.settings and order the targets +# alphabetically. +# +# Nameing pattern for the target: +# RunSettingsRoboTests- +# +# For example: +# RunSettingsRoboTests-core +# +# +# TODO(b/130745039):decouple dependencies among each module + +############################################################# +# Settings runner target to run applications module. # +############################################################# +include $(CLEAR_VARS) + +LOCAL_MODULE := RunSettingsRoboTests-applications +ROBOTEST_FILTER := applications + +LOCAL_JAVA_LIBRARIES := \ + SettingsRoboTests \ + robolectric_android-all-stub \ + Robolectric_all-target \ + mockito-robolectric-prebuilt \ + truth-prebuilt + +LOCAL_TEST_PACKAGE := SettingsRoboTestStub + +LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \ + frameworks/base/packages/SettingsLib/search/src \ + +LOCAL_ROBOTEST_TIMEOUT := 36000 + +include external/robolectric-shadows/run_robotests.mk + +############################################################# +# Settings runner target to run development module. # +############################################################# +include $(CLEAR_VARS) + +LOCAL_MODULE := RunSettingsRoboTests-development +ROBOTEST_FILTER := development + +LOCAL_JAVA_LIBRARIES := \ + SettingsRoboTests \ + robolectric_android-all-stub \ + Robolectric_all-target \ + mockito-robolectric-prebuilt \ + truth-prebuilt + +LOCAL_TEST_PACKAGE := SettingsRoboTestStub + +LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \ + frameworks/base/packages/SettingsLib/search/src \ + +LOCAL_ROBOTEST_TIMEOUT := 36000 + +include external/robolectric-shadows/run_robotests.mk + +############################################################# +# Settings runner target to run wifi module. # +############################################################# +include $(CLEAR_VARS) + +LOCAL_MODULE := RunSettingsRoboTests-wifi +ROBOTEST_FILTER := wifi + +LOCAL_JAVA_LIBRARIES := \ + SettingsRoboTests \ + robolectric_android-all-stub \ + Robolectric_all-target \ + mockito-robolectric-prebuilt \ + truth-prebuilt + +LOCAL_TEST_PACKAGE := SettingsRoboTestStub + +LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src \ + frameworks/base/packages/SettingsLib/search/src \ + +LOCAL_ROBOTEST_TIMEOUT := 36000 + +include external/robolectric-shadows/run_robotests.mk \ No newline at end of file