diff --git a/Android.mk b/Android.mk index b4b26481de129..4d4baa9a41fd8 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 similarity index 96% rename from legacy-test/Android.mk rename to test-base/Android.mk index 4c150c8f8a234..f73eff7d63aa4 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 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/Android.mk b/test-mock/Android.mk index 1ca105b92fd17..e4af17cbd711e 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 d0f5b3248c294..c0fd7f8ec26d2 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