Move legacy-test to test-base

Make it consistent with the test-mock and test-runner directories.
Also renames the files in api/ subdirectory.

Bug: 30188076
Test: make checkbuild
Change-Id: If4f99a65fcca416ede5b3e63481398f0b451bcb7

37 files changed, 6 insertions, 6 deletions

diff --git a/Android.mk b/Android.mk
index b4b26481de12..4d4baa9a41fd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -914,7 +914,7 @@ packages_to_document := \
 # Search through the base framework dirs for these packages.
 # The result will be relative to frameworks/base.
 fwbase_dirs_to_document := \
-	legacy-test/src \
+	test-base/src \
 	$(patsubst $(LOCAL_PATH)/%,%, \
 	  $(wildcard \
 	    $(foreach dir, $(FRAMEWORKS_BASE_JAVA_SRC_DIRS), \
diff --git a/legacy-test/Android.mk b/test-base/Android.mk
index 4c150c8f8a23..f73eff7d63aa 100644
--- a/legacy-test/Android.mk
+++ b/test-base/Android.mk
@@ -63,8 +63,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 \
@@ -119,7 +119,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
index 7ebd6aa8a4a2..7ebd6aa8a4a2 100644
--- a/legacy-test/api/legacy-test-current.txt
+++ b/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
index e69de29bb2d1..e69de29bb2d1 100644
--- a/legacy-test/api/legacy-test-removed.txt
+++ b/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
index ad5f2359b8b1..ad5f2359b8b1 100644
--- a/legacy-test/api/apicheck_msg_legacy_test.txt
+++ b/test-base/api/apicheck_msg_android_test_base.txt
diff --git a/legacy-test/jarjar-rules.txt b/test-base/jarjar-rules.txt
index fd8555c8931c..fd8555c8931c 100644
--- a/legacy-test/jarjar-rules.txt
+++ b/test-base/jarjar-rules.txt
diff --git a/legacy-test/src/android/test/AndroidTestCase.java b/test-base/src/android/test/AndroidTestCase.java
index 1e6bd9c14fd9..1e6bd9c14fd9 100644
--- a/legacy-test/src/android/test/AndroidTestCase.java
+++ b/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
index 4e5c4e35a8c6..4e5c4e35a8c6 100644
--- a/legacy-test/src/android/test/FlakyTest.java
+++ b/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
index 6b79314a4385..6b79314a4385 100644
--- a/legacy-test/src/android/test/InstrumentationTestCase.java
+++ b/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
index a53fa267f1e1..a53fa267f1e1 100644
--- a/legacy-test/src/android/test/InstrumentationTestSuite.java
+++ b/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
index 65bd4a48f7f5..65bd4a48f7f5 100644
--- a/legacy-test/src/android/test/PerformanceTestCase.java
+++ b/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
index 6a7130e68e61..6a7130e68e61 100644
--- a/legacy-test/src/android/test/RepetitiveTest.java
+++ b/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
index cd06ab890074..cd06ab890074 100644
--- a/legacy-test/src/android/test/UiThreadTest.java
+++ b/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
index 5be51359630e..5be51359630e 100644
--- a/legacy-test/src/android/test/package.html
+++ b/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
index dc77ee6b2739..dc77ee6b2739 100644
--- a/legacy-test/src/android/test/suitebuilder/annotation/LargeTest.java
+++ b/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
index b941da03ac9a..b941da03ac9a 100644
--- a/legacy-test/src/android/test/suitebuilder/annotation/MediumTest.java
+++ b/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
index d3c74f019b53..d3c74f019b53 100644
--- a/legacy-test/src/android/test/suitebuilder/annotation/SmallTest.java
+++ b/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
index aac293796be1..aac293796be1 100644
--- a/legacy-test/src/android/test/suitebuilder/annotation/Smoke.java
+++ b/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
index 629a3cf4a2cd..629a3cf4a2cd 100644
--- a/legacy-test/src/android/test/suitebuilder/annotation/Suppress.java
+++ b/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
index ffba2e9bf980..ffba2e9bf980 100644
--- a/legacy-test/src/android/test/suitebuilder/annotation/package.html
+++ b/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
index e87f489f4670..e87f489f4670 100644
--- a/legacy-test/src/com/android/internal/util/Predicate.java
+++ b/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
index e69de29bb2d1..e69de29bb2d1 100644
--- a/legacy-test/src/junit/MODULE_LICENSE_CPL
+++ b/test-base/src/junit/MODULE_LICENSE_CPL
diff --git a/legacy-test/src/junit/README.android b/test-base/src/junit/README.android
index 1384a1fedda2..1384a1fedda2 100644
--- a/legacy-test/src/junit/README.android
+++ b/test-base/src/junit/README.android
diff --git a/legacy-test/src/junit/cpl-v10.html b/test-base/src/junit/cpl-v10.html
index 36aa208d4a29..36aa208d4a29 100644
--- a/legacy-test/src/junit/cpl-v10.html
+++ b/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
index 3dcc23d71c19..3dcc23d71c19 100644
--- a/legacy-test/src/junit/framework/Assert.java
+++ b/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
index 0d7802c431c6..0d7802c431c6 100644
--- a/legacy-test/src/junit/framework/AssertionFailedError.java
+++ b/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
index e540f03b87d3..e540f03b87d3 100644
--- a/legacy-test/src/junit/framework/ComparisonCompactor.java
+++ b/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
index 507799328a44..507799328a44 100644
--- a/legacy-test/src/junit/framework/ComparisonFailure.java
+++ b/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
index e1432370cfaf..e1432370cfaf 100644
--- a/legacy-test/src/junit/framework/Protectable.java
+++ b/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
index a016ee8308f1..a016ee8308f1 100644
--- a/legacy-test/src/junit/framework/Test.java
+++ b/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
index b047ec9e1afc..b047ec9e1afc 100644
--- a/legacy-test/src/junit/framework/TestCase.java
+++ b/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
index 6662b1fab1b2..6662b1fab1b2 100644
--- a/legacy-test/src/junit/framework/TestFailure.java
+++ b/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
index 9b6944361b9d..9b6944361b9d 100644
--- a/legacy-test/src/junit/framework/TestListener.java
+++ b/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
index 3052e94074fd..3052e94074fd 100644
--- a/legacy-test/src/junit/framework/TestResult.java
+++ b/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
index 336efd1800d7..336efd1800d7 100644
--- a/legacy-test/src/junit/framework/TestSuite.java
+++ b/test-base/src/junit/framework/TestSuite.java
diff --git a/test-mock/Android.mk b/test-mock/Android.mk
index 1ca105b92fd1..e4af17cbd711 100644
--- a/test-mock/Android.mk
+++ b/test-mock/Android.mk
@@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_JAVA_LIBRARIES := core-oj core-libart framework legacy-test
 
-LOCAL_JARJAR_RULES := $(LOCAL_PATH)/../legacy-test/jarjar-rules.txt
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/../test-base/jarjar-rules.txt
 
 LOCAL_MODULE:= repackaged.android.test.mock
 
diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index d0f5b3248c29..c0fd7f8ec26d 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -46,7 +46,7 @@ LOCAL_JAVA_LIBRARIES := \
     legacy-test \
     android.test.mock \
 
-LOCAL_JARJAR_RULES := $(LOCAL_PATH)/../legacy-test/jarjar-rules.txt
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/../test-base/jarjar-rules.txt
 
 LOCAL_MODULE:= repackaged.android.test.runner