From 3f9e0282cbf9d784300d11d6712a8109d8f848d4 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 14 Sep 2018 13:58:44 +0900 Subject: [PATCH] Separate servicestests/utils The test utility classes under com.android.server.testutils are moved to servicestests/utils directory in order to easily be shared between FrameworksServiceTests and upcomming WmTests. Test: tradefed.sh run commandAndExit FrameworksServicesTests \ --include-annotation android.platform.test.annotations.Presubmit \ --exclude-annotation androidx.test.filters.FlakyTest Bug: 113800711 Merged-In: I39c623a286df1067fffadc25c8a49c12cc05c82c Change-Id: I71cd7b417641b5e969bef6f3076020bfc1dfffa7 (cherry picked from commit 77439ba9b3a8c50e7c4c0a69b3c316eb82130ad5) --- services/tests/servicestests/Android.mk | 4 +++- .../com/android/server/testutils/OffsettableClock.java | 0 .../com/android/server/testutils/TestHandler.java | 0 .../com/android/server/testutils/TestUtils.java | 0 4 files changed, 3 insertions(+), 1 deletion(-) rename services/tests/servicestests/{src => utils}/com/android/server/testutils/OffsettableClock.java (100%) rename services/tests/servicestests/{src => utils}/com/android/server/testutils/TestHandler.java (100%) rename services/tests/servicestests/{src => utils}/com/android/server/testutils/TestUtils.java (100%) diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index a85f21cda901e..bf7836d420086 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -9,7 +9,9 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests # Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES := \ + $(call all-java-files-under, src) \ + $(call all-java-files-under, utils) \ LOCAL_STATIC_JAVA_LIBRARIES := \ frameworks-base-testutils \ diff --git a/services/tests/servicestests/src/com/android/server/testutils/OffsettableClock.java b/services/tests/servicestests/utils/com/android/server/testutils/OffsettableClock.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/testutils/OffsettableClock.java rename to services/tests/servicestests/utils/com/android/server/testutils/OffsettableClock.java diff --git a/services/tests/servicestests/src/com/android/server/testutils/TestHandler.java b/services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/testutils/TestHandler.java rename to services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java diff --git a/services/tests/servicestests/src/com/android/server/testutils/TestUtils.java b/services/tests/servicestests/utils/com/android/server/testutils/TestUtils.java similarity index 100% rename from services/tests/servicestests/src/com/android/server/testutils/TestUtils.java rename to services/tests/servicestests/utils/com/android/server/testutils/TestUtils.java