Bug 792546 - Part 5: Clean up excessive imports; r=rnewman

services/sync/tests/unit/head_helpers.js

@@ -1,11 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-Cu.import("resource://services-common/utils.js");
 Cu.import("resource://services-common/async.js");
-Cu.import("resource://services-sync/util.js");
-Cu.import("resource://services-sync/record.js");
-Cu.import("resource://services-sync/engines.js");
 
 let provider = {
   getFile: function(prop, persistent) {
@@ -122,15 +118,6 @@ function uninstallAddon(addon) {
   Async.waitForSyncCallback(cb);
 }
 
-
-
-_("Setting the identity for passphrase");
-Cu.import("resource://services-sync/identity.js");
-
-/*
- * Test setup helpers.
- */
-
 function generateNewKeys(collectionKeys, collections=null) {
   let wbo = collectionKeys.generateNewKeysWBO(collections);
   let modified = new_timestamp();

services/sync/tests/unit/test_addon_utils.js

@@ -3,8 +3,9 @@
 
 "use strict";
 
-Cu.import("resource://services-sync/addonutils.js");
 Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://services-sync/addonutils.js");
+Cu.import("resource://services-sync/util.js");
 
 const HTTP_PORT = 8888;
 const SERVER_ADDRESS = "http://127.0.0.1:8888";

services/sync/tests/unit/test_addons_engine.js

@@ -10,6 +10,7 @@ Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-sync/addonsreconciler.js");
 Cu.import("resource://services-sync/engines/addons.js");
 Cu.import("resource://services-sync/service.js");
+Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 
 let prefs = new Preferences();

services/sync/tests/unit/test_addons_reconciler.js

@@ -7,6 +7,7 @@ Cu.import("resource://gre/modules/AddonManager.jsm");
 Cu.import("resource://services-sync/addonsreconciler.js");
 Cu.import("resource://services-sync/engines/addons.js");
 Cu.import("resource://services-sync/service.js");
+Cu.import("resource://services-sync/util.js");
 
 loadAddonTestFunctions();
 startupManager();

services/sync/tests/unit/test_addons_store.js

@@ -7,6 +7,7 @@ Cu.import("resource://services-common/preferences.js");
 Cu.import("resource://services-sync/addonutils.js");
 Cu.import("resource://services-sync/engines/addons.js");
 Cu.import("resource://services-sync/service.js");
+Cu.import("resource://services-sync/util.js");
 
 const HTTP_PORT = 8888;
 

services/sync/tests/unit/test_collections_recovery.js

@@ -3,6 +3,7 @@
 
 // Verify that we wipe the server if we have to regenerate keys.
 Cu.import("resource://services-sync/service.js");
+Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 
 add_test(function test_missing_crypto_collection() {

services/sync/tests/unit/test_engine_abort.js

@@ -2,6 +2,7 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 Cu.import("resource://services-sync/engines.js");
+Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/rotaryengine.js");

services/sync/tests/unit/test_errorhandler.js

@@ -3,10 +3,12 @@
 
 Cu.import("resource://services-sync/engines/clients.js");
 Cu.import("resource://services-sync/constants.js");
+Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/keys.js");
 Cu.import("resource://services-sync/policies.js");
 Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/status.js");
+Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 
 const TEST_MAINTENANCE_URL = "http://localhost:8080/maintenance/";

services/sync/tests/unit/test_history_engine.js

@@ -5,6 +5,7 @@ Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/engines/history.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/identity.js");
+Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/utils.js");

services/sync/tests/unit/test_httpd_sync_server.js

@@ -1,3 +1,8 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+Cu.import("resource://services-sync/util.js");
+
 function run_test() {
   Log4Moz.repository.getLogger("Sync.Test.Server").level = Log4Moz.Level.Trace;
   initTestLogging();

services/sync/tests/unit/test_identity_manager.js

@@ -3,6 +3,7 @@
 
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/identity.js");
+Cu.import("resource://services-sync/util.js");
 
 let identity = new IdentityManager();
 

services/sync/tests/unit/test_interval_triggers.js

@@ -1,9 +1,10 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
+Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/engines/clients.js");
-Cu.import("resource://services-sync/constants.js");
+Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 
 Svc.DefaultPrefs.set("registerEngines", "");

services/sync/tests/unit/test_keys.js

@@ -4,6 +4,8 @@
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/identity.js");
 Cu.import("resource://services-sync/keys.js");
+Cu.import("resource://services-sync/record.js");
+Cu.import("resource://services-sync/util.js");
 
 let collectionKeys = new CollectionKeyManager();
 

services/sync/tests/unit/test_node_reassignment.js

@@ -9,6 +9,7 @@ Cu.import("resource://services-common/rest.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/status.js");
+Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/rotaryengine.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 

services/sync/tests/unit/test_password_tracker.js

@@ -5,6 +5,7 @@ Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/engines/passwords.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/service.js");
+Cu.import("resource://services-sync/util.js");
 
 Service.engineManager.register(PasswordEngine);
 let engine = Service.engineManager.get("passwords");

services/sync/tests/unit/test_resource_ua.js

@@ -4,6 +4,7 @@
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/resource.js");
 Cu.import("resource://services-sync/service.js");
+Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 
 const TEST_GET_URL = "http://localhost:8080/1.1/johndoe/storage/meta/global";

services/sync/tests/unit/test_score_triggers.js

@@ -6,6 +6,7 @@ Cu.import("resource://services-sync/engines/clients.js");
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/status.js");
+Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/rotaryengine.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 

services/sync/tests/unit/test_service_detect_upgrade.js

@@ -6,6 +6,7 @@ Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/keys.js");
 Cu.import("resource://services-sync/engines/tabs.js");
 Cu.import("resource://services-sync/engines.js");
+Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/utils.js");

services/sync/tests/unit/test_service_migratePrefs.js

@@ -1,4 +1,8 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
 Cu.import("resource://services-common/preferences.js");
+Cu.import("resource://services-sync/util.js");
 
 function test_migrate_logging() {
   _("Testing log pref migration.");

services/sync/tests/unit/test_syncengine_sync.js

@@ -4,6 +4,7 @@
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/engines.js");
 Cu.import("resource://services-sync/policies.js");
+Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/resource.js");
 Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/util.js");

services/sync/tests/unit/test_syncscheduler.js

@@ -8,6 +8,7 @@ Cu.import("resource://services-sync/policies.js");
 Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/service.js");
 Cu.import("resource://services-sync/status.js");
+Cu.import("resource://services-sync/util.js");
 Cu.import("resource://testing-common/services/sync/utils.js");
 
 Service.engineManager.clear();

services/sync/tests/unit/test_upgrade_old_sync_key.js

@@ -3,6 +3,7 @@
 
 Cu.import("resource://services-sync/constants.js");
 Cu.import("resource://services-sync/service.js");
+Cu.import("resource://services-sync/util.js");
 
 // Test upgrade of a dashed old-style sync key.
 function run_test() {