diff options
| author | 2018-09-04 12:11:50 +0900 | |
|---|---|---|
| committer | 2018-09-07 16:41:56 +0900 | |
| commit | 77439ba9b3a8c50e7c4c0a69b3c316eb82130ad5 (patch) | |
| tree | 56811512a3683a8a0fc0eda2dec0533963330400 | |
| parent | 029f67f85238ba2d4a2443c5659f30f21462d672 (diff) | |
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 runAndExitTest FrameworksServicesTests \
--include-annotation android.platform.test.annotations.Presubmit \
--exclude-annotation androidx.test.filters.FlakyTest
Bug: 113800711
Change-Id: I39c623a286df1067fffadc25c8a49c12cc05c82c
| -rw-r--r-- | services/tests/servicestests/Android.mk | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/utils/com/android/server/testutils/OffsettableClock.java (renamed from services/tests/servicestests/src/com/android/server/testutils/OffsettableClock.java) | 0 | ||||
| -rw-r--r-- | services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java (renamed from services/tests/servicestests/src/com/android/server/testutils/TestHandler.java) | 0 | ||||
| -rw-r--r-- | services/tests/servicestests/utils/com/android/server/testutils/TestUtils.java (renamed from services/tests/servicestests/src/com/android/server/testutils/TestUtils.java) | 0 |
4 files changed, 3 insertions, 1 deletions
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 43f319e8ccd6..80307eebf53b 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 index 8dabbc4d4356..8dabbc4d4356 100644 --- a/services/tests/servicestests/src/com/android/server/testutils/OffsettableClock.java +++ b/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 index 1222b59e92b9..1222b59e92b9 100644 --- a/services/tests/servicestests/src/com/android/server/testutils/TestHandler.java +++ b/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 index b200293ee916..b200293ee916 100644 --- a/services/tests/servicestests/src/com/android/server/testutils/TestUtils.java +++ b/services/tests/servicestests/utils/com/android/server/testutils/TestUtils.java |