Bug 1218935 - Normalize background JUnit3 source layout. r=me,rnewman

--HG--
rename : mobile/android/tests/background/junit3/src/common/TestAndroidLogWriters.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestAndroidLogWriters.java
rename : mobile/android/tests/background/junit3/src/common/TestBrowserContractHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestBrowserContractHelpers.java
rename : mobile/android/tests/background/junit3/src/common/TestDateUtils.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestDateUtils.java
rename : mobile/android/tests/background/junit3/src/common/TestUtils.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestUtils.java
rename : mobile/android/tests/background/junit3/src/common/TestWaitHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestWaitHelper.java
rename : mobile/android/tests/background/junit3/src/db/AndroidBrowserRepositoryTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/AndroidBrowserRepositoryTestCase.java
rename : mobile/android/tests/background/junit3/src/db/TestAndroidBrowserBookmarksRepository.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestAndroidBrowserBookmarksRepository.java
rename : mobile/android/tests/background/junit3/src/db/TestAndroidBrowserHistoryDataExtender.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryDataExtender.java
rename : mobile/android/tests/background/junit3/src/db/TestAndroidBrowserHistoryRepository.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryRepository.java
rename : mobile/android/tests/background/junit3/src/db/TestBookmarks.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestBookmarks.java
rename : mobile/android/tests/background/junit3/src/db/TestCachedSQLiteOpenHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestCachedSQLiteOpenHelper.java
rename : mobile/android/tests/background/junit3/src/db/TestClientsDatabase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestClientsDatabase.java
rename : mobile/android/tests/background/junit3/src/db/TestClientsDatabaseAccessor.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestClientsDatabaseAccessor.java
rename : mobile/android/tests/background/junit3/src/db/TestFennecTabsRepositorySession.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestFennecTabsRepositorySession.java
rename : mobile/android/tests/background/junit3/src/db/TestFennecTabsStorage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestFennecTabsStorage.java
rename : mobile/android/tests/background/junit3/src/db/TestFormHistoryRepositorySession.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestFormHistoryRepositorySession.java
rename : mobile/android/tests/background/junit3/src/db/TestPasswordsRepository.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestPasswordsRepository.java
rename : mobile/android/tests/background/junit3/src/fxa/TestAccountLoader.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/TestAccountLoader.java
rename : mobile/android/tests/background/junit3/src/fxa/TestBrowserIDKeyPairGeneration.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/TestBrowserIDKeyPairGeneration.java
rename : mobile/android/tests/background/junit3/src/fxa/TestFirefoxAccounts.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/TestFirefoxAccounts.java
rename : mobile/android/tests/background/junit3/src/fxa/authenticator/TestAccountPickler.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/authenticator/TestAccountPickler.java
rename : mobile/android/tests/background/junit3/src/healthreport/MockDatabaseEnvironment.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/MockDatabaseEnvironment.java
rename : mobile/android/tests/background/junit3/src/healthreport/MockHealthReportDatabaseStorage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/MockHealthReportDatabaseStorage.java
rename : mobile/android/tests/background/junit3/src/healthreport/MockHealthReportSQLiteOpenHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/MockHealthReportSQLiteOpenHelper.java
rename : mobile/android/tests/background/junit3/src/healthreport/MockProfileInformationCache.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/MockProfileInformationCache.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestEnvironmentBuilder.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestEnvironmentBuilder.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestEnvironmentV1HashAppender.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestEnvironmentV1HashAppender.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportBroadcastService.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportBroadcastService.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportDatabaseStorage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportDatabaseStorage.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportGenerator.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportGenerator.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportProvider.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportProvider.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportSQLiteOpenHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportSQLiteOpenHelper.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestProfileInformationCache.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestProfileInformationCache.java
rename : mobile/android/tests/background/junit3/src/healthreport/prune/TestHealthReportPruneService.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/prune/TestHealthReportPruneService.java
rename : mobile/android/tests/background/junit3/src/healthreport/prune/TestPrunePolicyDatabaseStorage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/prune/TestPrunePolicyDatabaseStorage.java
rename : mobile/android/tests/background/junit3/src/healthreport/upload/TestAndroidSubmissionClient.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/upload/TestAndroidSubmissionClient.java
rename : mobile/android/tests/background/junit3/src/healthreport/upload/TestHealthReportUploadService.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/upload/TestHealthReportUploadService.java
rename : mobile/android/tests/background/junit3/src/helpers/AndroidSyncTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/AndroidSyncTestCase.java
rename : mobile/android/tests/background/junit3/src/helpers/BackgroundServiceTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/BackgroundServiceTestCase.java
rename : mobile/android/tests/background/junit3/src/helpers/DBHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/DBHelpers.java
rename : mobile/android/tests/background/junit3/src/helpers/DBProviderTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/DBProviderTestCase.java
rename : mobile/android/tests/background/junit3/src/helpers/FakeProfileTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/FakeProfileTestCase.java
rename : mobile/android/tests/background/junit3/src/nativecode/test/TestNativeCrypto.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/nativecode/test/TestNativeCrypto.java
rename : mobile/android/tests/background/junit3/src/sync/AndroidSyncTestCaseWithAccounts.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/AndroidSyncTestCaseWithAccounts.java
rename : mobile/android/tests/background/junit3/src/sync/TestAccountPickler.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestAccountPickler.java
rename : mobile/android/tests/background/junit3/src/sync/TestClientsStage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestClientsStage.java
rename : mobile/android/tests/background/junit3/src/sync/TestConfigurationMigrator.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestConfigurationMigrator.java
rename : mobile/android/tests/background/junit3/src/sync/TestResetting.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestResetting.java
rename : mobile/android/tests/background/junit3/src/sync/TestSendTabData.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSendTabData.java
rename : mobile/android/tests/background/junit3/src/sync/TestStoreTracking.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestStoreTracking.java
rename : mobile/android/tests/background/junit3/src/sync/TestSyncAccounts.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSyncAccounts.java
rename : mobile/android/tests/background/junit3/src/sync/TestSyncAuthenticatorService.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSyncAuthenticatorService.java
rename : mobile/android/tests/background/junit3/src/sync/TestSyncConfiguration.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSyncConfiguration.java
rename : mobile/android/tests/background/junit3/src/sync/TestTabsRecord.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestTabsRecord.java
rename : mobile/android/tests/background/junit3/src/sync/TestUpgradeRequired.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestUpgradeRequired.java
rename : mobile/android/tests/background/junit3/src/sync/TestWebURLFinder.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestWebURLFinder.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/BookmarkHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/BookmarkHelpers.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultBeginDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultBeginDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultCleanDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultCleanDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultFetchDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultFetchDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultFinishDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultFinishDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultGuidsSinceDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultGuidsSinceDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultSessionCreationDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultSessionCreationDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultStoreDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultStoreDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectBeginDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectBeginDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectBeginFailDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectBeginFailDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectFetchDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFetchDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectFetchSinceDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFetchSinceDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectFinishDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFinishDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectFinishFailDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFinishFailDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectGuidsSinceDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectGuidsSinceDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectInvalidRequestFetchDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectInvalidRequestFetchDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectInvalidTypeStoreDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectInvalidTypeStoreDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectManyStoredDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectManyStoredDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectNoGUIDsSinceDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectNoGUIDsSinceDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectNoStoreDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectNoStoreDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectStoreCompletedDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectStoreCompletedDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectStoredDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectStoredDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/HistoryHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/HistoryHelpers.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/PasswordHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/PasswordHelpers.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SessionTestHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SessionTestHelper.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessBeginDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessBeginDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessCreationDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessCreationDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessFetchDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFetchDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessFinishDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFinishDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessStoreDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessStoreDelegate.java
rename : mobile/android/tests/background/junit3/src/telemetry/TestTelemetryRecorder.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/telemetry/TestTelemetryRecorder.java
rename : mobile/android/tests/background/junit3/src/testhelpers/BaseMockServerSyncStage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/BaseMockServerSyncStage.java
rename : mobile/android/tests/background/junit3/src/testhelpers/CommandHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/CommandHelpers.java
rename : mobile/android/tests/background/junit3/src/testhelpers/DefaultGlobalSessionCallback.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/DefaultGlobalSessionCallback.java
rename : mobile/android/tests/background/junit3/src/testhelpers/JPakeNumGeneratorFixed.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/JPakeNumGeneratorFixed.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockAbstractNonRepositorySyncStage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockAbstractNonRepositorySyncStage.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockClientsDataDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockClientsDataDelegate.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockClientsDatabaseAccessor.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockClientsDatabaseAccessor.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockGlobalSession.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockGlobalSession.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockPrefsGlobalSession.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockPrefsGlobalSession.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockRecord.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockRecord.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockServerSyncStage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockServerSyncStage.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockSharedPreferences.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockSharedPreferences.java
rename : mobile/android/tests/background/junit3/src/testhelpers/StubDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/StubDelegate.java
rename : mobile/android/tests/background/junit3/src/testhelpers/WBORepository.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/WBORepository.java
rename : mobile/android/tests/background/junit3/src/testhelpers/WaitHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/WaitHelper.java
extra : commitid : HLpjxXquxY
extra : rebase_source : c4ba4971dd4f610cf4a2df424d0fbd287f10dee7
extra : amend_source : 3ac37b3c35540e6907c2f4cf32b0263446a658d4

mobile/android/gradle/app/build.gradle

@@ -128,6 +128,9 @@ spoon {
     if (gradle.startParameter.taskNames.contains('runBrowserTests')) {
         spoonPackageName = 'org.mozilla.tests.browser.junit3'
     }
+    if (gradle.startParameter.taskNames.contains('runBackgroundTests')) {
+        spoonPackageName = 'org.mozilla.gecko.background'
+    }
     if (project.hasProperty('spoonPackageName')) {
         // Command line overrides everything.
         spoonPackageName = project.spoonPackageName
@@ -147,4 +150,7 @@ afterEvaluate {
     task runBrowserTests {
         dependsOn tasks["spoonDebugAndroidTest"]
     }
+    task runBackgroundTests {
+        dependsOn tasks["spoonDebugAndroidTest"]
+    }
 }

mobile/android/mach_commands.py

@@ -117,7 +117,7 @@ class MachCommands(MachCommandBase):
         # Test code.
         srcdir('app/src/robocop_harness/org/mozilla/gecko', 'build/mobile/robocop')
         srcdir('app/src/robocop/org/mozilla/gecko/tests', 'mobile/android/tests/browser/robocop')
-        srcdir('app/src/background/org/mozilla/gecko/background', 'mobile/android/tests/background/junit3/src')
+        srcdir('app/src/background', 'mobile/android/tests/background/junit3/src')
         srcdir('app/src/browser', 'mobile/android/tests/browser/junit3/src')
         srcdir('app/src/javaaddons', 'mobile/android/tests/javaaddons/src')
         # Test libraries.

mobile/android/tests/background/junit3/background_junit3_sources.mozbuild

@@ -5,107 +5,107 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 background_junit3_sources = [
-    'src/common/TestAndroidLogWriters.java',
-    'src/common/TestBrowserContractHelpers.java',
-    'src/common/TestDateUtils.java',
-    'src/common/TestUtils.java',
-    'src/common/TestWaitHelper.java',
-    'src/db/AndroidBrowserRepositoryTestCase.java',
-    'src/db/TestAndroidBrowserBookmarksRepository.java',
-    'src/db/TestAndroidBrowserHistoryDataExtender.java',
-    'src/db/TestAndroidBrowserHistoryRepository.java',
-    'src/db/TestBookmarks.java',
-    'src/db/TestCachedSQLiteOpenHelper.java',
-    'src/db/TestClientsDatabase.java',
-    'src/db/TestClientsDatabaseAccessor.java',
-    'src/db/TestFennecTabsRepositorySession.java',
-    'src/db/TestFennecTabsStorage.java',
-    'src/db/TestFormHistoryRepositorySession.java',
-    'src/db/TestPasswordsRepository.java',
-    'src/fxa/authenticator/TestAccountPickler.java',
-    'src/fxa/TestAccountLoader.java',
-    'src/fxa/TestBrowserIDKeyPairGeneration.java',
-    'src/fxa/TestFirefoxAccounts.java',
-    'src/healthreport/MockDatabaseEnvironment.java',
-    'src/healthreport/MockHealthReportDatabaseStorage.java',
-    'src/healthreport/MockHealthReportSQLiteOpenHelper.java',
-    'src/healthreport/MockProfileInformationCache.java',
-    'src/healthreport/prune/TestHealthReportPruneService.java',
-    'src/healthreport/prune/TestPrunePolicyDatabaseStorage.java',
-    'src/healthreport/TestEnvironmentBuilder.java',
-    'src/healthreport/TestEnvironmentV1HashAppender.java',
-    'src/healthreport/TestHealthReportBroadcastService.java',
-    'src/healthreport/TestHealthReportDatabaseStorage.java',
-    'src/healthreport/TestHealthReportGenerator.java',
-    'src/healthreport/TestHealthReportProvider.java',
-    'src/healthreport/TestHealthReportSQLiteOpenHelper.java',
-    'src/healthreport/TestProfileInformationCache.java',
-    'src/healthreport/upload/TestAndroidSubmissionClient.java',
-    'src/healthreport/upload/TestHealthReportUploadService.java',
-    'src/helpers/AndroidSyncTestCase.java',
-    'src/helpers/BackgroundServiceTestCase.java',
-    'src/helpers/DBHelpers.java',
-    'src/helpers/DBProviderTestCase.java',
-    'src/helpers/FakeProfileTestCase.java',
-    'src/nativecode/test/TestNativeCrypto.java',
-    'src/sync/AndroidSyncTestCaseWithAccounts.java',
-    'src/sync/helpers/BookmarkHelpers.java',
-    'src/sync/helpers/DefaultBeginDelegate.java',
-    'src/sync/helpers/DefaultCleanDelegate.java',
-    'src/sync/helpers/DefaultDelegate.java',
-    'src/sync/helpers/DefaultFetchDelegate.java',
-    'src/sync/helpers/DefaultFinishDelegate.java',
-    'src/sync/helpers/DefaultGuidsSinceDelegate.java',
-    'src/sync/helpers/DefaultSessionCreationDelegate.java',
-    'src/sync/helpers/DefaultStoreDelegate.java',
-    'src/sync/helpers/ExpectBeginDelegate.java',
-    'src/sync/helpers/ExpectBeginFailDelegate.java',
-    'src/sync/helpers/ExpectFetchDelegate.java',
-    'src/sync/helpers/ExpectFetchSinceDelegate.java',
-    'src/sync/helpers/ExpectFinishDelegate.java',
-    'src/sync/helpers/ExpectFinishFailDelegate.java',
-    'src/sync/helpers/ExpectGuidsSinceDelegate.java',
-    'src/sync/helpers/ExpectInvalidRequestFetchDelegate.java',
-    'src/sync/helpers/ExpectInvalidTypeStoreDelegate.java',
-    'src/sync/helpers/ExpectManyStoredDelegate.java',
-    'src/sync/helpers/ExpectNoGUIDsSinceDelegate.java',
-    'src/sync/helpers/ExpectNoStoreDelegate.java',
-    'src/sync/helpers/ExpectStoreCompletedDelegate.java',
-    'src/sync/helpers/ExpectStoredDelegate.java',
-    'src/sync/helpers/HistoryHelpers.java',
-    'src/sync/helpers/PasswordHelpers.java',
-    'src/sync/helpers/SessionTestHelper.java',
-    'src/sync/helpers/SimpleSuccessBeginDelegate.java',
-    'src/sync/helpers/SimpleSuccessCreationDelegate.java',
-    'src/sync/helpers/SimpleSuccessFetchDelegate.java',
-    'src/sync/helpers/SimpleSuccessFinishDelegate.java',
-    'src/sync/helpers/SimpleSuccessStoreDelegate.java',
-    'src/sync/TestAccountPickler.java',
-    'src/sync/TestClientsStage.java',
-    'src/sync/TestConfigurationMigrator.java',
-    'src/sync/TestResetting.java',
-    'src/sync/TestSendTabData.java',
-    'src/sync/TestStoreTracking.java',
-    'src/sync/TestSyncAccounts.java',
-    'src/sync/TestSyncAuthenticatorService.java',
-    'src/sync/TestSyncConfiguration.java',
-    'src/sync/TestTabsRecord.java',
-    'src/sync/TestUpgradeRequired.java',
-    'src/sync/TestWebURLFinder.java',
-    'src/telemetry/TestTelemetryRecorder.java',
-    'src/testhelpers/BaseMockServerSyncStage.java',
-    'src/testhelpers/CommandHelpers.java',
-    'src/testhelpers/DefaultGlobalSessionCallback.java',
-    'src/testhelpers/JPakeNumGeneratorFixed.java',
-    'src/testhelpers/MockAbstractNonRepositorySyncStage.java',
-    'src/testhelpers/MockClientsDatabaseAccessor.java',
-    'src/testhelpers/MockClientsDataDelegate.java',
-    'src/testhelpers/MockGlobalSession.java',
-    'src/testhelpers/MockPrefsGlobalSession.java',
-    'src/testhelpers/MockRecord.java',
-    'src/testhelpers/MockServerSyncStage.java',
-    'src/testhelpers/MockSharedPreferences.java',
-    'src/testhelpers/StubDelegate.java',
-    'src/testhelpers/WaitHelper.java',
-    'src/testhelpers/WBORepository.java',
+    'src/org/mozilla/gecko/background/common/TestAndroidLogWriters.java',
+    'src/org/mozilla/gecko/background/common/TestBrowserContractHelpers.java',
+    'src/org/mozilla/gecko/background/common/TestDateUtils.java',
+    'src/org/mozilla/gecko/background/common/TestUtils.java',
+    'src/org/mozilla/gecko/background/common/TestWaitHelper.java',
+    'src/org/mozilla/gecko/background/db/AndroidBrowserRepositoryTestCase.java',
+    'src/org/mozilla/gecko/background/db/TestAndroidBrowserBookmarksRepository.java',
+    'src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryDataExtender.java',
+    'src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryRepository.java',
+    'src/org/mozilla/gecko/background/db/TestBookmarks.java',
+    'src/org/mozilla/gecko/background/db/TestCachedSQLiteOpenHelper.java',
+    'src/org/mozilla/gecko/background/db/TestClientsDatabase.java',
+    'src/org/mozilla/gecko/background/db/TestClientsDatabaseAccessor.java',
+    'src/org/mozilla/gecko/background/db/TestFennecTabsRepositorySession.java',
+    'src/org/mozilla/gecko/background/db/TestFennecTabsStorage.java',
+    'src/org/mozilla/gecko/background/db/TestFormHistoryRepositorySession.java',
+    'src/org/mozilla/gecko/background/db/TestPasswordsRepository.java',
+    'src/org/mozilla/gecko/background/fxa/authenticator/TestAccountPickler.java',
+    'src/org/mozilla/gecko/background/fxa/TestAccountLoader.java',
+    'src/org/mozilla/gecko/background/fxa/TestBrowserIDKeyPairGeneration.java',
+    'src/org/mozilla/gecko/background/fxa/TestFirefoxAccounts.java',
+    'src/org/mozilla/gecko/background/healthreport/MockDatabaseEnvironment.java',
+    'src/org/mozilla/gecko/background/healthreport/MockHealthReportDatabaseStorage.java',
+    'src/org/mozilla/gecko/background/healthreport/MockHealthReportSQLiteOpenHelper.java',
+    'src/org/mozilla/gecko/background/healthreport/MockProfileInformationCache.java',
+    'src/org/mozilla/gecko/background/healthreport/prune/TestHealthReportPruneService.java',
+    'src/org/mozilla/gecko/background/healthreport/prune/TestPrunePolicyDatabaseStorage.java',
+    'src/org/mozilla/gecko/background/healthreport/TestEnvironmentBuilder.java',
+    'src/org/mozilla/gecko/background/healthreport/TestEnvironmentV1HashAppender.java',
+    'src/org/mozilla/gecko/background/healthreport/TestHealthReportBroadcastService.java',
+    'src/org/mozilla/gecko/background/healthreport/TestHealthReportDatabaseStorage.java',
+    'src/org/mozilla/gecko/background/healthreport/TestHealthReportGenerator.java',
+    'src/org/mozilla/gecko/background/healthreport/TestHealthReportProvider.java',
+    'src/org/mozilla/gecko/background/healthreport/TestHealthReportSQLiteOpenHelper.java',
+    'src/org/mozilla/gecko/background/healthreport/TestProfileInformationCache.java',
+    'src/org/mozilla/gecko/background/healthreport/upload/TestAndroidSubmissionClient.java',
+    'src/org/mozilla/gecko/background/healthreport/upload/TestHealthReportUploadService.java',
+    'src/org/mozilla/gecko/background/helpers/AndroidSyncTestCase.java',
+    'src/org/mozilla/gecko/background/helpers/BackgroundServiceTestCase.java',
+    'src/org/mozilla/gecko/background/helpers/DBHelpers.java',
+    'src/org/mozilla/gecko/background/helpers/DBProviderTestCase.java',
+    'src/org/mozilla/gecko/background/helpers/FakeProfileTestCase.java',
+    'src/org/mozilla/gecko/background/nativecode/test/TestNativeCrypto.java',
+    'src/org/mozilla/gecko/background/sync/AndroidSyncTestCaseWithAccounts.java',
+    'src/org/mozilla/gecko/background/sync/helpers/BookmarkHelpers.java',
+    'src/org/mozilla/gecko/background/sync/helpers/DefaultBeginDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/DefaultCleanDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/DefaultDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/DefaultFetchDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/DefaultFinishDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/DefaultGuidsSinceDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/DefaultSessionCreationDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/DefaultStoreDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectBeginDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectBeginFailDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectFetchDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectFetchSinceDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectFinishDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectFinishFailDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectGuidsSinceDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectInvalidRequestFetchDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectInvalidTypeStoreDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectManyStoredDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectNoGUIDsSinceDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectNoStoreDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectStoreCompletedDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/ExpectStoredDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/HistoryHelpers.java',
+    'src/org/mozilla/gecko/background/sync/helpers/PasswordHelpers.java',
+    'src/org/mozilla/gecko/background/sync/helpers/SessionTestHelper.java',
+    'src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessBeginDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessCreationDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFetchDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFinishDelegate.java',
+    'src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessStoreDelegate.java',
+    'src/org/mozilla/gecko/background/sync/TestAccountPickler.java',
+    'src/org/mozilla/gecko/background/sync/TestClientsStage.java',
+    'src/org/mozilla/gecko/background/sync/TestConfigurationMigrator.java',
+    'src/org/mozilla/gecko/background/sync/TestResetting.java',
+    'src/org/mozilla/gecko/background/sync/TestSendTabData.java',
+    'src/org/mozilla/gecko/background/sync/TestStoreTracking.java',
+    'src/org/mozilla/gecko/background/sync/TestSyncAccounts.java',
+    'src/org/mozilla/gecko/background/sync/TestSyncAuthenticatorService.java',
+    'src/org/mozilla/gecko/background/sync/TestSyncConfiguration.java',
+    'src/org/mozilla/gecko/background/sync/TestTabsRecord.java',
+    'src/org/mozilla/gecko/background/sync/TestUpgradeRequired.java',
+    'src/org/mozilla/gecko/background/sync/TestWebURLFinder.java',
+    'src/org/mozilla/gecko/background/telemetry/TestTelemetryRecorder.java',
+    'src/org/mozilla/gecko/background/testhelpers/BaseMockServerSyncStage.java',
+    'src/org/mozilla/gecko/background/testhelpers/CommandHelpers.java',
+    'src/org/mozilla/gecko/background/testhelpers/DefaultGlobalSessionCallback.java',
+    'src/org/mozilla/gecko/background/testhelpers/JPakeNumGeneratorFixed.java',
+    'src/org/mozilla/gecko/background/testhelpers/MockAbstractNonRepositorySyncStage.java',
+    'src/org/mozilla/gecko/background/testhelpers/MockClientsDatabaseAccessor.java',
+    'src/org/mozilla/gecko/background/testhelpers/MockClientsDataDelegate.java',
+    'src/org/mozilla/gecko/background/testhelpers/MockGlobalSession.java',
+    'src/org/mozilla/gecko/background/testhelpers/MockPrefsGlobalSession.java',
+    'src/org/mozilla/gecko/background/testhelpers/MockRecord.java',
+    'src/org/mozilla/gecko/background/testhelpers/MockServerSyncStage.java',
+    'src/org/mozilla/gecko/background/testhelpers/MockSharedPreferences.java',
+    'src/org/mozilla/gecko/background/testhelpers/StubDelegate.java',
+    'src/org/mozilla/gecko/background/testhelpers/WaitHelper.java',
+    'src/org/mozilla/gecko/background/testhelpers/WBORepository.java',
 ]

mobile/android/tests/background/junit3/instrumentation.ini

@@ -1,47 +1,47 @@
 [DEFAULT]
 subsuite = background
 
-[src/common/TestAndroidLogWriters.java]
-[src/common/TestBrowserContractHelpers.java]
-[src/common/TestDateUtils.java]
-[src/common/TestUtils.java]
-[src/common/TestWaitHelper.java]
-[src/db/TestAndroidBrowserBookmarksRepository.java]
-[src/db/TestAndroidBrowserHistoryDataExtender.java]
-[src/db/TestAndroidBrowserHistoryRepository.java]
-[src/db/TestBookmarks.java]
-[src/db/TestCachedSQLiteOpenHelper.java]
-[src/db/TestClientsDatabase.java]
-[src/db/TestClientsDatabaseAccessor.java]
-[src/db/TestFennecTabsRepositorySession.java]
-[src/db/TestFennecTabsStorage.java]
-[src/db/TestFormHistoryRepositorySession.java]
-[src/db/TestPasswordsRepository.java]
-[src/fxa/TestBrowserIDKeyPairGeneration.java]
-[src/fxa/authenticator/TestAccountPickler.java]
-[src/healthreport/TestEnvironmentBuilder.java]
-[src/healthreport/TestEnvironmentV1HashAppender.java]
-[src/healthreport/TestHealthReportBroadcastService.java]
-[src/healthreport/TestHealthReportDatabaseStorage.java]
-[src/healthreport/TestHealthReportGenerator.java]
-[src/healthreport/TestHealthReportProvider.java]
-[src/healthreport/TestHealthReportSQLiteOpenHelper.java]
-[src/healthreport/TestProfileInformationCache.java]
-[src/healthreport/prune/TestHealthReportPruneService.java]
-[src/healthreport/prune/TestPrunePolicyDatabaseStorage.java]
-[src/healthreport/upload/TestAndroidSubmissionClient.java]
-[src/healthreport/upload/TestHealthReportUploadService.java]
-[src/nativecode/test/TestNativeCrypto.java]
-[src/sync/TestAccountPickler.java]
-[src/sync/TestClientsStage.java]
-[src/sync/TestConfigurationMigrator.java]
-[src/sync/TestResetting.java]
-[src/sync/TestSendTabData.java]
-[src/sync/TestStoreTracking.java]
-[src/sync/TestSyncAccounts.java]
-[src/sync/TestSyncAuthenticatorService.java]
-[src/sync/TestSyncConfiguration.java]
-[src/sync/TestTabsRecord.java]
-[src/sync/TestUpgradeRequired.java]
-[src/sync/TestWebURLFinder.java]
-[src/telemetry/TestTelemetryRecorder.java]
+[src/org/mozilla/gecko/background/common/TestAndroidLogWriters.java]
+[src/org/mozilla/gecko/background/common/TestBrowserContractHelpers.java]
+[src/org/mozilla/gecko/background/common/TestDateUtils.java]
+[src/org/mozilla/gecko/background/common/TestUtils.java]
+[src/org/mozilla/gecko/background/common/TestWaitHelper.java]
+[src/org/mozilla/gecko/background/db/TestAndroidBrowserBookmarksRepository.java]
+[src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryDataExtender.java]
+[src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryRepository.java]
+[src/org/mozilla/gecko/background/db/TestBookmarks.java]
+[src/org/mozilla/gecko/background/db/TestCachedSQLiteOpenHelper.java]
+[src/org/mozilla/gecko/background/db/TestClientsDatabase.java]
+[src/org/mozilla/gecko/background/db/TestClientsDatabaseAccessor.java]
+[src/org/mozilla/gecko/background/db/TestFennecTabsRepositorySession.java]
+[src/org/mozilla/gecko/background/db/TestFennecTabsStorage.java]
+[src/org/mozilla/gecko/background/db/TestFormHistoryRepositorySession.java]
+[src/org/mozilla/gecko/background/db/TestPasswordsRepository.java]
+[src/org/mozilla/gecko/background/fxa/TestBrowserIDKeyPairGeneration.java]
+[src/org/mozilla/gecko/background/fxa/authenticator/TestAccountPickler.java]
+[src/org/mozilla/gecko/background/healthreport/TestEnvironmentBuilder.java]
+[src/org/mozilla/gecko/background/healthreport/TestEnvironmentV1HashAppender.java]
+[src/org/mozilla/gecko/background/healthreport/TestHealthReportBroadcastService.java]
+[src/org/mozilla/gecko/background/healthreport/TestHealthReportDatabaseStorage.java]
+[src/org/mozilla/gecko/background/healthreport/TestHealthReportGenerator.java]
+[src/org/mozilla/gecko/background/healthreport/TestHealthReportProvider.java]
+[src/org/mozilla/gecko/background/healthreport/TestHealthReportSQLiteOpenHelper.java]
+[src/org/mozilla/gecko/background/healthreport/TestProfileInformationCache.java]
+[src/org/mozilla/gecko/background/healthreport/prune/TestHealthReportPruneService.java]
+[src/org/mozilla/gecko/background/healthreport/prune/TestPrunePolicyDatabaseStorage.java]
+[src/org/mozilla/gecko/background/healthreport/upload/TestAndroidSubmissionClient.java]
+[src/org/mozilla/gecko/background/healthreport/upload/TestHealthReportUploadService.java]
+[src/org/mozilla/gecko/background/nativecode/test/TestNativeCrypto.java]
+[src/org/mozilla/gecko/background/sync/TestAccountPickler.java]
+[src/org/mozilla/gecko/background/sync/TestClientsStage.java]
+[src/org/mozilla/gecko/background/sync/TestConfigurationMigrator.java]
+[src/org/mozilla/gecko/background/sync/TestResetting.java]
+[src/org/mozilla/gecko/background/sync/TestSendTabData.java]
+[src/org/mozilla/gecko/background/sync/TestStoreTracking.java]
+[src/org/mozilla/gecko/background/sync/TestSyncAccounts.java]
+[src/org/mozilla/gecko/background/sync/TestSyncAuthenticatorService.java]
+[src/org/mozilla/gecko/background/sync/TestSyncConfiguration.java]
+[src/org/mozilla/gecko/background/sync/TestTabsRecord.java]
+[src/org/mozilla/gecko/background/sync/TestUpgradeRequired.java]
+[src/org/mozilla/gecko/background/sync/TestWebURLFinder.java]
+[src/org/mozilla/gecko/background/telemetry/TestTelemetryRecorder.java]