From 21418277009ee848e095b35903d7fde213d3d5fe Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 16 Nov 2017 15:47:05 +0000 Subject: [PATCH] Move legacy-test to test-base Make it consistent with the test-mock and test-runner directories. Also renames the files in api/ subdirectory. (cherry picked from commit f779efd62cd579f67bd3b387d59fda11ee0cbe90) Bug: 30188076 Test: make checkbuild Change-Id: Ied3621e6201d8717223fe1ccd4ea77d458126b25 Merged-In: If4f99a65fcca416ede5b3e63481398f0b451bcb7 --- Android.mk | 2 +- {legacy-test => test-base}/Android.bp | 0 {legacy-test => test-base}/Android.mk | 6 +++--- .../api/android-test-base-current.txt | 0 .../api/android-test-base-removed.txt | 0 .../api/apicheck_msg_android_test_base.txt | 0 {legacy-test => test-base}/jarjar-rules.txt | 0 .../src/android/test/AndroidTestCase.java | 0 {legacy-test => test-base}/src/android/test/FlakyTest.java | 0 .../src/android/test/InstrumentationTestCase.java | 0 .../src/android/test/InstrumentationTestSuite.java | 0 .../src/android/test/PerformanceTestCase.java | 0 .../src/android/test/RepetitiveTest.java | 0 .../src/android/test/UiThreadTest.java | 0 {legacy-test => test-base}/src/android/test/package.html | 0 .../src/android/test/suitebuilder/annotation/LargeTest.java | 0 .../android/test/suitebuilder/annotation/MediumTest.java | 0 .../src/android/test/suitebuilder/annotation/SmallTest.java | 0 .../src/android/test/suitebuilder/annotation/Smoke.java | 0 .../src/android/test/suitebuilder/annotation/Suppress.java | 0 .../src/android/test/suitebuilder/annotation/package.html | 0 .../src/com/android/internal/util/Predicate.java | 0 {legacy-test => test-base}/src/junit/MODULE_LICENSE_CPL | 0 {legacy-test => test-base}/src/junit/README.android | 0 {legacy-test => test-base}/src/junit/cpl-v10.html | 0 {legacy-test => test-base}/src/junit/framework/Assert.java | 0 .../src/junit/framework/AssertionFailedError.java | 0 .../src/junit/framework/ComparisonCompactor.java | 0 .../src/junit/framework/ComparisonFailure.java | 0 .../src/junit/framework/Protectable.java | 0 {legacy-test => test-base}/src/junit/framework/Test.java | 0 .../src/junit/framework/TestCase.java | 0 .../src/junit/framework/TestFailure.java | 0 .../src/junit/framework/TestListener.java | 0 .../src/junit/framework/TestResult.java | 0 .../src/junit/framework/TestSuite.java | 0 test-mock/jarjar-rules.txt | 2 +- test-runner/jarjar-rules.txt | 2 +- 38 files changed, 6 insertions(+), 6 deletions(-) rename {legacy-test => test-base}/Android.bp (100%) rename {legacy-test => test-base}/Android.mk (94%) rename legacy-test/api/legacy-test-current.txt => test-base/api/android-test-base-current.txt (100%) rename legacy-test/api/legacy-test-removed.txt => test-base/api/android-test-base-removed.txt (100%) rename legacy-test/api/apicheck_msg_legacy_test.txt => test-base/api/apicheck_msg_android_test_base.txt (100%) rename {legacy-test => test-base}/jarjar-rules.txt (100%) rename {legacy-test => test-base}/src/android/test/AndroidTestCase.java (100%) rename {legacy-test => test-base}/src/android/test/FlakyTest.java (100%) rename {legacy-test => test-base}/src/android/test/InstrumentationTestCase.java (100%) rename {legacy-test => test-base}/src/android/test/InstrumentationTestSuite.java (100%) rename {legacy-test => test-base}/src/android/test/PerformanceTestCase.java (100%) rename {legacy-test => test-base}/src/android/test/RepetitiveTest.java (100%) rename {legacy-test => test-base}/src/android/test/UiThreadTest.java (100%) rename {legacy-test => test-base}/src/android/test/package.html (100%) rename {legacy-test => test-base}/src/android/test/suitebuilder/annotation/LargeTest.java (100%) rename {legacy-test => test-base}/src/android/test/suitebuilder/annotation/MediumTest.java (100%) rename {legacy-test => test-base}/src/android/test/suitebuilder/annotation/SmallTest.java (100%) rename {legacy-test => test-base}/src/android/test/suitebuilder/annotation/Smoke.java (100%) rename {legacy-test => test-base}/src/android/test/suitebuilder/annotation/Suppress.java (100%) rename {legacy-test => test-base}/src/android/test/suitebuilder/annotation/package.html (100%) rename {legacy-test => test-base}/src/com/android/internal/util/Predicate.java (100%) rename {legacy-test => test-base}/src/junit/MODULE_LICENSE_CPL (100%) rename {legacy-test => test-base}/src/junit/README.android (100%) rename {legacy-test => test-base}/src/junit/cpl-v10.html (100%) rename {legacy-test => test-base}/src/junit/framework/Assert.java (100%) rename {legacy-test => test-base}/src/junit/framework/AssertionFailedError.java (100%) rename {legacy-test => test-base}/src/junit/framework/ComparisonCompactor.java (100%) rename {legacy-test => test-base}/src/junit/framework/ComparisonFailure.java (100%) rename {legacy-test => test-base}/src/junit/framework/Protectable.java (100%) rename {legacy-test => test-base}/src/junit/framework/Test.java (100%) rename {legacy-test => test-base}/src/junit/framework/TestCase.java (100%) rename {legacy-test => test-base}/src/junit/framework/TestFailure.java (100%) rename {legacy-test => test-base}/src/junit/framework/TestListener.java (100%) rename {legacy-test => test-base}/src/junit/framework/TestResult.java (100%) rename {legacy-test => test-base}/src/junit/framework/TestSuite.java (100%) diff --git a/Android.mk b/Android.mk index 2d74249d9bb9c..cf6aa2a0c2989 100644 --- a/Android.mk +++ b/Android.mk @@ -82,7 +82,7 @@ framework_base_android_test_runner_excluding_mock_src_files := \ # to document and check apis files_to_check_apis := \ $(call find-other-java-files, \ - legacy-test/src \ + test-base/src \ $(non_base_dirs) \ ) diff --git a/legacy-test/Android.bp b/test-base/Android.bp similarity index 100% rename from legacy-test/Android.bp rename to test-base/Android.bp diff --git a/legacy-test/Android.mk b/test-base/Android.mk similarity index 94% rename from legacy-test/Android.mk rename to test-base/Android.mk index 793bbe859edaa..06c66372a11a8 100644 --- a/legacy-test/Android.mk +++ b/test-base/Android.mk @@ -34,8 +34,8 @@ LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src LEGACY_TEST_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/legacy.test.stubs_intermediates/api.txt LEGACY_TEST_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/legacy.test.stubs_intermediates/removed.txt -LEGACY_TEST_API_FILE := $(LOCAL_PATH)/api/legacy-test-current.txt -LEGACY_TEST_REMOVED_API_FILE := $(LOCAL_PATH)/api/legacy-test-removed.txt +LEGACY_TEST_API_FILE := $(LOCAL_PATH)/api/android-test-base-current.txt +LEGACY_TEST_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-base-removed.txt LOCAL_DROIDDOC_OPTIONS:= \ -stubpackages android.test:android.test.suitebuilder.annotation:com.android.internal.util:junit.framework \ @@ -88,7 +88,7 @@ $(eval $(call check-api, \ -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \ -error 25 -error 26 -error 27, \ - cat $(LOCAL_PATH)/api/apicheck_msg_legacy_test.txt, \ + cat $(LOCAL_PATH)/api/apicheck_msg_android_test_base.txt, \ check-legacy-test-api, \ $(call doc-timestamp-for,legacy-test-api-stubs-gen) \ )) diff --git a/legacy-test/api/legacy-test-current.txt b/test-base/api/android-test-base-current.txt similarity index 100% rename from legacy-test/api/legacy-test-current.txt rename to test-base/api/android-test-base-current.txt diff --git a/legacy-test/api/legacy-test-removed.txt b/test-base/api/android-test-base-removed.txt similarity index 100% rename from legacy-test/api/legacy-test-removed.txt rename to test-base/api/android-test-base-removed.txt diff --git a/legacy-test/api/apicheck_msg_legacy_test.txt b/test-base/api/apicheck_msg_android_test_base.txt similarity index 100% rename from legacy-test/api/apicheck_msg_legacy_test.txt rename to test-base/api/apicheck_msg_android_test_base.txt diff --git a/legacy-test/jarjar-rules.txt b/test-base/jarjar-rules.txt similarity index 100% rename from legacy-test/jarjar-rules.txt rename to test-base/jarjar-rules.txt diff --git a/legacy-test/src/android/test/AndroidTestCase.java b/test-base/src/android/test/AndroidTestCase.java similarity index 100% rename from legacy-test/src/android/test/AndroidTestCase.java rename to test-base/src/android/test/AndroidTestCase.java diff --git a/legacy-test/src/android/test/FlakyTest.java b/test-base/src/android/test/FlakyTest.java similarity index 100% rename from legacy-test/src/android/test/FlakyTest.java rename to test-base/src/android/test/FlakyTest.java diff --git a/legacy-test/src/android/test/InstrumentationTestCase.java b/test-base/src/android/test/InstrumentationTestCase.java similarity index 100% rename from legacy-test/src/android/test/InstrumentationTestCase.java rename to test-base/src/android/test/InstrumentationTestCase.java diff --git a/legacy-test/src/android/test/InstrumentationTestSuite.java b/test-base/src/android/test/InstrumentationTestSuite.java similarity index 100% rename from legacy-test/src/android/test/InstrumentationTestSuite.java rename to test-base/src/android/test/InstrumentationTestSuite.java diff --git a/legacy-test/src/android/test/PerformanceTestCase.java b/test-base/src/android/test/PerformanceTestCase.java similarity index 100% rename from legacy-test/src/android/test/PerformanceTestCase.java rename to test-base/src/android/test/PerformanceTestCase.java diff --git a/legacy-test/src/android/test/RepetitiveTest.java b/test-base/src/android/test/RepetitiveTest.java similarity index 100% rename from legacy-test/src/android/test/RepetitiveTest.java rename to test-base/src/android/test/RepetitiveTest.java diff --git a/legacy-test/src/android/test/UiThreadTest.java b/test-base/src/android/test/UiThreadTest.java similarity index 100% rename from legacy-test/src/android/test/UiThreadTest.java rename to test-base/src/android/test/UiThreadTest.java diff --git a/legacy-test/src/android/test/package.html b/test-base/src/android/test/package.html similarity index 100% rename from legacy-test/src/android/test/package.html rename to test-base/src/android/test/package.html diff --git a/legacy-test/src/android/test/suitebuilder/annotation/LargeTest.java b/test-base/src/android/test/suitebuilder/annotation/LargeTest.java similarity index 100% rename from legacy-test/src/android/test/suitebuilder/annotation/LargeTest.java rename to test-base/src/android/test/suitebuilder/annotation/LargeTest.java diff --git a/legacy-test/src/android/test/suitebuilder/annotation/MediumTest.java b/test-base/src/android/test/suitebuilder/annotation/MediumTest.java similarity index 100% rename from legacy-test/src/android/test/suitebuilder/annotation/MediumTest.java rename to test-base/src/android/test/suitebuilder/annotation/MediumTest.java diff --git a/legacy-test/src/android/test/suitebuilder/annotation/SmallTest.java b/test-base/src/android/test/suitebuilder/annotation/SmallTest.java similarity index 100% rename from legacy-test/src/android/test/suitebuilder/annotation/SmallTest.java rename to test-base/src/android/test/suitebuilder/annotation/SmallTest.java diff --git a/legacy-test/src/android/test/suitebuilder/annotation/Smoke.java b/test-base/src/android/test/suitebuilder/annotation/Smoke.java similarity index 100% rename from legacy-test/src/android/test/suitebuilder/annotation/Smoke.java rename to test-base/src/android/test/suitebuilder/annotation/Smoke.java diff --git a/legacy-test/src/android/test/suitebuilder/annotation/Suppress.java b/test-base/src/android/test/suitebuilder/annotation/Suppress.java similarity index 100% rename from legacy-test/src/android/test/suitebuilder/annotation/Suppress.java rename to test-base/src/android/test/suitebuilder/annotation/Suppress.java diff --git a/legacy-test/src/android/test/suitebuilder/annotation/package.html b/test-base/src/android/test/suitebuilder/annotation/package.html similarity index 100% rename from legacy-test/src/android/test/suitebuilder/annotation/package.html rename to test-base/src/android/test/suitebuilder/annotation/package.html diff --git a/legacy-test/src/com/android/internal/util/Predicate.java b/test-base/src/com/android/internal/util/Predicate.java similarity index 100% rename from legacy-test/src/com/android/internal/util/Predicate.java rename to test-base/src/com/android/internal/util/Predicate.java diff --git a/legacy-test/src/junit/MODULE_LICENSE_CPL b/test-base/src/junit/MODULE_LICENSE_CPL similarity index 100% rename from legacy-test/src/junit/MODULE_LICENSE_CPL rename to test-base/src/junit/MODULE_LICENSE_CPL diff --git a/legacy-test/src/junit/README.android b/test-base/src/junit/README.android similarity index 100% rename from legacy-test/src/junit/README.android rename to test-base/src/junit/README.android diff --git a/legacy-test/src/junit/cpl-v10.html b/test-base/src/junit/cpl-v10.html similarity index 100% rename from legacy-test/src/junit/cpl-v10.html rename to test-base/src/junit/cpl-v10.html diff --git a/legacy-test/src/junit/framework/Assert.java b/test-base/src/junit/framework/Assert.java similarity index 100% rename from legacy-test/src/junit/framework/Assert.java rename to test-base/src/junit/framework/Assert.java diff --git a/legacy-test/src/junit/framework/AssertionFailedError.java b/test-base/src/junit/framework/AssertionFailedError.java similarity index 100% rename from legacy-test/src/junit/framework/AssertionFailedError.java rename to test-base/src/junit/framework/AssertionFailedError.java diff --git a/legacy-test/src/junit/framework/ComparisonCompactor.java b/test-base/src/junit/framework/ComparisonCompactor.java similarity index 100% rename from legacy-test/src/junit/framework/ComparisonCompactor.java rename to test-base/src/junit/framework/ComparisonCompactor.java diff --git a/legacy-test/src/junit/framework/ComparisonFailure.java b/test-base/src/junit/framework/ComparisonFailure.java similarity index 100% rename from legacy-test/src/junit/framework/ComparisonFailure.java rename to test-base/src/junit/framework/ComparisonFailure.java diff --git a/legacy-test/src/junit/framework/Protectable.java b/test-base/src/junit/framework/Protectable.java similarity index 100% rename from legacy-test/src/junit/framework/Protectable.java rename to test-base/src/junit/framework/Protectable.java diff --git a/legacy-test/src/junit/framework/Test.java b/test-base/src/junit/framework/Test.java similarity index 100% rename from legacy-test/src/junit/framework/Test.java rename to test-base/src/junit/framework/Test.java diff --git a/legacy-test/src/junit/framework/TestCase.java b/test-base/src/junit/framework/TestCase.java similarity index 100% rename from legacy-test/src/junit/framework/TestCase.java rename to test-base/src/junit/framework/TestCase.java diff --git a/legacy-test/src/junit/framework/TestFailure.java b/test-base/src/junit/framework/TestFailure.java similarity index 100% rename from legacy-test/src/junit/framework/TestFailure.java rename to test-base/src/junit/framework/TestFailure.java diff --git a/legacy-test/src/junit/framework/TestListener.java b/test-base/src/junit/framework/TestListener.java similarity index 100% rename from legacy-test/src/junit/framework/TestListener.java rename to test-base/src/junit/framework/TestListener.java diff --git a/legacy-test/src/junit/framework/TestResult.java b/test-base/src/junit/framework/TestResult.java similarity index 100% rename from legacy-test/src/junit/framework/TestResult.java rename to test-base/src/junit/framework/TestResult.java diff --git a/legacy-test/src/junit/framework/TestSuite.java b/test-base/src/junit/framework/TestSuite.java similarity index 100% rename from legacy-test/src/junit/framework/TestSuite.java rename to test-base/src/junit/framework/TestSuite.java diff --git a/test-mock/jarjar-rules.txt b/test-mock/jarjar-rules.txt index b0e4beaf5a4c7..f6f79139d511a 120000 --- a/test-mock/jarjar-rules.txt +++ b/test-mock/jarjar-rules.txt @@ -1 +1 @@ -../legacy-test/jarjar-rules.txt \ No newline at end of file +../test-base/jarjar-rules.txt \ No newline at end of file diff --git a/test-runner/jarjar-rules.txt b/test-runner/jarjar-rules.txt index b0e4beaf5a4c7..f6f79139d511a 120000 --- a/test-runner/jarjar-rules.txt +++ b/test-runner/jarjar-rules.txt @@ -1 +1 @@ -../legacy-test/jarjar-rules.txt \ No newline at end of file +../test-base/jarjar-rules.txt \ No newline at end of file