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 f779efd62c) Bug: 30188076 Test: make checkbuild Change-Id: Ied3621e6201d8717223fe1ccd4ea77d458126b25 Merged-In: If4f99a65fcca416ede5b3e63481398f0b451bcb7
2017-11-16 15:47:05 +00:00
parent f0561142f3
commit 2141827700
38 changed files with 6 additions and 6 deletions
--- 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) \
  )

--- a/legacy-test/Android.bp
+++ b/legacy-test/Android.bp
--- a/legacy-test/Android.mk
+++ b/legacy-test/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) \
    ))
--- a/test-base/api/android-test-base-current.txt
+++ b/test-base/api/android-test-base-current.txt
--- a/test-base/api/android-test-base-removed.txt
+++ b/test-base/api/android-test-base-removed.txt
--- a/test-base/api/apicheck_msg_android_test_base.txt
+++ b/test-base/api/apicheck_msg_android_test_base.txt
--- a/legacy-test/jarjar-rules.txt
+++ b/legacy-test/jarjar-rules.txt
--- a/legacy-test/src/android/test/AndroidTestCase.java
+++ b/legacy-test/src/android/test/AndroidTestCase.java
--- a/legacy-test/src/android/test/FlakyTest.java
+++ b/legacy-test/src/android/test/FlakyTest.java
--- a/legacy-test/src/android/test/InstrumentationTestCase.java
+++ b/legacy-test/src/android/test/InstrumentationTestCase.java
--- a/legacy-test/src/android/test/InstrumentationTestSuite.java
+++ b/legacy-test/src/android/test/InstrumentationTestSuite.java
--- a/legacy-test/src/android/test/PerformanceTestCase.java
+++ b/legacy-test/src/android/test/PerformanceTestCase.java
--- a/legacy-test/src/android/test/RepetitiveTest.java
+++ b/legacy-test/src/android/test/RepetitiveTest.java
--- a/legacy-test/src/android/test/UiThreadTest.java
+++ b/legacy-test/src/android/test/UiThreadTest.java
--- a/legacy-test/src/android/test/package.html
+++ b/legacy-test/src/android/test/package.html
--- a/legacy-test/src/android/test/suitebuilder/annotation/LargeTest.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/LargeTest.java
--- a/legacy-test/src/android/test/suitebuilder/annotation/MediumTest.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/MediumTest.java
--- a/legacy-test/src/android/test/suitebuilder/annotation/SmallTest.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/SmallTest.java
--- a/legacy-test/src/android/test/suitebuilder/annotation/Smoke.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/Smoke.java
--- a/legacy-test/src/android/test/suitebuilder/annotation/Suppress.java
+++ b/legacy-test/src/android/test/suitebuilder/annotation/Suppress.java
--- a/legacy-test/src/android/test/suitebuilder/annotation/package.html
+++ b/legacy-test/src/android/test/suitebuilder/annotation/package.html
--- a/legacy-test/src/com/android/internal/util/Predicate.java
+++ b/legacy-test/src/com/android/internal/util/Predicate.java
--- a/legacy-test/src/junit/MODULE_LICENSE_CPL
+++ b/legacy-test/src/junit/MODULE_LICENSE_CPL
--- a/legacy-test/src/junit/README.android
+++ b/legacy-test/src/junit/README.android
--- a/legacy-test/src/junit/cpl-v10.html
+++ b/legacy-test/src/junit/cpl-v10.html
--- a/legacy-test/src/junit/framework/Assert.java
+++ b/legacy-test/src/junit/framework/Assert.java
--- a/legacy-test/src/junit/framework/AssertionFailedError.java
+++ b/legacy-test/src/junit/framework/AssertionFailedError.java
--- a/legacy-test/src/junit/framework/ComparisonCompactor.java
+++ b/legacy-test/src/junit/framework/ComparisonCompactor.java
--- a/legacy-test/src/junit/framework/ComparisonFailure.java
+++ b/legacy-test/src/junit/framework/ComparisonFailure.java
--- a/legacy-test/src/junit/framework/Protectable.java
+++ b/legacy-test/src/junit/framework/Protectable.java
--- a/legacy-test/src/junit/framework/Test.java
+++ b/legacy-test/src/junit/framework/Test.java
--- a/legacy-test/src/junit/framework/TestCase.java
+++ b/legacy-test/src/junit/framework/TestCase.java
--- a/legacy-test/src/junit/framework/TestFailure.java
+++ b/legacy-test/src/junit/framework/TestFailure.java
--- a/legacy-test/src/junit/framework/TestListener.java
+++ b/legacy-test/src/junit/framework/TestListener.java
--- a/legacy-test/src/junit/framework/TestResult.java
+++ b/legacy-test/src/junit/framework/TestResult.java
--- a/legacy-test/src/junit/framework/TestSuite.java
+++ b/legacy-test/src/junit/framework/TestSuite.java
--- a/test-mock/jarjar-rules.txt
+++ b/test-mock/jarjar-rules.txt
@@ -1 +1 @@
-../legacy-test/jarjar-rules.txt
+../test-base/jarjar-rules.txt
--- a/test-runner/jarjar-rules.txt
+++ b/test-runner/jarjar-rules.txt
@@ -1 +1 @@
-../legacy-test/jarjar-rules.txt
+../test-base/jarjar-rules.txt