Move framework test-runner unit tests to be closer to their source.

Move the test-runner source into a separate src folder to accommodate the test
move.

124 files changed, 83 insertions, 16 deletions

diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 42167c7872d0..962e96c43bfb 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -18,10 +18,13 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_JAVA_LIBRARIES := core framework
 
 LOCAL_MODULE:= android.test.runner
 
 include $(BUILD_JAVA_LIBRARY)
+
+# additionally, build unit tests in a separate .apk
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/test-runner/android/test/ActivityInstrumentationTestCase.java b/test-runner/src/android/test/ActivityInstrumentationTestCase.java
index d12ff6f44eb8..d12ff6f44eb8 100644
--- a/test-runner/android/test/ActivityInstrumentationTestCase.java
+++ b/test-runner/src/android/test/ActivityInstrumentationTestCase.java
diff --git a/test-runner/android/test/ActivityInstrumentationTestCase2.java b/test-runner/src/android/test/ActivityInstrumentationTestCase2.java
index e8570bd80f1d..e8570bd80f1d 100644
--- a/test-runner/android/test/ActivityInstrumentationTestCase2.java
+++ b/test-runner/src/android/test/ActivityInstrumentationTestCase2.java
diff --git a/test-runner/android/test/ActivityTestCase.java b/test-runner/src/android/test/ActivityTestCase.java
index 18bfcccb8331..18bfcccb8331 100644
--- a/test-runner/android/test/ActivityTestCase.java
+++ b/test-runner/src/android/test/ActivityTestCase.java
diff --git a/test-runner/android/test/ActivityUnitTestCase.java b/test-runner/src/android/test/ActivityUnitTestCase.java
index 6bd19a62231b..6bd19a62231b 100644
--- a/test-runner/android/test/ActivityUnitTestCase.java
+++ b/test-runner/src/android/test/ActivityUnitTestCase.java
diff --git a/test-runner/android/test/AndroidTestRunner.java b/test-runner/src/android/test/AndroidTestRunner.java
index fc9832ca3bcd..fc9832ca3bcd 100644
--- a/test-runner/android/test/AndroidTestRunner.java
+++ b/test-runner/src/android/test/AndroidTestRunner.java
diff --git a/test-runner/android/test/ApplicationTestCase.java b/test-runner/src/android/test/ApplicationTestCase.java
index ae5fa4da8e5e..ae5fa4da8e5e 100644
--- a/test-runner/android/test/ApplicationTestCase.java
+++ b/test-runner/src/android/test/ApplicationTestCase.java
diff --git a/test-runner/android/test/AssertionFailedError.java b/test-runner/src/android/test/AssertionFailedError.java
index 7af5806dd0b9..7af5806dd0b9 100644
--- a/test-runner/android/test/AssertionFailedError.java
+++ b/test-runner/src/android/test/AssertionFailedError.java
diff --git a/test-runner/android/test/BundlePrinter.java b/test-runner/src/android/test/BundlePrinter.java
index 96213e735bac..96213e735bac 100644
--- a/test-runner/android/test/BundlePrinter.java
+++ b/test-runner/src/android/test/BundlePrinter.java
diff --git a/test-runner/android/test/BundleTestListener.java b/test-runner/src/android/test/BundleTestListener.java
index 772713fe94da..772713fe94da 100644
--- a/test-runner/android/test/BundleTestListener.java
+++ b/test-runner/src/android/test/BundleTestListener.java
diff --git a/test-runner/android/test/ClassPathPackageInfo.java b/test-runner/src/android/test/ClassPathPackageInfo.java
index 1f6e64780b81..1f6e64780b81 100644
--- a/test-runner/android/test/ClassPathPackageInfo.java
+++ b/test-runner/src/android/test/ClassPathPackageInfo.java
diff --git a/test-runner/android/test/ClassPathPackageInfoSource.java b/test-runner/src/android/test/ClassPathPackageInfoSource.java
index 877075f2d2af..877075f2d2af 100644
--- a/test-runner/android/test/ClassPathPackageInfoSource.java
+++ b/test-runner/src/android/test/ClassPathPackageInfoSource.java
diff --git a/test-runner/android/test/ComparisonFailure.java b/test-runner/src/android/test/ComparisonFailure.java
index e7e96986b389..e7e96986b389 100644
--- a/test-runner/android/test/ComparisonFailure.java
+++ b/test-runner/src/android/test/ComparisonFailure.java
diff --git a/test-runner/android/test/DatabaseTestUtils.java b/test-runner/src/android/test/DatabaseTestUtils.java
index 23e0aba677a4..23e0aba677a4 100644
--- a/test-runner/android/test/DatabaseTestUtils.java
+++ b/test-runner/src/android/test/DatabaseTestUtils.java
diff --git a/test-runner/android/test/InstrumentationCoreTestRunner.java b/test-runner/src/android/test/InstrumentationCoreTestRunner.java
index ff99a74930fa..ff99a74930fa 100644
--- a/test-runner/android/test/InstrumentationCoreTestRunner.java
+++ b/test-runner/src/android/test/InstrumentationCoreTestRunner.java
diff --git a/test-runner/android/test/InstrumentationTestRunner.java b/test-runner/src/android/test/InstrumentationTestRunner.java
index 3e9cd9f36164..3e9cd9f36164 100644
--- a/test-runner/android/test/InstrumentationTestRunner.java
+++ b/test-runner/src/android/test/InstrumentationTestRunner.java
diff --git a/test-runner/android/test/InstrumentationUtils.java b/test-runner/src/android/test/InstrumentationUtils.java
index 4c59097730f8..4c59097730f8 100644
--- a/test-runner/android/test/InstrumentationUtils.java
+++ b/test-runner/src/android/test/InstrumentationUtils.java
diff --git a/test-runner/android/test/IsolatedContext.java b/test-runner/src/android/test/IsolatedContext.java
index 485e45c957c9..485e45c957c9 100644
--- a/test-runner/android/test/IsolatedContext.java
+++ b/test-runner/src/android/test/IsolatedContext.java
diff --git a/test-runner/android/test/LaunchPerformanceBase.java b/test-runner/src/android/test/LaunchPerformanceBase.java
index c324446b5c5c..c324446b5c5c 100644
--- a/test-runner/android/test/LaunchPerformanceBase.java
+++ b/test-runner/src/android/test/LaunchPerformanceBase.java
diff --git a/test-runner/android/test/MoreAsserts.java b/test-runner/src/android/test/MoreAsserts.java
index 9e0d018b0afb..9e0d018b0afb 100644
--- a/test-runner/android/test/MoreAsserts.java
+++ b/test-runner/src/android/test/MoreAsserts.java
diff --git a/test-runner/android/test/NoExecTestResult.java b/test-runner/src/android/test/NoExecTestResult.java
index 1ee62c169090..1ee62c169090 100755
--- a/test-runner/android/test/NoExecTestResult.java
+++ b/test-runner/src/android/test/NoExecTestResult.java
diff --git a/test-runner/android/test/PackageInfoSources.java b/test-runner/src/android/test/PackageInfoSources.java
index ef3744911956..ef3744911956 100644
--- a/test-runner/android/test/PackageInfoSources.java
+++ b/test-runner/src/android/test/PackageInfoSources.java
diff --git a/test-runner/android/test/PerformanceCollectorTestCase.java b/test-runner/src/android/test/PerformanceCollectorTestCase.java
index 4309ff73eb5f..4309ff73eb5f 100644
--- a/test-runner/android/test/PerformanceCollectorTestCase.java
+++ b/test-runner/src/android/test/PerformanceCollectorTestCase.java
diff --git a/test-runner/android/test/PerformanceTestBase.java b/test-runner/src/android/test/PerformanceTestBase.java
index 4a0a589145e4..4a0a589145e4 100644
--- a/test-runner/android/test/PerformanceTestBase.java
+++ b/test-runner/src/android/test/PerformanceTestBase.java
diff --git a/test-runner/android/test/ProviderTestCase.java b/test-runner/src/android/test/ProviderTestCase.java
index 668e9f7adb11..668e9f7adb11 100644
--- a/test-runner/android/test/ProviderTestCase.java
+++ b/test-runner/src/android/test/ProviderTestCase.java
diff --git a/test-runner/android/test/ProviderTestCase2.java b/test-runner/src/android/test/ProviderTestCase2.java
index f3655fc781dd..f3655fc781dd 100644
--- a/test-runner/android/test/ProviderTestCase2.java
+++ b/test-runner/src/android/test/ProviderTestCase2.java
diff --git a/test-runner/android/test/RenamingDelegatingContext.java b/test-runner/src/android/test/RenamingDelegatingContext.java
index 0ea43ab5abe1..0ea43ab5abe1 100644
--- a/test-runner/android/test/RenamingDelegatingContext.java
+++ b/test-runner/src/android/test/RenamingDelegatingContext.java
diff --git a/test-runner/android/test/ServiceLocator.java b/test-runner/src/android/test/ServiceLocator.java
index 3324008794c0..3324008794c0 100644
--- a/test-runner/android/test/ServiceLocator.java
+++ b/test-runner/src/android/test/ServiceLocator.java
diff --git a/test-runner/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java
index fcb9d55e8360..fcb9d55e8360 100644
--- a/test-runner/android/test/ServiceTestCase.java
+++ b/test-runner/src/android/test/ServiceTestCase.java
diff --git a/test-runner/android/test/SimpleCache.java b/test-runner/src/android/test/SimpleCache.java
index 44424ec56918..44424ec56918 100644
--- a/test-runner/android/test/SimpleCache.java
+++ b/test-runner/src/android/test/SimpleCache.java
diff --git a/test-runner/android/test/SingleLaunchActivityTestCase.java b/test-runner/src/android/test/SingleLaunchActivityTestCase.java
index b63b3ce19759..b63b3ce19759 100644
--- a/test-runner/android/test/SingleLaunchActivityTestCase.java
+++ b/test-runner/src/android/test/SingleLaunchActivityTestCase.java
diff --git a/test-runner/android/test/SyncBaseInstrumentation.java b/test-runner/src/android/test/SyncBaseInstrumentation.java
index 7d418f09ead9..7d418f09ead9 100644
--- a/test-runner/android/test/SyncBaseInstrumentation.java
+++ b/test-runner/src/android/test/SyncBaseInstrumentation.java
diff --git a/test-runner/android/test/TestBrowserActivity.java b/test-runner/src/android/test/TestBrowserActivity.java
index ea5f91e12752..ea5f91e12752 100644
--- a/test-runner/android/test/TestBrowserActivity.java
+++ b/test-runner/src/android/test/TestBrowserActivity.java
diff --git a/test-runner/android/test/TestBrowserController.java b/test-runner/src/android/test/TestBrowserController.java
index 044e39f98380..044e39f98380 100644
--- a/test-runner/android/test/TestBrowserController.java
+++ b/test-runner/src/android/test/TestBrowserController.java
diff --git a/test-runner/android/test/TestBrowserControllerImpl.java b/test-runner/src/android/test/TestBrowserControllerImpl.java
index b8f8975cccfe..b8f8975cccfe 100644
--- a/test-runner/android/test/TestBrowserControllerImpl.java
+++ b/test-runner/src/android/test/TestBrowserControllerImpl.java
diff --git a/test-runner/android/test/TestBrowserView.java b/test-runner/src/android/test/TestBrowserView.java
index 4799f1966c53..4799f1966c53 100644
--- a/test-runner/android/test/TestBrowserView.java
+++ b/test-runner/src/android/test/TestBrowserView.java
diff --git a/test-runner/android/test/TestCase.java b/test-runner/src/android/test/TestCase.java
index 5432ce85463b..5432ce85463b 100644
--- a/test-runner/android/test/TestCase.java
+++ b/test-runner/src/android/test/TestCase.java
diff --git a/test-runner/android/test/TestCaseUtil.java b/test-runner/src/android/test/TestCaseUtil.java
index 3ba97118e56b..3ba97118e56b 100644
--- a/test-runner/android/test/TestCaseUtil.java
+++ b/test-runner/src/android/test/TestCaseUtil.java
diff --git a/test-runner/android/test/TestListActivity.java b/test-runner/src/android/test/TestListActivity.java
index a076a7086520..a076a7086520 100644
--- a/test-runner/android/test/TestListActivity.java
+++ b/test-runner/src/android/test/TestListActivity.java
diff --git a/test-runner/android/test/TestPrinter.java b/test-runner/src/android/test/TestPrinter.java
index 37bd721c9bab..37bd721c9bab 100644
--- a/test-runner/android/test/TestPrinter.java
+++ b/test-runner/src/android/test/TestPrinter.java
diff --git a/test-runner/android/test/TestRecorder.java b/test-runner/src/android/test/TestRecorder.java
index 7c368a07b21a..7c368a07b21a 100644
--- a/test-runner/android/test/TestRecorder.java
+++ b/test-runner/src/android/test/TestRecorder.java
diff --git a/test-runner/android/test/TestRunner.java b/test-runner/src/android/test/TestRunner.java
index 012df3501026..012df3501026 100644
--- a/test-runner/android/test/TestRunner.java
+++ b/test-runner/src/android/test/TestRunner.java
diff --git a/test-runner/android/test/TestRunnerView.java b/test-runner/src/android/test/TestRunnerView.java
index be9095128013..be9095128013 100644
--- a/test-runner/android/test/TestRunnerView.java
+++ b/test-runner/src/android/test/TestRunnerView.java
diff --git a/test-runner/android/test/TestSuiteProvider.java b/test-runner/src/android/test/TestSuiteProvider.java
index dc9ce6e3bc10..dc9ce6e3bc10 100644
--- a/test-runner/android/test/TestSuiteProvider.java
+++ b/test-runner/src/android/test/TestSuiteProvider.java
diff --git a/test-runner/android/test/TimedTest.java b/test-runner/src/android/test/TimedTest.java
index 95cc9bffd42c..95cc9bffd42c 100644
--- a/test-runner/android/test/TimedTest.java
+++ b/test-runner/src/android/test/TimedTest.java
diff --git a/test-runner/android/test/TouchUtils.java b/test-runner/src/android/test/TouchUtils.java
index 69c6d2d57d00..69c6d2d57d00 100644
--- a/test-runner/android/test/TouchUtils.java
+++ b/test-runner/src/android/test/TouchUtils.java
diff --git a/test-runner/android/test/ViewAsserts.java b/test-runner/src/android/test/ViewAsserts.java
index c575fc5982bf..c575fc5982bf 100644
--- a/test-runner/android/test/ViewAsserts.java
+++ b/test-runner/src/android/test/ViewAsserts.java
diff --git a/test-runner/android/test/mock/MockApplication.java b/test-runner/src/android/test/mock/MockApplication.java
index 572dfbf2b5e6..572dfbf2b5e6 100644
--- a/test-runner/android/test/mock/MockApplication.java
+++ b/test-runner/src/android/test/mock/MockApplication.java
diff --git a/test-runner/android/test/mock/MockContentProvider.java b/test-runner/src/android/test/mock/MockContentProvider.java
index 4078622333a3..4078622333a3 100644
--- a/test-runner/android/test/mock/MockContentProvider.java
+++ b/test-runner/src/android/test/mock/MockContentProvider.java
diff --git a/test-runner/android/test/mock/MockContentResolver.java b/test-runner/src/android/test/mock/MockContentResolver.java
index 3a1dc36cd312..3a1dc36cd312 100644
--- a/test-runner/android/test/mock/MockContentResolver.java
+++ b/test-runner/src/android/test/mock/MockContentResolver.java
diff --git a/test-runner/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index ffd757c85b71..ffd757c85b71 100644
--- a/test-runner/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
diff --git a/test-runner/android/test/mock/MockCursor.java b/test-runner/src/android/test/mock/MockCursor.java
index 9b1c0efa6948..9b1c0efa6948 100644
--- a/test-runner/android/test/mock/MockCursor.java
+++ b/test-runner/src/android/test/mock/MockCursor.java
diff --git a/test-runner/android/test/mock/MockDialogInterface.java b/test-runner/src/android/test/mock/MockDialogInterface.java
index e4dd0ba2a2d3..e4dd0ba2a2d3 100644
--- a/test-runner/android/test/mock/MockDialogInterface.java
+++ b/test-runner/src/android/test/mock/MockDialogInterface.java
diff --git a/test-runner/android/test/mock/MockIContentProvider.java b/test-runner/src/android/test/mock/MockIContentProvider.java
index 7c0a1e21ae70..7c0a1e21ae70 100644
--- a/test-runner/android/test/mock/MockIContentProvider.java
+++ b/test-runner/src/android/test/mock/MockIContentProvider.java
diff --git a/test-runner/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
index f1ba44ac170e..f1ba44ac170e 100644
--- a/test-runner/android/test/mock/MockPackageManager.java
+++ b/test-runner/src/android/test/mock/MockPackageManager.java
diff --git a/test-runner/android/test/mock/MockResources.java b/test-runner/src/android/test/mock/MockResources.java
index 18752cebde1e..18752cebde1e 100644
--- a/test-runner/android/test/mock/MockResources.java
+++ b/test-runner/src/android/test/mock/MockResources.java
diff --git a/test-runner/android/test/mock/package.html b/test-runner/src/android/test/mock/package.html
index 0f1bc6f466c2..0f1bc6f466c2 100644
--- a/test-runner/android/test/mock/package.html
+++ b/test-runner/src/android/test/mock/package.html
diff --git a/test-runner/android/test/suitebuilder/AssignableFrom.java b/test-runner/src/android/test/suitebuilder/AssignableFrom.java
index 38b4ee3f8c6e..38b4ee3f8c6e 100644
--- a/test-runner/android/test/suitebuilder/AssignableFrom.java
+++ b/test-runner/src/android/test/suitebuilder/AssignableFrom.java
diff --git a/test-runner/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java b/test-runner/src/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
index 128396e5a9c0..128396e5a9c0 100644
--- a/test-runner/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
+++ b/test-runner/src/android/test/suitebuilder/InstrumentationTestSuiteBuilder.java
diff --git a/test-runner/android/test/suitebuilder/SmokeTestSuiteBuilder.java b/test-runner/src/android/test/suitebuilder/SmokeTestSuiteBuilder.java
index 01e7ec6c566d..01e7ec6c566d 100644
--- a/test-runner/android/test/suitebuilder/SmokeTestSuiteBuilder.java
+++ b/test-runner/src/android/test/suitebuilder/SmokeTestSuiteBuilder.java
diff --git a/test-runner/android/test/suitebuilder/TestGrouping.java b/test-runner/src/android/test/suitebuilder/TestGrouping.java
index df6da703460f..df6da703460f 100644
--- a/test-runner/android/test/suitebuilder/TestGrouping.java
+++ b/test-runner/src/android/test/suitebuilder/TestGrouping.java
diff --git a/test-runner/android/test/suitebuilder/TestMethod.java b/test-runner/src/android/test/suitebuilder/TestMethod.java
index 08568d5d1a9b..08568d5d1a9b 100644
--- a/test-runner/android/test/suitebuilder/TestMethod.java
+++ b/test-runner/src/android/test/suitebuilder/TestMethod.java
diff --git a/test-runner/android/test/suitebuilder/TestPredicates.java b/test-runner/src/android/test/suitebuilder/TestPredicates.java
index d814e0b8dd40..d814e0b8dd40 100644
--- a/test-runner/android/test/suitebuilder/TestPredicates.java
+++ b/test-runner/src/android/test/suitebuilder/TestPredicates.java
diff --git a/test-runner/android/test/suitebuilder/TestSuiteBuilder.java b/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java
index 428905eba085..428905eba085 100644
--- a/test-runner/android/test/suitebuilder/TestSuiteBuilder.java
+++ b/test-runner/src/android/test/suitebuilder/TestSuiteBuilder.java
diff --git a/test-runner/android/test/suitebuilder/UnitTestSuiteBuilder.java b/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java
index 8cf4c8696412..8cf4c8696412 100644
--- a/test-runner/android/test/suitebuilder/UnitTestSuiteBuilder.java
+++ b/test-runner/src/android/test/suitebuilder/UnitTestSuiteBuilder.java
diff --git a/test-runner/android/test/suitebuilder/annotation/HasAnnotation.java b/test-runner/src/android/test/suitebuilder/annotation/HasAnnotation.java
index a2868fc9e0fd..a2868fc9e0fd 100644
--- a/test-runner/android/test/suitebuilder/annotation/HasAnnotation.java
+++ b/test-runner/src/android/test/suitebuilder/annotation/HasAnnotation.java
diff --git a/test-runner/android/test/suitebuilder/annotation/HasClassAnnotation.java b/test-runner/src/android/test/suitebuilder/annotation/HasClassAnnotation.java
index ac76f4cb46fe..ac76f4cb46fe 100644
--- a/test-runner/android/test/suitebuilder/annotation/HasClassAnnotation.java
+++ b/test-runner/src/android/test/suitebuilder/annotation/HasClassAnnotation.java
diff --git a/test-runner/android/test/suitebuilder/annotation/HasMethodAnnotation.java b/test-runner/src/android/test/suitebuilder/annotation/HasMethodAnnotation.java
index 96bd922721ea..96bd922721ea 100644
--- a/test-runner/android/test/suitebuilder/annotation/HasMethodAnnotation.java
+++ b/test-runner/src/android/test/suitebuilder/annotation/HasMethodAnnotation.java
diff --git a/test-runner/android/test/suitebuilder/annotation/package.html b/test-runner/src/android/test/suitebuilder/annotation/package.html
index ffba2e9bf980..ffba2e9bf980 100644
--- a/test-runner/android/test/suitebuilder/annotation/package.html
+++ b/test-runner/src/android/test/suitebuilder/annotation/package.html
diff --git a/test-runner/android/test/suitebuilder/package.html b/test-runner/src/android/test/suitebuilder/package.html
index ffba2e9bf980..ffba2e9bf980 100644
--- a/test-runner/android/test/suitebuilder/package.html
+++ b/test-runner/src/android/test/suitebuilder/package.html
diff --git a/test-runner/junit/MODULE_LICENSE_CPL b/test-runner/src/junit/MODULE_LICENSE_CPL
index 541dbb53c3e6..541dbb53c3e6 100644
--- a/test-runner/junit/MODULE_LICENSE_CPL
+++ b/test-runner/src/junit/MODULE_LICENSE_CPL
diff --git a/test-runner/junit/runner/BaseTestRunner.java b/test-runner/src/junit/runner/BaseTestRunner.java
index e073ef789fc6..e073ef789fc6 100644
--- a/test-runner/junit/runner/BaseTestRunner.java
+++ b/test-runner/src/junit/runner/BaseTestRunner.java
diff --git a/test-runner/junit/runner/ClassPathTestCollector.java b/test-runner/src/junit/runner/ClassPathTestCollector.java
index 8a3c702cb5c6..8a3c702cb5c6 100644
--- a/test-runner/junit/runner/ClassPathTestCollector.java
+++ b/test-runner/src/junit/runner/ClassPathTestCollector.java
diff --git a/test-runner/junit/runner/FailureDetailView.java b/test-runner/src/junit/runner/FailureDetailView.java
index 7108cec23f7c..7108cec23f7c 100644
--- a/test-runner/junit/runner/FailureDetailView.java
+++ b/test-runner/src/junit/runner/FailureDetailView.java
diff --git a/test-runner/junit/runner/LoadingTestCollector.java b/test-runner/src/junit/runner/LoadingTestCollector.java
index b1760b1610d2..b1760b1610d2 100644
--- a/test-runner/junit/runner/LoadingTestCollector.java
+++ b/test-runner/src/junit/runner/LoadingTestCollector.java
diff --git a/test-runner/junit/runner/ReloadingTestSuiteLoader.java b/test-runner/src/junit/runner/ReloadingTestSuiteLoader.java
index a6d84fe27e34..a6d84fe27e34 100644
--- a/test-runner/junit/runner/ReloadingTestSuiteLoader.java
+++ b/test-runner/src/junit/runner/ReloadingTestSuiteLoader.java
diff --git a/test-runner/junit/runner/SimpleTestCollector.java b/test-runner/src/junit/runner/SimpleTestCollector.java
index 543168f8092f..543168f8092f 100644
--- a/test-runner/junit/runner/SimpleTestCollector.java
+++ b/test-runner/src/junit/runner/SimpleTestCollector.java
diff --git a/test-runner/junit/runner/Sorter.java b/test-runner/src/junit/runner/Sorter.java
index 66f551e7ad24..66f551e7ad24 100644
--- a/test-runner/junit/runner/Sorter.java
+++ b/test-runner/src/junit/runner/Sorter.java
diff --git a/test-runner/junit/runner/StandardTestSuiteLoader.java b/test-runner/src/junit/runner/StandardTestSuiteLoader.java
index bce7dec83557..bce7dec83557 100644
--- a/test-runner/junit/runner/StandardTestSuiteLoader.java
+++ b/test-runner/src/junit/runner/StandardTestSuiteLoader.java
diff --git a/test-runner/junit/runner/TestCaseClassLoader.java b/test-runner/src/junit/runner/TestCaseClassLoader.java
index 3a510c69d9d3..3a510c69d9d3 100644
--- a/test-runner/junit/runner/TestCaseClassLoader.java
+++ b/test-runner/src/junit/runner/TestCaseClassLoader.java
diff --git a/test-runner/junit/runner/TestCollector.java b/test-runner/src/junit/runner/TestCollector.java
index 208dccde6b02..208dccde6b02 100644
--- a/test-runner/junit/runner/TestCollector.java
+++ b/test-runner/src/junit/runner/TestCollector.java
diff --git a/test-runner/junit/runner/TestRunListener.java b/test-runner/src/junit/runner/TestRunListener.java
index 0e9581989eee..0e9581989eee 100644
--- a/test-runner/junit/runner/TestRunListener.java
+++ b/test-runner/src/junit/runner/TestRunListener.java
diff --git a/test-runner/junit/runner/TestSuiteLoader.java b/test-runner/src/junit/runner/TestSuiteLoader.java
index 39a4cf79a6af..39a4cf79a6af 100644
--- a/test-runner/junit/runner/TestSuiteLoader.java
+++ b/test-runner/src/junit/runner/TestSuiteLoader.java
diff --git a/test-runner/junit/runner/Version.java b/test-runner/src/junit/runner/Version.java
index b4541abdec8f..b4541abdec8f 100644
--- a/test-runner/junit/runner/Version.java
+++ b/test-runner/src/junit/runner/Version.java
diff --git a/test-runner/junit/runner/excluded.properties b/test-runner/src/junit/runner/excluded.properties
index 32846283e6cc..32846283e6cc 100644
--- a/test-runner/junit/runner/excluded.properties
+++ b/test-runner/src/junit/runner/excluded.properties
diff --git a/test-runner/junit/runner/logo.gif b/test-runner/src/junit/runner/logo.gif
index d0e154738605..d0e154738605 100644
--- a/test-runner/junit/runner/logo.gif
+++ b/test-runner/src/junit/runner/logo.gif
diff --git a/test-runner/junit/runner/package.html b/test-runner/src/junit/runner/package.html
index f08fa7013299..f08fa7013299 100644
--- a/test-runner/junit/runner/package.html
+++ b/test-runner/src/junit/runner/package.html
diff --git a/test-runner/junit/runner/smalllogo.gif b/test-runner/src/junit/runner/smalllogo.gif
index 7b25eaf6a16e..7b25eaf6a16e 100644
--- a/test-runner/junit/runner/smalllogo.gif
+++ b/test-runner/src/junit/runner/smalllogo.gif
diff --git a/test-runner/junit/textui/ResultPrinter.java b/test-runner/src/junit/textui/ResultPrinter.java
index 5c9711226677..5c9711226677 100644
--- a/test-runner/junit/textui/ResultPrinter.java
+++ b/test-runner/src/junit/textui/ResultPrinter.java
diff --git a/test-runner/junit/textui/TestRunner.java b/test-runner/src/junit/textui/TestRunner.java
index 8bdc3258a8de..8bdc3258a8de 100644
--- a/test-runner/junit/textui/TestRunner.java
+++ b/test-runner/src/junit/textui/TestRunner.java
diff --git a/test-runner/junit/textui/package.html b/test-runner/src/junit/textui/package.html
index 723f2ae5151c..723f2ae5151c 100644
--- a/test-runner/junit/textui/package.html
+++ b/test-runner/src/junit/textui/package.html
diff --git a/test-runner/tests/Android.mk b/test-runner/tests/Android.mk
new file mode 100644
index 000000000000..d1efe7b17e23
--- /dev/null
+++ b/test-runner/tests/Android.mk
@@ -0,0 +1,29 @@
+# Copyright 2010, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+# We only want this apk build for tests.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+# Include all test java files.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := FrameworkTestRunnerTests
+
+include $(BUILD_PACKAGE)
+
diff --git a/test-runner/tests/AndroidManifest.xml b/test-runner/tests/AndroidManifest.xml
new file mode 100644
index 000000000000..4f323928994c
--- /dev/null
+++ b/test-runner/tests/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.frameworks.testrunner.tests">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="android.test.StubTestBrowserActivity"
+            android:label="Stubbed Test Browser">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FOR_TESTS_ONLY"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.test.TestBrowserTests"
+            android:label="Test Browser Tests">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.UNIT_TEST"/>
+            </intent-filter>
+        </activity>`
+    </application>
+
+    <instrumentation
+        android:name="android.test.InstrumentationTestRunner"
+        android:targetPackage="com.android.frameworks.testrunner.tests"
+        android:label="Framework testrunner tests" />
+</manifest>
diff --git a/tests/CoreTests/android/test/AndroidTestRunnerTest.java b/test-runner/tests/src/android/test/AndroidTestRunnerTest.java
index 05747049dd21..05747049dd21 100644
--- a/tests/CoreTests/android/test/AndroidTestRunnerTest.java
+++ b/test-runner/tests/src/android/test/AndroidTestRunnerTest.java
diff --git a/tests/CoreTests/android/test/InstrumentationTestRunnerTest.java b/test-runner/tests/src/android/test/InstrumentationTestRunnerTest.java
index d9afd545f822..d9afd545f822 100644
--- a/tests/CoreTests/android/test/InstrumentationTestRunnerTest.java
+++ b/test-runner/tests/src/android/test/InstrumentationTestRunnerTest.java
diff --git a/tests/CoreTests/android/test/StubTestBrowserActivity.java b/test-runner/tests/src/android/test/StubTestBrowserActivity.java
index 97ed3ce82185..97ed3ce82185 100644
--- a/tests/CoreTests/android/test/StubTestBrowserActivity.java
+++ b/test-runner/tests/src/android/test/StubTestBrowserActivity.java
diff --git a/tests/CoreTests/android/test/TestBrowserActivityTest.java b/test-runner/tests/src/android/test/TestBrowserActivityTest.java
index 6afbe3717a37..355409e0deac 100644
--- a/tests/CoreTests/android/test/TestBrowserActivityTest.java
+++ b/test-runner/tests/src/android/test/TestBrowserActivityTest.java
@@ -215,19 +215,24 @@ public class TestBrowserActivityTest extends InstrumentationTestCase {
     }
 
     private TestBrowserActivity createActivity() throws RemoteException {
-        return launchActivity("android.test", StubTestBrowserActivity.class, null);
+        return launchActivity(getAndroidPackageName(), StubTestBrowserActivity.class, null);
     }
 
     private Intent createIntent(TestSuite testSuite) {
         Intent intent = new Intent(Intent.ACTION_RUN);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         String className = StubTestBrowserActivity.class.getName();
-        String packageName = className.substring(0, className.lastIndexOf("."));
+        String packageName = getAndroidPackageName();
         intent.setClassName(packageName, className);
         intent.setData(Uri.parse(testSuite.getName()));
         return intent;
     }
 
+    private String getAndroidPackageName() {
+        String packageName = getInstrumentation().getTargetContext().getPackageName();
+        return packageName;
+    }
+
     private TestBrowserActivity launchTestBrowserActivity(TestSuite testSuite)
             throws RemoteException {
         getInstrumentation().setInTouchMode(false);
diff --git a/tests/CoreTests/android/test/TestBrowserControllerImplTest.java b/test-runner/tests/src/android/test/TestBrowserControllerImplTest.java
index 131560689603..131560689603 100644
--- a/tests/CoreTests/android/test/TestBrowserControllerImplTest.java
+++ b/test-runner/tests/src/android/test/TestBrowserControllerImplTest.java
diff --git a/tests/CoreTests/android/test/TestBrowserTests.java b/test-runner/tests/src/android/test/TestBrowserTests.java
index 535e2f8d90c2..535e2f8d90c2 100644
--- a/tests/CoreTests/android/test/TestBrowserTests.java
+++ b/test-runner/tests/src/android/test/TestBrowserTests.java
diff --git a/tests/CoreTests/android/test/TestCaseUtilTest.java b/test-runner/tests/src/android/test/TestCaseUtilTest.java
index bc6fa9200d1b..bc6fa9200d1b 100644
--- a/tests/CoreTests/android/test/TestCaseUtilTest.java
+++ b/test-runner/tests/src/android/test/TestCaseUtilTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/AssignableFromTest.java b/test-runner/tests/src/android/test/suitebuilder/AssignableFromTest.java
index 0f73e89deb49..0f73e89deb49 100644
--- a/tests/CoreTests/android/test/suitebuilder/AssignableFromTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/AssignableFromTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java b/test-runner/tests/src/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
index 1872803bd5cd..1872803bd5cd 100644
--- a/tests/CoreTests/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/InstrumentationTestSuiteBuilderTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/ListTestCaseNames.java b/test-runner/tests/src/android/test/suitebuilder/ListTestCaseNames.java
index 37ec3281410f..37ec3281410f 100644
--- a/tests/CoreTests/android/test/suitebuilder/ListTestCaseNames.java
+++ b/test-runner/tests/src/android/test/suitebuilder/ListTestCaseNames.java
diff --git a/tests/CoreTests/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java b/test-runner/tests/src/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
index f817297630b8..f817297630b8 100644
--- a/tests/CoreTests/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/SmokeTestSuiteBuilderTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/TestSuiteBuilderTest.java b/test-runner/tests/src/android/test/suitebuilder/TestSuiteBuilderTest.java
index 293c8133eb95..293c8133eb95 100644
--- a/tests/CoreTests/android/test/suitebuilder/TestSuiteBuilderTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/TestSuiteBuilderTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/UnitTestSuiteBuilderTest.java b/test-runner/tests/src/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
index 469938e6bb02..469938e6bb02 100644
--- a/tests/CoreTests/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/UnitTestSuiteBuilderTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/annotation/HasAnnotationTest.java b/test-runner/tests/src/android/test/suitebuilder/annotation/HasAnnotationTest.java
index edf067dce48b..edf067dce48b 100644
--- a/tests/CoreTests/android/test/suitebuilder/annotation/HasAnnotationTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/annotation/HasAnnotationTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/annotation/HasClassAnnotationTest.java b/test-runner/tests/src/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
index 051ea547dbbd..051ea547dbbd 100644
--- a/tests/CoreTests/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/annotation/HasClassAnnotationTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java b/test-runner/tests/src/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
index c864e288702e..c864e288702e 100644
--- a/tests/CoreTests/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/annotation/HasMethodAnnotationTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/OuterTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/OuterTest.java
index 4659bf9ffedf..4659bf9ffedf 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/OuterTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/OuterTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/error/ErrorTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/error/ErrorTest.java
index f1f6113e86d2..f1f6113e86d2 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/error/ErrorTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/error/ErrorTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/error/FailingTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/error/FailingTest.java
index 428fd23b819d..428fd23b819d 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/error/FailingTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/error/FailingTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
index 5158a9049a0c..5158a9049a0c 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/instrumentation/InstrumentationTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/nested/Level1Test.java b/test-runner/tests/src/android/test/suitebuilder/examples/nested/Level1Test.java
index 17d39d67bd74..17d39d67bd74 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/nested/Level1Test.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/nested/Level1Test.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/nested/nested/Level2Test.java b/test-runner/tests/src/android/test/suitebuilder/examples/nested/nested/Level2Test.java
index 6f0daca94f1a..6f0daca94f1a 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/nested/nested/Level2Test.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/nested/nested/Level2Test.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
index 0dfeda821c25..0dfeda821c25 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/simple/AnotherSimpleTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/simple/SimpleTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/simple/SimpleTest.java
index 4dcac44bd533..4dcac44bd533 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/simple/SimpleTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/simple/SimpleTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/smoke/NonSmokeTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
index 1512ba7b3ff9..1512ba7b3ff9 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/smoke/NonSmokeTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/smoke/SmokeTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/smoke/SmokeTest.java
index c3515dfa8eef..c3515dfa8eef 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/smoke/SmokeTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/smoke/SmokeTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/subclass/SubclassTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SubclassTest.java
index 0ab8c72ab8b1..0ab8c72ab8b1 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/subclass/SubclassTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SubclassTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/subclass/SuperclassTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SuperclassTest.java
index 05513c5447ca..05513c5447ca 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/subclass/SuperclassTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/subclass/SuperclassTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
index 3ca0f7034ca3..3ca0f7034ca3 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java
diff --git a/tests/CoreTests/android/test/suitebuilder/examples/suppress/SuppressedTest.java b/test-runner/tests/src/android/test/suitebuilder/examples/suppress/SuppressedTest.java
index c4e0e0749931..c4e0e0749931 100644
--- a/tests/CoreTests/android/test/suitebuilder/examples/suppress/SuppressedTest.java
+++ b/test-runner/tests/src/android/test/suitebuilder/examples/suppress/SuppressedTest.java
diff --git a/tests/CoreTests/android/AndroidManifest.xml b/tests/CoreTests/android/AndroidManifest.xml
index 98cc9e501ad1..f02673cb23a3 100644
--- a/tests/CoreTests/android/AndroidManifest.xml
+++ b/tests/CoreTests/android/AndroidManifest.xml
@@ -34,19 +34,6 @@
     
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="StubTestBrowserActivity" android:label="Stubbed Test Browser">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FOR_TESTS_ONLY"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.test.TestBrowserTests" android:label="Test Browser Tests">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.UNIT_TEST"/>
-            </intent-filter>
-        </activity>
     </application>
 
     <instrumentation