corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1421992 - script-generated patch to replace do_execute_soon, do_print and do_register_cleanup with executeSoon, info and registerCleanupFunction, rs=Gijs.

Browse Source
This commit is contained in:
Florian Quèze
2017-12-21 11:10:23 +01:00
parent a6871fc4a5
commit 1838aa9e08
832 changed files with 2901 additions and 2901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/extensions/test/xpcshell/head.js
View File

@@ -46,7 +46,7 @@ function createHttpServer(port = -1) {
let server = new HttpServer();
server.start(port);
do_register_cleanup(() => {
registerCleanupFunction(() => {
return new Promise(resolve => {
server.stop(resolve);
});

4
browser/components/extensions/test/xpcshell/test_ext_browsingData_settings.js
View File

@@ -55,7 +55,7 @@ add_task(async function testSettingsProperties() {
const SINGLE_OPTION = "cache";
const SINGLE_PREF = "privacy.cpd.cache";
do_register_cleanup(() => {
registerCleanupFunction(() => {
Preferences.reset(SINGLE_PREF);
});
@@ -100,7 +100,7 @@ add_task(async function testSettingsSince() {
await extension.startup();
do_register_cleanup(() => {
registerCleanupFunction(() => {
Preferences.reset(TIMESPAN_PREF);
});

6
browser/components/extensions/test/xpcshell/test_ext_pkcs11_management.js
View File

@@ -13,7 +13,7 @@ tmpDir.createUnique(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
let baseDir = OS.Path.join(tmpDir.path, slug);
OS.File.makeDir(baseDir);
do_register_cleanup(() => {
registerCleanupFunction(() => {
tmpDir.remove(true);
});
@@ -57,7 +57,7 @@ async function setupManifests(modules) {
};
Services.dirsvc.registerProvider(dirProvider);
do_register_cleanup(() => {
registerCleanupFunction(() => {
Services.dirsvc.unregisterProvider(dirProvider);
});
@@ -70,7 +70,7 @@ async function setupManifests(modules) {
const REGKEY = String.raw`Software\Mozilla\PKCS11Modules`;
let registry = new MockRegistry();
do_register_cleanup(() => {
registerCleanupFunction(() => {
registry.shutdown();
});

2
browser/components/migration/tests/unit/head_migration.js
View File

@@ -64,7 +64,7 @@ function registerFakePath(key, file) {
}
dirsvc.set(key, file);
do_register_cleanup(() => {
registerCleanupFunction(() => {
dirsvc.undefine(key);
if (originalFile) {
dirsvc.set(key, originalFile);

2
browser/components/migration/tests/unit/test_Chrome_passwords.js
View File

@@ -131,7 +131,7 @@ add_task(async function setup() {
dbConn = await Sqlite.openConnection({ path: loginDataFile.path });
registerFakePath("LocalAppData", do_get_file("AppData/Local/"));
do_register_cleanup(() => {
registerCleanupFunction(() => {
Services.logins.removeAllLogins();
crypto.finalize();
return dbConn.close();

2
browser/components/migration/tests/unit/test_IE7_passwords.js
View File

@@ -335,7 +335,7 @@ add_task(async function test_passwordsAvailable() {
let crypto = new OSCrypto();
let hashes = []; // the hashes of all migrator websites, this is going to be used for the clean up
do_register_cleanup(() => {
registerCleanupFunction(() => {
Services.logins.removeAllLogins();
logins = Services.logins.getAllLogins({});
Assert.equal(logins.length, 0, "There are no logins after the cleanup");

4
browser/components/migration/tests/unit/test_IE_cookies.js
View File

@@ -66,7 +66,7 @@ add_task(async function() {
let data = ctypes.char16_t.array()(256);
let sizeRef = DWORD(256).address();
do_register_cleanup(() => {
registerCleanupFunction(() => {
// Remove the cookie.
try {
let expired = new Date(new Date().setDate(date - 2));
@@ -91,7 +91,7 @@ add_task(async function() {
// Sanity check the cookie has been created.
Assert.ok(getIECookie(COOKIE.href, COOKIE.name, data, sizeRef),
"Found the added persistent IE cookie");
do_print("Found cookie: " + data.readString());
info("Found cookie: " + data.readString());
Assert.equal(data.readString(), `${COOKIE.name}=${COOKIE.value}`,
"Found the expected cookie");

2
browser/components/migration/tests/unit/test_MigrationUtils_timedRetry.js
View File

@@ -10,7 +10,7 @@ add_task(async function setup() {
tmpFile.append("TestDB");
dbConn = await Sqlite.openConnection({ path: tmpFile.path });
do_register_cleanup(() => {
registerCleanupFunction(() => {
dbConn.close();
OS.File.remove(tmpFile.path);
});

12
browser/components/migration/tests/unit/test_automigration.js
View File

@@ -25,7 +25,7 @@ AutoMigrateBackstage.MigrationUtils = new Proxy({}, {
},
});
do_register_cleanup(function() {
registerCleanupFunction(function() {
AutoMigrateBackstage.MigrationUtils = MigrationUtils;
});
@@ -116,7 +116,7 @@ add_task(async function checkProfilePicking() {
add_task(async function checkIntegration() {
gShimmedMigrator = {
get sourceProfiles() {
do_print("Read sourceProfiles");
info("Read sourceProfiles");
return null;
},
getMigrateData(profileToMigrate) {
@@ -147,7 +147,7 @@ add_task(async function checkUndoPreconditions() {
let shouldAddData = false;
gShimmedMigrator = {
get sourceProfiles() {
do_print("Read sourceProfiles");
info("Read sourceProfiles");
return null;
},
getMigrateData(profileToMigrate) {
@@ -630,17 +630,17 @@ add_task(async function checkUndoVisitsState() {
wrongMethodDeferred.reject(new Error("Unexpected call to onPageChanged " + uri.spec));
},
onFrecencyChanged(aURI) {
do_print("frecency change");
info("frecency change");
Assert.ok(frecencyChangesExpected.has(aURI.spec),
"Should be expecting frecency change for " + aURI.spec);
frecencyChangesExpected.get(aURI.spec).resolve();
},
onManyFrecenciesChanged() {
do_print("Many frecencies changed");
info("Many frecencies changed");
wrongMethodDeferred.reject(new Error("This test can't deal with onManyFrecenciesChanged to be called"));
},
onDeleteURI(aURI) {
do_print("delete uri");
info("delete uri");
Assert.ok(uriDeletedExpected.has(aURI.spec),
"Should be expecting uri deletion for " + aURI.spec);
uriDeletedExpected.get(aURI.spec).resolve();

2
browser/components/newtab/tests/xpcshell/test_AboutNewTabService.js
View File

@@ -33,7 +33,7 @@ function cleanup() {
aboutNewTabService.resetNewTabURL();
}
do_register_cleanup(cleanup);
registerCleanupFunction(cleanup);
add_task(async function test_as_and_prerender_initialized() {
Assert.equal(aboutNewTabService.activityStreamEnabled, Services.prefs.getBoolPref(ACTIVITY_STREAM_PREF),

2
browser/components/places/tests/unit/head_bookmarks.js
View File

@@ -89,7 +89,7 @@ function rebuildSmartBookmarks() {
};
Services.console.reset();
Services.console.registerListener(consoleListener);
do_register_cleanup(() => {
registerCleanupFunction(() => {
try {
Services.console.unregisterListener(consoleListener);
} catch (ex) { /* will likely fail */ }

12
browser/components/places/tests/unit/test_421483.js
View File

@@ -20,7 +20,7 @@ add_task(async function smart_bookmarks_disabled() {
PlacesUtils.annotations.getItemsWithAnnotation(SMART_BOOKMARKS_ANNO);
Assert.equal(smartBookmarkItemIds.length, 0);
do_print("check that pref has not been bumped up");
info("check that pref has not been bumped up");
Assert.equal(Services.prefs.getIntPref("browser.places.smartBookmarksVersion"), -1);
});
@@ -32,7 +32,7 @@ add_task(async function create_smart_bookmarks() {
PlacesUtils.annotations.getItemsWithAnnotation(SMART_BOOKMARKS_ANNO);
Assert.notEqual(smartBookmarkItemIds.length, 0);
do_print("check that pref has been bumped up");
info("check that pref has been bumped up");
Assert.ok(Services.prefs.getIntPref("browser.places.smartBookmarksVersion") > 0);
});
@@ -40,7 +40,7 @@ add_task(async function remove_smart_bookmark_and_restore() {
let smartBookmarkItemIds =
PlacesUtils.annotations.getItemsWithAnnotation(SMART_BOOKMARKS_ANNO);
let smartBookmarksCount = smartBookmarkItemIds.length;
do_print("remove one smart bookmark and restore");
info("remove one smart bookmark and restore");
let guid = await PlacesUtils.promiseItemGuid(smartBookmarkItemIds[0]);
await PlacesUtils.bookmarks.remove(guid);
@@ -51,7 +51,7 @@ add_task(async function remove_smart_bookmark_and_restore() {
PlacesUtils.annotations.getItemsWithAnnotation(SMART_BOOKMARKS_ANNO);
Assert.equal(smartBookmarkItemIds.length, smartBookmarksCount);
do_print("check that pref has been bumped up");
info("check that pref has been bumped up");
Assert.ok(Services.prefs.getIntPref("browser.places.smartBookmarksVersion") > 0);
});
@@ -59,7 +59,7 @@ add_task(async function move_smart_bookmark_rename_and_restore() {
let smartBookmarkItemIds =
PlacesUtils.annotations.getItemsWithAnnotation(SMART_BOOKMARKS_ANNO);
let smartBookmarksCount = smartBookmarkItemIds.length;
do_print("smart bookmark should be restored in place");
info("smart bookmark should be restored in place");
let guid = await PlacesUtils.promiseItemGuid(smartBookmarkItemIds[0]);
let bm = await PlacesUtils.bookmarks.fetch(guid);
@@ -94,6 +94,6 @@ add_task(async function move_smart_bookmark_rename_and_restore() {
Assert.equal(bm.parentGuid, subfolder.guid);
Assert.equal(bm.title, oldTitle);
do_print("check that pref has been bumped up");
info("check that pref has been bumped up");
Assert.ok(Services.prefs.getIntPref("browser.places.smartBookmarksVersion") > 0);
});

2
browser/components/places/tests/unit/test_browserGlue_bookmarkshtml.js
View File

@@ -13,7 +13,7 @@ add_task(async function() {
remove_bookmarks_html();
Services.prefs.setBoolPref("browser.bookmarks.autoExportHTML", true);
do_register_cleanup(() => Services.prefs.clearUserPref("browser.bookmarks.autoExportHTML"));
registerCleanupFunction(() => Services.prefs.clearUserPref("browser.bookmarks.autoExportHTML"));
// Initialize nsBrowserGlue before Places.
Cc["@mozilla.org/browser/browserglue;1"].getService(Ci.nsISupports);

2
browser/components/places/tests/unit/test_browserGlue_corrupt.js
View File

@@ -21,7 +21,7 @@ function run_test() {
run_next_test();
}
do_register_cleanup(function() {
registerCleanupFunction(function() {
remove_bookmarks_html();
remove_all_JSON_backups();
return PlacesUtils.bookmarks.eraseEverything();

2
browser/components/places/tests/unit/test_browserGlue_corrupt_nobackup.js
View File

@@ -19,7 +19,7 @@ function run_test() {
run_next_test();
}
do_register_cleanup(remove_bookmarks_html);
registerCleanupFunction(remove_bookmarks_html);
add_task(async function() {
// Create a corrupt database.

2
browser/components/places/tests/unit/test_browserGlue_distribution.js
View File

@@ -35,7 +35,7 @@ function run_test() {
run_next_test();
}
do_register_cleanup(function() {
registerCleanupFunction(function() {
// Remove the distribution file, even if the test failed, otherwise all
// next tests will import it.
let iniFile = gProfD.clone();

2
browser/components/places/tests/unit/test_browserGlue_migrate.js
View File

@@ -19,7 +19,7 @@ function run_test() {
run_next_test();
}
do_register_cleanup(remove_bookmarks_html);
registerCleanupFunction(remove_bookmarks_html);
add_task(async function test_migrate_bookmarks() {
// Initialize Places through the History Service and check that a new

26
browser/components/places/tests/unit/test_browserGlue_prefs.js
View File

@@ -26,7 +26,7 @@ add_task(async function setup() {
// Create our JSON backup from bookmarks.glue.json.
create_JSON_backup("bookmarks.glue.json");
do_register_cleanup(function() {
registerCleanupFunction(function() {
remove_bookmarks_html();
remove_all_JSON_backups();
@@ -35,7 +35,7 @@ add_task(async function setup() {
});
function simulatePlacesInit() {
do_print("Simulate Places init");
info("Simulate Places init");
// Force nsBrowserGlue::_initPlaces().
bg.observe(null, TOPIC_BROWSERGLUE_TEST, TOPICDATA_FORCE_PLACES_INIT);
return promiseTopicObserved("places-browser-init-complete");
@@ -57,7 +57,7 @@ add_task(async function test_checkPreferences() {
});
add_task(async function test_import() {
do_print("Import from bookmarks.html if importBookmarksHTML is true.");
info("Import from bookmarks.html if importBookmarksHTML is true.");
await PlacesUtils.bookmarks.eraseEverything();
@@ -85,8 +85,8 @@ add_task(async function test_import() {
});
add_task(async function test_import_noSmartBookmarks() {
do_print("import from bookmarks.html, but don't create smart bookmarks " +
"if they are disabled");
info("import from bookmarks.html, but don't create smart bookmarks " +
"if they are disabled");
await PlacesUtils.bookmarks.eraseEverything();
@@ -115,8 +115,8 @@ add_task(async function test_import_noSmartBookmarks() {
});
add_task(async function test_import_autoExport_updatedSmartBookmarks() {
do_print("Import from bookmarks.html, but don't create smart bookmarks " +
"if autoExportHTML is true and they are at latest version");
info("Import from bookmarks.html, but don't create smart bookmarks " +
"if autoExportHTML is true and they are at latest version");
await PlacesUtils.bookmarks.eraseEverything();
@@ -148,8 +148,8 @@ add_task(async function test_import_autoExport_updatedSmartBookmarks() {
});
add_task(async function test_import_autoExport_oldSmartBookmarks() {
do_print("Import from bookmarks.html, and create smart bookmarks if " +
"autoExportHTML is true and they are not at latest version.");
info("Import from bookmarks.html, and create smart bookmarks if " +
"autoExportHTML is true and they are not at latest version.");
await PlacesUtils.bookmarks.eraseEverything();
@@ -181,8 +181,8 @@ add_task(async function test_import_autoExport_oldSmartBookmarks() {
});
add_task(async function test_restore() {
do_print("restore from default bookmarks.html if " +
"restore_default_bookmarks is true.");
info("restore from default bookmarks.html if " +
"restore_default_bookmarks is true.");
await PlacesUtils.bookmarks.eraseEverything();
@@ -208,8 +208,8 @@ add_task(async function test_restore() {
});
add_task(async function test_restore_import() {
do_print("setting both importBookmarksHTML and " +
"restore_default_bookmarks should restore defaults.");
info("setting both importBookmarksHTML and " +
"restore_default_bookmarks should restore defaults.");
await PlacesUtils.bookmarks.eraseEverything();

2
browser/components/places/tests/unit/test_browserGlue_restore.js
View File

@@ -24,7 +24,7 @@ function run_test() {
run_next_test();
}
do_register_cleanup(function() {
registerCleanupFunction(function() {
remove_bookmarks_html();
remove_all_JSON_backups();
return PlacesUtils.bookmarks.eraseEverything();

14
browser/components/places/tests/unit/test_browserGlue_smartBookmarks.js
View File

@@ -20,7 +20,7 @@ function run_test() {
run_next_test();
}
do_register_cleanup(() => PlacesUtils.bookmarks.eraseEverything());
registerCleanupFunction(() => PlacesUtils.bookmarks.eraseEverything());
function countFolderChildren(aFolderItemId) {
let rootNode = PlacesUtils.getFolderContents(aFolderItemId).root;
@@ -53,7 +53,7 @@ add_task(async function setup() {
});
add_task(async function test_version_0() {
do_print("All smart bookmarks are created if smart bookmarks version is 0.");
info("All smart bookmarks are created if smart bookmarks version is 0.");
// Sanity check: we should have default bookmark.
Assert.ok(await PlacesUtils.bookmarks.fetch({
@@ -83,7 +83,7 @@ add_task(async function test_version_0() {
});
add_task(async function test_version_change() {
do_print("An existing smart bookmark is replaced when version changes.");
info("An existing smart bookmark is replaced when version changes.");
// Sanity check: we have a smart bookmark on the toolbar.
let bm = await PlacesUtils.bookmarks.fetch({
@@ -128,7 +128,7 @@ add_task(async function test_version_change() {
});
add_task(async function test_version_change_pos() {
do_print("bookmarks position is retained when version changes.");
info("bookmarks position is retained when version changes.");
// Sanity check items.
Assert.equal(countFolderChildren(PlacesUtils.toolbarFolderId),
@@ -168,7 +168,7 @@ add_task(async function test_version_change_pos() {
});
add_task(async function test_version_change_pos_moved() {
do_print("moved bookmarks position is retained when version changes.");
info("moved bookmarks position is retained when version changes.");
// Sanity check items.
Assert.equal(countFolderChildren(PlacesUtils.toolbarFolderId),
@@ -227,7 +227,7 @@ add_task(async function test_version_change_pos_moved() {
});
add_task(async function test_recreation() {
do_print("An explicitly removed smart bookmark should not be recreated.");
info("An explicitly removed smart bookmark should not be recreated.");
// Remove toolbar's smart bookmarks
let bm = await PlacesUtils.bookmarks.fetch({
@@ -260,7 +260,7 @@ add_task(async function test_recreation() {
});
add_task(async function test_recreation_version_0() {
do_print("Even if a smart bookmark has been removed recreate it if version is 0.");
info("Even if a smart bookmark has been removed recreate it if version is 0.");
// Sanity check items.
Assert.equal(countFolderChildren(PlacesUtils.toolbarFolderId),

18
browser/components/places/tests/unit/test_browserGlue_urlbar_defaultbehavior_migration.js
View File

@@ -12,7 +12,7 @@ var gBrowserGlue = Cc["@mozilla.org/browser/browserglue;1"]
.getService(Ci.nsIObserver);
var gGetBoolPref = Services.prefs.getBoolPref;
do_register_cleanup(cleanup);
registerCleanupFunction(cleanup);
function cleanup() {
let prefix = "browser.urlbar.suggest.";
@@ -34,7 +34,7 @@ function setupBehaviorAndMigrate(aDefaultBehavior, aAutocompleteEnabled = true)
}
add_task(async function() {
do_print("Migrate default.behavior = 0");
info("Migrate default.behavior = 0");
setupBehaviorAndMigrate(0);
Assert.ok(gGetBoolPref("browser.urlbar.suggest.history"),
@@ -48,7 +48,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Migrate default.behavior = 1");
info("Migrate default.behavior = 1");
setupBehaviorAndMigrate(1);
Assert.ok(gGetBoolPref("browser.urlbar.suggest.history"),
@@ -62,7 +62,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Migrate default.behavior = 2");
info("Migrate default.behavior = 2");
setupBehaviorAndMigrate(2);
Assert.equal(gGetBoolPref("browser.urlbar.suggest.history"), false,
@@ -76,7 +76,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Migrate default.behavior = 3");
info("Migrate default.behavior = 3");
setupBehaviorAndMigrate(3);
Assert.ok(gGetBoolPref("browser.urlbar.suggest.history"),
@@ -90,7 +90,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Migrate default.behavior = 19");
info("Migrate default.behavior = 19");
setupBehaviorAndMigrate(19);
Assert.ok(gGetBoolPref("browser.urlbar.suggest.history"),
@@ -104,7 +104,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Migrate default.behavior = 33");
info("Migrate default.behavior = 33");
setupBehaviorAndMigrate(33);
Assert.ok(gGetBoolPref("browser.urlbar.suggest.history"),
@@ -118,7 +118,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Migrate default.behavior = 129");
info("Migrate default.behavior = 129");
setupBehaviorAndMigrate(129);
Assert.ok(gGetBoolPref("browser.urlbar.suggest.history"),
@@ -132,7 +132,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Migrate default.behavior = 0, autocomplete.enabled = false");
info("Migrate default.behavior = 0, autocomplete.enabled = false");
setupBehaviorAndMigrate(0, false);
Assert.equal(gGetBoolPref("browser.urlbar.suggest.history"), false,

12
browser/components/places/tests/unit/test_clearHistory_shutdown.js
View File

@@ -40,7 +40,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "FormHistory",
var timeInMicroseconds = Date.now() * 1000;
add_task(async function test_execute() {
do_print("Initialize browserglue before Places");
info("Initialize browserglue before Places");
// Avoid default bookmarks import.
let glue = Cc["@mozilla.org/browser/browserglue;1"].
@@ -61,20 +61,20 @@ add_task(async function test_execute() {
Services.prefs.setBoolPref("privacy.sanitize.sanitizeOnShutdown", true);
do_print("Add visits.");
info("Add visits.");
for (let aUrl of URIS) {
await PlacesTestUtils.addVisits({
uri: uri(aUrl), visitDate: timeInMicroseconds++,
transition: PlacesUtils.history.TRANSITION_TYPED
});
}
do_print("Add cache.");
info("Add cache.");
await storeCache(FTP_URL, "testData");
do_print("Add form history.");
info("Add form history.");
await addFormHistory();
Assert.equal((await getFormHistoryCount()), 1, "Added form history");
do_print("Simulate and wait shutdown.");
info("Simulate and wait shutdown.");
await shutdownPlaces();
Assert.equal((await getFormHistoryCount()), 0, "Form history cleared");
@@ -93,7 +93,7 @@ add_task(async function test_execute() {
stmt.finalize();
}
do_print("Check cache");
info("Check cache");
// Check cache.
await checkCache(FTP_URL);
});

2
browser/components/places/tests/unit/test_leftpane_corruption_handling.js
View File

@@ -28,7 +28,7 @@ add_task(async function() {
gAllBookmarksFolderIdGetter = Object.getOwnPropertyDescriptor(PlacesUIUtils, "allBookmarksFolderId");
Assert.equal(typeof(gAllBookmarksFolderIdGetter.get), "function");
do_register_cleanup(() => PlacesUtils.bookmarks.eraseEverything());
registerCleanupFunction(() => PlacesUtils.bookmarks.eraseEverything());
});
add_task(async function() {

4
browser/components/sessionstore/test/unit/head.js
View File

@@ -7,10 +7,10 @@ const {OS} = Cu.import("resource://gre/modules/osfile.jsm", {});
// Call a function once initialization of SessionStartup is complete
function afterSessionStartupInitialization(cb) {
do_print("Waiting for session startup initialization");
info("Waiting for session startup initialization");
let observer = function() {
try {
do_print("Session startup initialization observed");
info("Session startup initialization observed");
Services.obs.removeObserver(observer, "sessionstore-state-finalized");
cb();
} catch (ex) {

8
browser/components/sessionstore/test/unit/test_backup_once.js
View File

@@ -39,7 +39,7 @@ var decoder;
function promise_check_exist(path, shouldExist) {
return (async function() {
do_print("Ensuring that " + path + (shouldExist ? " exists" : " does not exist"));
info("Ensuring that " + path + (shouldExist ? " exists" : " does not exist"));
if ((await OS.File.exists(path)) != shouldExist) {
throw new Error("File " + path + " should " + (shouldExist ? "exist" : "not exist"));
}
@@ -48,7 +48,7 @@ function promise_check_exist(path, shouldExist) {
function promise_check_contents(path, expect) {
return (async function() {
do_print("Checking whether " + path + " has the right contents");
info("Checking whether " + path + " has the right contents");
let actual = await OS.File.read(path, { encoding: "utf-8", compression: "lz4" });
Assert.deepEqual(JSON.parse(actual), expect, `File ${path} contains the expected data.`);
})();
@@ -66,14 +66,14 @@ add_task(async function test_first_write_backup() {
let initial_content = generateFileContents("initial");
let new_content = generateFileContents("test_1");
do_print("Before the first write, none of the files should exist");
info("Before the first write, none of the files should exist");
await promise_check_exist(Paths.backups, false);
await File.makeDir(Paths.backups);
await File.writeAtomic(Paths.clean, JSON.stringify(initial_content), { encoding: "utf-8", compression: "lz4" });
await SessionFile.write(new_content);
do_print("After first write, a few files should have been created");
info("After first write, a few files should have been created");
await promise_check_exist(Paths.backups, true);
await promise_check_exist(Paths.clean, false);
await promise_check_exist(Paths.cleanBackup, true);

4
browser/components/sessionstore/test/unit/test_migration_lz4compression.js
View File

@@ -17,7 +17,7 @@ updateAppInfo({
function promise_check_exist(path, shouldExist) {
return (async function() {
do_print("Ensuring that " + path + (shouldExist ? " exists" : " does not exist"));
info("Ensuring that " + path + (shouldExist ? " exists" : " does not exist"));
if ((await OS.File.exists(path)) != shouldExist) {
throw new Error("File " + path + " should " + (shouldExist ? "exist" : "not exist"));
}
@@ -26,7 +26,7 @@ function promise_check_exist(path, shouldExist) {
function promise_check_contents(path, expect) {
return (async function() {
do_print("Checking whether " + path + " has the right contents");
info("Checking whether " + path + " has the right contents");
let actual = await OS.File.read(path, { encoding: "utf-8", compression: "lz4" });
Assert.deepEqual(JSON.parse(actual), expect, `File ${path} contains the expected data.`);
})();

2
browser/components/sessionstore/test/unit/test_shutdown_cleanup.js
View File

@@ -37,7 +37,7 @@ add_task(async function setup() {
await SessionFile.read();
// Reset prefs on cleanup.
do_register_cleanup(() => {
registerCleanupFunction(() => {
Services.prefs.clearUserPref("browser.sessionstore.max_serialize_back");
Services.prefs.clearUserPref("browser.sessionstore.max_serialize_forward");
});

2
browser/components/tests/unit/test_browserGlue_migration_loop_cleanup.js
View File

@@ -24,7 +24,7 @@ add_task(async function test_check_cleanup_loop_prefs() {
"should have left non-loop pref 'loo.createdRoom' untouched");
});
do_register_cleanup(() => {
registerCleanupFunction(() => {
Services.prefs.clearUserPref("browser.migration.version");
Services.prefs.clearUserPref("loop.createdRoom");
Services.prefs.clearUserPref("loop1.createdRoom");

2
browser/components/tests/unit/test_distribution.js
View File

@@ -79,7 +79,7 @@ function run_test() {
run_next_test();
}
do_register_cleanup(function() {
registerCleanupFunction(function() {
// Remove the distribution dir, even if the test failed, otherwise all
// next tests will use it.
let distDir = gProfD.clone();

2
browser/components/tests/unit/test_distribution_cachedexistence.js
View File

@@ -112,7 +112,7 @@ function setupTest() {
Services.prefs.setBoolPref(PREF_LOAD_FROM_PROFILE, true);
}
do_register_cleanup(function() {
registerCleanupFunction(function() {
deleteDistribution();
Services.prefs.clearUserPref(PREF_LOAD_FROM_PROFILE);
});

2
browser/experiments/test/xpcshell/test_activate.js
View File

@@ -33,7 +33,7 @@ add_task(async function test_setup() {
let port = gHttpServer.identity.primaryPort;
gHttpRoot = "http://localhost:" + port + "/";
gHttpServer.registerDirectory("/", do_get_cwd());
do_register_cleanup(() => gHttpServer.stop(() => {}));
registerCleanupFunction(() => gHttpServer.stop(() => {}));
patchPolicy(gPolicy, {
updatechannel: () => "nightly",

2
browser/experiments/test/xpcshell/test_api.js
View File

@@ -55,7 +55,7 @@ add_task(async function test_setup() {
response.processAsync();
response.finish();
});
do_register_cleanup(() => gHttpServer.stop(() => {}));
registerCleanupFunction(() => gHttpServer.stop(() => {}));
Services.prefs.setBoolPref(PREF_EXPERIMENTS_ENABLED, true);
Services.prefs.setIntPref(PREF_LOGGING_LEVEL, 0);

2
browser/experiments/test/xpcshell/test_cache.js
View File

@@ -36,7 +36,7 @@ add_task(async function test_setup() {
response.processAsync();
response.finish();
});
do_register_cleanup(() => gHttpServer.stop(() => {}));
registerCleanupFunction(() => gHttpServer.stop(() => {}));
Services.prefs.setBoolPref(PREF_EXPERIMENTS_ENABLED, true);
Services.prefs.setIntPref(PREF_LOGGING_LEVEL, 0);

4
browser/experiments/test/xpcshell/test_cacherace.js
View File

@@ -36,7 +36,7 @@ add_task(async function test_setup() {
response.processAsync();
response.finish();
});
do_register_cleanup(() => gHttpServer.stop(() => {}));
registerCleanupFunction(() => gHttpServer.stop(() => {}));
Services.prefs.setBoolPref(PREF_EXPERIMENTS_ENABLED, true);
Services.prefs.setIntPref(PREF_LOGGING_LEVEL, 0);
@@ -83,7 +83,7 @@ add_task(async function test_setup() {
],
};
do_print("gManifestObject: " + JSON.stringify(gManifestObject));
info("gManifestObject: " + JSON.stringify(gManifestObject));
// In order for the addon manager to work properly, we hack
// Experiments.instance which is used by the XPIProvider

2
browser/experiments/test/xpcshell/test_disableExperiments.js
View File

@@ -37,7 +37,7 @@ add_task(async function test_setup() {
response.processAsync();
response.finish();
});
do_register_cleanup(() => gHttpServer.stop(() => {}));
registerCleanupFunction(() => gHttpServer.stop(() => {}));
Services.prefs.setBoolPref(PREF_EXPERIMENTS_ENABLED, true);
Services.prefs.setIntPref(PREF_LOGGING_LEVEL, 0);

2
browser/experiments/test/xpcshell/test_fetch.js
View File

@@ -20,7 +20,7 @@ function run_test() {
let port = gHttpServer.identity.primaryPort;
gHttpRoot = "http://localhost:" + port + "/";
gHttpServer.registerDirectory("/", do_get_cwd());
do_register_cleanup(() => gHttpServer.stop(() => {}));
registerCleanupFunction(() => gHttpServer.stop(() => {}));
Services.prefs.setBoolPref(PREF_EXPERIMENTS_ENABLED, true);
Services.prefs.setIntPref(PREF_LOGGING_LEVEL, 0);

2
browser/experiments/test/xpcshell/test_nethang_bug1012924.js
View File

@@ -24,7 +24,7 @@ add_task(async function test_setup() {
response.write("["); // never finish!
});
do_register_cleanup(() => httpServer.stop(() => {}));
registerCleanupFunction(() => httpServer.stop(() => {}));
Services.prefs.setBoolPref(PREF_EXPERIMENTS_ENABLED, true);
Services.prefs.setIntPref(PREF_LOGGING_LEVEL, 0);
Services.prefs.setBoolPref(PREF_LOGGING_DUMP, true);

2
browser/experiments/test/xpcshell/test_previous_provider.js
View File

@@ -26,7 +26,7 @@ add_task(function test_setup() {
res.processAsync();
res.finish();
});
do_register_cleanup(() => gHttpServer.stop(() => {}));
registerCleanupFunction(() => gHttpServer.stop(() => {}));
Services.prefs.setBoolPref("experiments.enabled", true);
Services.prefs.setCharPref("experiments.manifest.uri",

6
browser/experiments/test/xpcshell/test_telemetry.js
View File

@@ -24,7 +24,7 @@ var gManifestHandlerURI = null;
const TLOG = TELEMETRY_LOG;
function checkEvent(event, id, data) {
do_print("Checking message " + id);
info("Checking message " + id);
Assert.equal(event[0], id, "id should match");
Assert.ok(event[1] > 0, "timestamp should be greater than 0");
@@ -55,7 +55,7 @@ add_task(async function test_setup() {
response.processAsync();
response.finish();
});
do_register_cleanup(() => gHttpServer.stop(() => {}));
registerCleanupFunction(() => gHttpServer.stop(() => {}));
Services.prefs.setBoolPref(PREF_EXPERIMENTS_ENABLED, true);
Services.prefs.setIntPref(PREF_LOGGING_LEVEL, 0);
@@ -131,7 +131,7 @@ add_task(async function test_telemetryBasics() {
expectedLogLength += 2;
let log = TelemetryLog.entries();
do_print("Telemetry log: " + JSON.stringify(log));
info("Telemetry log: " + JSON.stringify(log));
Assert.equal(log.length, expectedLogLength, "Telemetry log should have " + expectedLogLength + " entries.");
checkEvent(log[log.length - 2], TLOG.ACTIVATION_KEY,
[TLOG.ACTIVATION.REJECTED, EXPERIMENT1_ID, "startTime"]);

8
browser/extensions/formautofill/test/unit/head.js
View File

@@ -82,8 +82,8 @@ function verifySectionFieldDetails(sections, expectedResults) {
Assert.equal(sections.length, expectedResults.length, "Expected section count.");
sections.forEach((sectionInfo, sectionIndex) => {
let expectedSectionInfo = expectedResults[sectionIndex];
do_print("FieldName Prediction Results: " + sectionInfo.map(i => i.fieldName));
do_print("FieldName Expected Results: " + expectedSectionInfo.map(i => i.fieldName));
info("FieldName Prediction Results: " + sectionInfo.map(i => i.fieldName));
info("FieldName Expected Results: " + expectedSectionInfo.map(i => i.fieldName));
Assert.equal(sectionInfo.length, expectedSectionInfo.length, "Expected field count.");
sectionInfo.forEach((field, fieldIndex) => {
@@ -101,7 +101,7 @@ function runHeuristicsTest(patterns, fixturePathPrefix) {
patterns.forEach(testPattern => {
add_task(async function() {
do_print("Starting test fixture: " + testPattern.fixturePath);
info("Starting test fixture: " + testPattern.fixturePath);
let file = do_get_file(fixturePathPrefix + testPattern.fixturePath);
let doc = MockDocument.createTestDocumentFromFile("http://localhost:8080/test/", file);
@@ -180,7 +180,7 @@ add_task(async function head_initialize() {
Services.prefs.setBoolPref("dom.forms.autocomplete.formautofill", true);
// Clean up after every test.
do_register_cleanup(function head_cleanup() {
registerCleanupFunction(function head_cleanup() {
Services.prefs.clearUserPref("extensions.formautofill.available");
Services.prefs.clearUserPref("extensions.formautofill.creditCards.available");
Services.prefs.clearUserPref("extensions.formautofill.heuristics.enabled");

2
browser/extensions/formautofill/test/unit/test_activeStatus.js
View File

@@ -66,7 +66,7 @@ add_task(async function test_activeStatus_observe() {
add_task(async function test_activeStatus_computeStatus() {
let formAutofillParent = new FormAutofillParent();
do_register_cleanup(function cleanup() {
registerCleanupFunction(function cleanup() {
Services.prefs.clearUserPref("extensions.formautofill.addresses.enabled");
Services.prefs.clearUserPref("extensions.formautofill.creditCards.enabled");
});

2
browser/extensions/formautofill/test/unit/test_addressDataLoader.js
View File

@@ -65,7 +65,7 @@ add_task(async function test_loadDataState() {
SUPPORT_COUNTRIES_TESTCASES.forEach(testcase => {
add_task(async function test_support_country() {
do_print("Starting testcase: Check " + testcase.country + " metadata");
info("Starting testcase: Check " + testcase.country + " metadata");
let metadata = FormAutofillUtils.getCountryAddressData(testcase.country);
Assert.ok(testcase.properties.every(key => metadata[key]),
"These properties should exist: " + testcase.properties);

2
browser/extensions/formautofill/test/unit/test_addressRecords.js
View File

@@ -508,7 +508,7 @@ add_task(async function test_remove() {
MERGE_TESTCASES.forEach((testcase) => {
add_task(async function test_merge() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let profileStorage = await initProfileStorage(TEST_STORE_FILE_NAME,
[testcase.addressInStorage]);
let addresses = profileStorage.addresses.getAll();

4
browser/extensions/formautofill/test/unit/test_autofillFormFields.js
View File

@@ -490,7 +490,7 @@ function do_test(testcases, testFn) {
(function() {
let testcase = tc;
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let ccNumber = testcase.profileData["cc-number"];
if (ccNumber) {
testcase.profileData["cc-number-encrypted"] = await MasterPassword.encrypt(ccNumber);
@@ -512,7 +512,7 @@ function do_test(testcases, testFn) {
if (e.result != Cr.NS_ERROR_ABORT) {
throw e;
}
do_print("User canceled master password entry");
info("User canceled master password entry");
}
return string;
};

2
browser/extensions/formautofill/test/unit/test_collectFormFields.js
View File

@@ -436,7 +436,7 @@ for (let tc of TESTCASES) {
(function() {
let testcase = tc;
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let doc = MockDocument.createTestDocument("http://localhost:8080/test/",
testcase.document);

2
browser/extensions/formautofill/test/unit/test_createRecords.js
View File

@@ -369,7 +369,7 @@ const TESTCASES = [
for (let testcase of TESTCASES) {
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let doc = MockDocument.createTestDocument("http://localhost:8080/test/", testcase.document);
let form = doc.querySelector("form");

2
browser/extensions/formautofill/test/unit/test_creditCardRecords.js
View File

@@ -442,7 +442,7 @@ add_task(async function test_remove() {
MERGE_TESTCASES.forEach((testcase) => {
add_task(async function test_merge() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let profileStorage = await initProfileStorage(TEST_STORE_FILE_NAME,
[testcase.creditCardInStorage],
"creditCards");

2
browser/extensions/formautofill/test/unit/test_extractLabelStrings.js
View File

@@ -53,7 +53,7 @@ const TESTCASES = [
TESTCASES.forEach(testcase => {
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
LabelUtils._labelStrings = new WeakMap();
let doc = MockDocument.createTestDocument(

2
browser/extensions/formautofill/test/unit/test_findLabelElements.js
View File

@@ -77,7 +77,7 @@ const TESTCASES = [
TESTCASES.forEach(testcase => {
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let doc = MockDocument.createTestDocument(
"http://localhost:8080/test/", testcase.document);

2
browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js
View File

@@ -925,7 +925,7 @@ const TESTCASES = [
for (let testcase of TESTCASES) {
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let doc = MockDocument.createTestDocument("http://localhost:8080/test/",
testcase.document);

2
browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js
View File

@@ -40,7 +40,7 @@ add_task(async function test_isAddressField_isCreditCardField() {
};
for (let fieldName of Object.keys(TEST_CASES)) {
do_print("Starting testcase: " + fieldName);
info("Starting testcase: " + fieldName);
let info = TEST_CASES[fieldName];
Assert.equal(FormAutofillUtils.isAddressField(fieldName),
info.isAddressField,

2
browser/extensions/formautofill/test/unit/test_getFormInputDetails.js
View File

@@ -80,7 +80,7 @@ function inputDetailAssertion(detail, expected) {
TESTCASES.forEach(testcase => {
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let doc = MockDocument.createTestDocument(
"http://localhost:8080/test/", testcase.document);

8
browser/extensions/formautofill/test/unit/test_getInfo.js
View File

@@ -237,7 +237,7 @@ const TESTCASES = [
TESTCASES.forEach(testcase => {
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let doc = MockDocument.createTestDocument(
"http://localhost:8080/test/", testcase.document);
@@ -251,7 +251,7 @@ TESTCASES.forEach(testcase => {
});
add_task(async function test_regexp_list() {
do_print("Verify the fieldName support for select element.");
info("Verify the fieldName support for select element.");
let SUPPORT_LIST = {
"email": null, // email
"tel-extension": null, // tel-extension
@@ -286,8 +286,8 @@ add_task(async function test_regexp_list() {
contactType: "",
} : null),
};
do_print(testcase.description);
do_print(testcase.document);
info(testcase.description);
info(testcase.document);
let doc = MockDocument.createTestDocument(
"http://localhost:8080/test/", testcase.document);

4
browser/extensions/formautofill/test/unit/test_getRecords.js
View File

@@ -152,7 +152,7 @@ add_task(async function test_getRecords_addresses() {
];
for (let testCase of testCases) {
do_print("Starting testcase: " + testCase.description);
info("Starting testcase: " + testCase.description);
let mock = sinon.mock(target);
mock.expects("sendAsyncMessage").once().withExactArgs("FormAutofill:Records",
testCase.expectedResult);
@@ -248,7 +248,7 @@ add_task(async function test_getRecords_creditCards() {
];
for (let testCase of testCases) {
do_print("Starting testcase: " + testCase.description);
info("Starting testcase: " + testCase.description);
if (testCase.mpEnabled) {
let tokendb = Cc["@mozilla.org/security/pk11tokendb;1"].createInstance(Ci.nsIPK11TokenDB);
let token = tokendb.getInternalKeyToken();

6
browser/extensions/formautofill/test/unit/test_isAvailable.js
View File

@@ -7,7 +7,7 @@
// Load bootstrap.js into a sandbox to be able to test `isAvailable`
let sandbox = {};
Services.scriptloader.loadSubScript(bootstrapURI, sandbox, "utf-8");
do_print("bootstrapURI: " + bootstrapURI);
info("bootstrapURI: " + bootstrapURI);
add_task(async function test_defaultTestEnvironment() {
Assert.ok(sandbox.isAvailable());
@@ -16,7 +16,7 @@ add_task(async function test_defaultTestEnvironment() {
add_task(async function test_unsupportedRegion() {
Services.prefs.setCharPref("extensions.formautofill.available", "detect");
Services.prefs.setCharPref("browser.search.region", "ZZ");
do_register_cleanup(function cleanupRegion() {
registerCleanupFunction(function cleanupRegion() {
Services.prefs.clearUserPref("browser.search.region");
});
Assert.ok(!sandbox.isAvailable());
@@ -25,7 +25,7 @@ add_task(async function test_unsupportedRegion() {
add_task(async function test_supportedRegion() {
Services.prefs.setCharPref("extensions.formautofill.available", "detect");
Services.prefs.setCharPref("browser.search.region", "US");
do_register_cleanup(function cleanupRegion() {
registerCleanupFunction(function cleanupRegion() {
Services.prefs.clearUserPref("browser.search.region");
});
Assert.ok(sandbox.isAvailable());

2
browser/extensions/formautofill/test/unit/test_isCJKName.js
View File

@@ -68,7 +68,7 @@ const TESTCASES = [
add_task(async function test_isCJKName() {
TESTCASES.forEach(testcase => {
do_print("Starting testcase: " + testcase.fullName);
info("Starting testcase: " + testcase.fullName);
let result = FormAutofillNameUtils._isCJKName(testcase.fullName);
Assert.equal(result, testcase.expectedResult);
});

2
browser/extensions/formautofill/test/unit/test_isFieldEligibleForAutofill.js
View File

@@ -67,7 +67,7 @@ const TESTCASES = [
TESTCASES.forEach(testcase => {
add_task(async function() {
do_print("Starting testcase: " + testcase.document);
info("Starting testcase: " + testcase.document);
let doc = MockDocument.createTestDocument(
"http://localhost:8080/test/", testcase.document);

2
browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
View File

@@ -67,7 +67,7 @@ FormAutofillContent._markAsAutofillField = function(field) {
TESTCASES.forEach(testcase => {
add_task(async function() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
markedFieldId = [];

4
browser/extensions/formautofill/test/unit/test_masterPassword.js
View File

@@ -62,7 +62,7 @@ do_get_profile();
let windowWatcherCID =
MockRegistrar.register("@mozilla.org/embedcomp/window-watcher;1",
gWindowWatcher);
do_register_cleanup(() => {
registerCleanupFunction(() => {
MockRegistrar.unregister(windowWatcherCID);
});
@@ -70,7 +70,7 @@ TESTCASES.forEach(testcase => {
let token = MasterPassword._token;
add_task(async function test_encrypt_decrypt() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
token.initPassword(testcase.masterPassword);
// Test only: Force the token login without asking for master password

4
browser/extensions/formautofill/test/unit/test_migrateRecords.js
View File

@@ -243,7 +243,7 @@ add_task(async function test_migrateAddressRecords() {
await profileStorage.initialize();
ADDRESS_TESTCASES.forEach(testcase => {
do_print(testcase.description);
info(testcase.description);
profileStorage.addresses._migrateRecord(testcase.record);
do_check_record_matches(testcase.expectedResult, testcase.record);
});
@@ -256,7 +256,7 @@ add_task(async function test_migrateCreditCardRecords() {
await profileStorage.initialize();
CREDIT_CARD_TESTCASES.forEach(testcase => {
do_print(testcase.description);
info(testcase.description);
profileStorage.creditCards._migrateRecord(testcase.record);
do_check_record_matches(testcase.expectedResult, testcase.record);
});

4
browser/extensions/formautofill/test/unit/test_nameUtils.js
View File

@@ -268,7 +268,7 @@ const TESTCASES = [
add_task(async function test_splitName() {
TESTCASES.forEach(testcase => {
if (testcase.fullName) {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let nameParts = FormAutofillNameUtils.splitName(testcase.fullName);
Assert.deepEqual(nameParts, testcase.nameParts);
}
@@ -277,7 +277,7 @@ add_task(async function test_splitName() {
add_task(async function test_joinName() {
TESTCASES.forEach(testcase => {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let name = FormAutofillNameUtils.joinNameParts(testcase.nameParts);
Assert.equal(name, testcase.expectedFullName || testcase.fullName);
});

4
browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
View File

@@ -489,7 +489,7 @@ const TESTCASES = [
];
add_task(async function handle_earlyformsubmit_event() {
do_print("Starting testcase: Test an invalid form element");
info("Starting testcase: Test an invalid form element");
let fakeForm = MOCK_DOC.createElement("form");
sinon.spy(FormAutofillContent, "_onFormSubmit");
@@ -558,7 +558,7 @@ add_task(async function autofill_disabled() {
TESTCASES.forEach(testcase => {
add_task(async function check_records_saving_is_called_correctly() {
do_print("Starting testcase: " + testcase.description);
info("Starting testcase: " + testcase.description);
let form = MOCK_DOC.getElementById("form1");
form.reset();

2
browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js
View File

@@ -351,7 +351,7 @@ let testSets = [{
add_task(async function test_all_patterns() {
testSets.forEach(({collectionConstructor, testCases}) => {
testCases.forEach(testCase => {
do_print("Starting testcase: " + testCase.description);
info("Starting testcase: " + testCase.description);
let actual = new collectionConstructor(testCase.searchString,
testCase.fieldName,
testCase.allFieldNames,

4
browser/extensions/formautofill/test/unit/test_reconcile.js
View File

@@ -994,12 +994,12 @@ add_task(async function test_reconcile_three_way_merge() {
};
for (let collectionName in TESTCASES) {
do_print(`Start to test reconcile on ${collectionName}`);
info(`Start to test reconcile on ${collectionName}`);
let profileStorage = await initProfileStorage(TEST_STORE_FILE_NAME, null, collectionName);
for (let test of TESTCASES[collectionName]) {
do_print(test.description);
info(test.description);
profileStorage[collectionName].add(test.parent, {sourceSync: true});

2
browser/extensions/formautofill/test/unit/test_savedFieldNames.js
View File

@@ -39,7 +39,7 @@ add_task(async function test_profileSavedFieldNames_observe() {
add_task(async function test_profileSavedFieldNames_update() {
let formAutofillParent = new FormAutofillParent();
await formAutofillParent.init();
do_register_cleanup(function cleanup() {
registerCleanupFunction(function cleanup() {
Services.prefs.clearUserPref("extensions.formautofill.addresses.enabled");
});

14
browser/extensions/formautofill/test/unit/test_storage_tombstones.js
View File

@@ -51,7 +51,7 @@ function add_storage_task(test_function) {
}
add_storage_task(async function test_simple_tombstone(storage, record) {
do_print("check simple tombstone semantics");
info("check simple tombstone semantics");
let guid = storage.add(record);
Assert.equal(storage.getAll().length, 1);
@@ -70,7 +70,7 @@ add_storage_task(async function test_simple_tombstone(storage, record) {
});
add_storage_task(async function test_simple_synctombstone(storage, record) {
do_print("check simple tombstone semantics for synced records");
info("check simple tombstone semantics for synced records");
let guid = storage.add(record);
Assert.equal(storage.getAll().length, 1);
@@ -98,7 +98,7 @@ add_storage_task(async function test_simple_synctombstone(storage, record) {
});
add_storage_task(async function test_add_tombstone(storage, record) {
do_print("Should be able to add a new tombstone");
info("Should be able to add a new tombstone");
let guid = storage.add({guid: "test-guid-1", deleted: true});
// should be unable to get it normally.
@@ -120,13 +120,13 @@ add_storage_task(async function test_add_tombstone(storage, record) {
});
add_storage_task(async function test_add_tombstone_without_guid(storage, record) {
do_print("Should not be able to add a new tombstone without specifying the guid");
info("Should not be able to add a new tombstone without specifying the guid");
Assert.throws(() => { storage.add({deleted: true}); });
Assert.equal(storage.getAll({includeDeleted: true}).length, 0);
});
add_storage_task(async function test_add_tombstone_existing_guid(storage, record) {
do_print("Should not be able to add a new tombstone when a record with that ID exists");
info("Should not be able to add a new tombstone when a record with that ID exists");
let guid = storage.add(record);
Assert.throws(() => { storage.add({guid, deleted: true}); });
@@ -136,13 +136,13 @@ add_storage_task(async function test_add_tombstone_existing_guid(storage, record
});
add_storage_task(async function test_update_tombstone(storage, record) {
do_print("Updating a tombstone should fail");
info("Updating a tombstone should fail");
let guid = storage.add({guid: "test-guid-1", deleted: true});
Assert.throws(() => storage.update(guid, {}), /No matching record./);
});
add_storage_task(async function test_remove_existing_tombstone(storage, record) {
do_print("Removing a record that's already a tombstone should be a no-op");
info("Removing a record that's already a tombstone should be a no-op");
let guid = storage.add({guid: "test-guid-1", deleted: true, timeLastModified: 1234});
storage.remove(guid);

8
browser/extensions/formautofill/test/unit/test_sync.js
View File

@@ -58,10 +58,10 @@ function expectLocalProfiles(profileStorage, expected) {
ok(objectMatches(thisGot, thisExpected));
}
} catch (ex) {
do_print("Comparing expected profiles:");
do_print(JSON.stringify(expected, undefined, 2));
do_print("against actual profiles:");
do_print(JSON.stringify(profiles, undefined, 2));
info("Comparing expected profiles:");
info(JSON.stringify(expected, undefined, 2));
info("against actual profiles:");
info(JSON.stringify(profiles, undefined, 2));
throw ex;
}
}

8
browser/extensions/formautofill/test/unit/test_transformFields.js
View File

@@ -845,7 +845,7 @@ add_task(async function test_computeAddressFields() {
await profileStorage.initialize();
ADDRESS_COMPUTE_TESTCASES.forEach(testcase => {
do_print("Verify testcase: " + testcase.description);
info("Verify testcase: " + testcase.description);
let guid = profileStorage.addresses.add(testcase.address);
let address = profileStorage.addresses.get(guid);
@@ -862,7 +862,7 @@ add_task(async function test_normalizeAddressFields() {
await profileStorage.initialize();
ADDRESS_NORMALIZE_TESTCASES.forEach(testcase => {
do_print("Verify testcase: " + testcase.description);
info("Verify testcase: " + testcase.description);
let guid = profileStorage.addresses.add(testcase.address);
let address = profileStorage.addresses.get(guid);
@@ -879,7 +879,7 @@ add_task(async function test_computeCreditCardFields() {
await profileStorage.initialize();
CREDIT_CARD_COMPUTE_TESTCASES.forEach(testcase => {
do_print("Verify testcase: " + testcase.description);
info("Verify testcase: " + testcase.description);
let guid = profileStorage.creditCards.add(testcase.creditCard);
let creditCard = profileStorage.creditCards.get(guid);
@@ -896,7 +896,7 @@ add_task(async function test_normalizeCreditCardFields() {
await profileStorage.initialize();
CREDIT_CARD_NORMALIZE_TESTCASES.forEach(testcase => {
do_print("Verify testcase: " + testcase.description);
info("Verify testcase: " + testcase.description);
let guid = profileStorage.creditCards.add(testcase.creditCard);
let creditCard = profileStorage.creditCards.get(guid, {rawData: true});

2
browser/extensions/mortar/test/unit/head.js
View File

@@ -53,7 +53,7 @@ function Call_PpbFunc(obj) {
// PPAPIInstance constructor(id, rt, info, window, eventHandler, containerWindow, mm)
let instance = new PPAPIInstance(instanceId, rt, info, new Mock_Window(), null /*docShell.chromeEventHandler*/, null, new Mock_MessageManager());
do_register_cleanup(function () {
registerCleanupFunction(function () {
resHandler.setSubstitution("ppapi.js", null);
})

12
browser/extensions/onboarding/test/unit/test-onboarding-tour-type.js
View File

@@ -7,7 +7,7 @@
Cu.import("resource://onboarding/modules/OnboardingTourType.jsm");
add_task(async function() {
do_print("Starting testcase: When New user open the browser first time");
info("Starting testcase: When New user open the browser first time");
resetOnboardingDefaultState();
OnboardingTourType.check();
@@ -19,7 +19,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Starting testcase: When New user restart the browser");
info("Starting testcase: When New user restart the browser");
resetOnboardingDefaultState();
Preferences.set(PREF_TOUR_TYPE, "new");
Preferences.set(PREF_SEEN_TOURSET_VERSION, TOURSET_VERSION);
@@ -33,7 +33,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Starting testcase: When New User choosed to hide the overlay and restart the browser");
info("Starting testcase: When New User choosed to hide the overlay and restart the browser");
resetOnboardingDefaultState();
Preferences.set(PREF_TOUR_TYPE, "new");
Preferences.set(PREF_SEEN_TOURSET_VERSION, TOURSET_VERSION);
@@ -47,7 +47,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Starting testcase: When New User updated to the next major version and restart the browser");
info("Starting testcase: When New User updated to the next major version and restart the browser");
resetOnboardingDefaultState();
Preferences.set(PREF_TOURSET_VERSION, NEXT_TOURSET_VERSION);
Preferences.set(PREF_TOUR_TYPE, "new");
@@ -62,7 +62,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Starting testcase: When New User prefer hide the tour, then updated to the next major version and restart the browser");
info("Starting testcase: When New User prefer hide the tour, then updated to the next major version and restart the browser");
resetOnboardingDefaultState();
Preferences.set(PREF_TOURSET_VERSION, NEXT_TOURSET_VERSION);
Preferences.set(PREF_TOUR_TYPE, "new");
@@ -77,7 +77,7 @@ add_task(async function() {
});
add_task(async function() {
do_print("Starting testcase: When User update from browser version < 56");
info("Starting testcase: When User update from browser version < 56");
resetOldProfileDefaultState();
OnboardingTourType.check();

2
browser/modules/test/unit/test_DirectoryLinksProvider.js
View File

@@ -165,7 +165,7 @@ function run_test() {
run_next_test();
// Teardown.
do_register_cleanup(function() {
registerCleanupFunction(function() {
server.stop(function() { });
DirectoryLinksProvider.reset();
Services.locale.setRequestedLocales(origReqLocales);

12
caps/tests/unit/test_origin.js
View File

@@ -44,12 +44,12 @@ function checkSandboxOriginAttributes(arr, attrs, options) {
// utility function useful for debugging
function printAttrs(name, attrs) {
do_print(name + " {\n" +
"\tappId: " + attrs.appId + ",\n" +
"\tuserContextId: " + attrs.userContextId + ",\n" +
"\tinIsolatedMozBrowser: " + attrs.inIsolatedMozBrowser + ",\n" +
"\tprivateBrowsingId: '" + attrs.privateBrowsingId + "',\n" +
"\tfirstPartyDomain: '" + attrs.firstPartyDomain + "'\n}");
info(name + " {\n" +
"\tappId: " + attrs.appId + ",\n" +
"\tuserContextId: " + attrs.userContextId + ",\n" +
"\tinIsolatedMozBrowser: " + attrs.inIsolatedMozBrowser + ",\n" +
"\tprivateBrowsingId: '" + attrs.privateBrowsingId + "',\n" +
"\tfirstPartyDomain: '" + attrs.firstPartyDomain + "'\n}");
}

4
devtools/client/animationinspector/test/unit/test_findOptimalTimeInterval.js
View File

@@ -68,8 +68,8 @@ const TEST_DATA = [{
function run_test() {
for (let {minTimeInterval, desc, expectedInterval} of TEST_DATA) {
do_print(`Testing minTimeInterval: ${minTimeInterval}.
Expecting ${expectedInterval}.`);
info(`Testing minTimeInterval: ${minTimeInterval}.
Expecting ${expectedInterval}.`);
let interval = findOptimalTimeInterval(minTimeInterval);
if (typeof expectedInterval == "string") {

22
devtools/client/animationinspector/test/unit/test_timeScale.js
View File

@@ -134,57 +134,57 @@ const TEST_FORMAT_TIME_S = [{
}];
function run_test() {
do_print("Check the default min/max range values");
info("Check the default min/max range values");
equal(TimeScale.minStartTime, Infinity);
equal(TimeScale.maxEndTime, 0);
for (let {desc, animations, expectedMinStart, expectedMaxEnd} of
TEST_ANIMATIONS) {
do_print("Test adding a few animations: " + desc);
info("Test adding a few animations: " + desc);
for (let state of animations) {
TimeScale.addAnimation(state);
}
do_print("Checking the time scale range");
info("Checking the time scale range");
equal(TimeScale.minStartTime, expectedMinStart);
equal(TimeScale.maxEndTime, expectedMaxEnd);
do_print("Test reseting the animations");
info("Test reseting the animations");
TimeScale.reset();
equal(TimeScale.minStartTime, Infinity);
equal(TimeScale.maxEndTime, 0);
}
do_print("Add a set of animations again");
info("Add a set of animations again");
for (let state of TEST_ANIMATIONS[0].animations) {
TimeScale.addAnimation(state);
}
do_print("Test converting start times to distances");
info("Test converting start times to distances");
for (let {time, expectedDistance} of TEST_STARTTIME_TO_DISTANCE) {
let distance = TimeScale.startTimeToDistance(time);
equal(distance, expectedDistance);
}
do_print("Test converting durations to distances");
info("Test converting durations to distances");
for (let {time, expectedDistance} of TEST_DURATION_TO_DISTANCE) {
let distance = TimeScale.durationToDistance(time);
equal(distance, expectedDistance);
}
do_print("Test converting distances to times");
info("Test converting distances to times");
for (let {distance, expectedTime} of TEST_DISTANCE_TO_TIME) {
let time = TimeScale.distanceToTime(distance);
equal(time, expectedTime);
}
do_print("Test converting distances to relative times");
info("Test converting distances to relative times");
for (let {distance, expectedTime} of TEST_DISTANCE_TO_RELATIVE_TIME) {
let time = TimeScale.distanceToRelativeTime(distance);
equal(time, expectedTime);
}
do_print("Test formatting times (millis)");
info("Test formatting times (millis)");
for (let {time, expectedFormattedTime} of TEST_FORMAT_TIME_MS) {
let formattedTime = TimeScale.formatTime(time);
equal(formattedTime, expectedFormattedTime);
@@ -199,7 +199,7 @@ function run_test() {
iterationCount: 1
});
do_print("Test formatting times (seconds)");
info("Test formatting times (seconds)");
for (let {time, expectedFormattedTime} of TEST_FORMAT_TIME_S) {
let formattedTime = TimeScale.formatTime(time);
equal(formattedTime, expectedFormattedTime);

4
devtools/client/animationinspector/test/unit/test_timeScale_dimensions.js
View File

@@ -34,13 +34,13 @@ const TEST_ENDDELAY_X = [{
}];
function run_test() {
do_print("Test calculating endDelayX");
info("Test calculating endDelayX");
// Be independent of possible prior tests
TimeScale.reset();
for (let {desc, animations, expectedEndDelayX} of TEST_ENDDELAY_X) {
do_print(`Adding animations: ${desc}`);
info(`Adding animations: ${desc}`);
for (let state of animations) {
TimeScale.addAnimation(state);

2
devtools/client/inspector/grids/test/unit/test_compare_fragments_geometry.js
View File

@@ -72,7 +72,7 @@ const TESTS = [{
function run_test() {
for (let { desc, grids, expected } of TESTS) {
if (desc) {
do_print(desc);
info(desc);
}
equal(compareFragmentsGeometry(grids[0], grids[1]), expected);
}

12
devtools/client/memory/test/unit/head.js
View File

@@ -31,7 +31,7 @@ var SYSTEM_PRINCIPAL =
var EXPECTED_DTU_ASSERT_FAILURE_COUNT = 0;
do_register_cleanup(function () {
registerCleanupFunction(function () {
equal(DevToolsUtils.assertionFailureCount, EXPECTED_DTU_ASSERT_FAILURE_COUNT,
"Should have had the expected number of DevToolsUtils.assert() failures.");
});
@@ -78,11 +78,11 @@ StubbedMemoryFront.prototype.stopRecordingAllocations = expectState("attached",
function waitUntilSnapshotState(store, expected) {
let predicate = () => {
let snapshots = store.getState().snapshots;
do_print(snapshots.map(x => x.state));
info(snapshots.map(x => x.state));
return snapshots.length === expected.length &&
expected.every((state, i) => state === "*" || snapshots[i].state === state);
};
do_print(`Waiting for snapshots to be of state: ${expected}`);
info(`Waiting for snapshots to be of state: ${expected}`);
return waitUntilState(store, predicate);
}
@@ -107,8 +107,8 @@ function waitUntilCensusState(store, getCensus, expected) {
let predicate = () => {
let snapshots = store.getState().snapshots;
do_print("Current census state:" +
snapshots.map(x => getCensus(x) ? getCensus(x).state : null));
info("Current census state:" +
snapshots.map(x => getCensus(x) ? getCensus(x).state : null));
return snapshots.length === expected.length &&
expected.every((state, i) => {
@@ -118,7 +118,7 @@ function waitUntilCensusState(store, getCensus, expected) {
(census && census.state === state);
});
};
do_print(`Waiting for snapshots' censuses to be of state: ${expected}`);
info(`Waiting for snapshots' censuses to be of state: ${expected}`);
return waitUntilState(store, predicate);
}

2
devtools/client/memory/test/unit/test_action-export-snapshot.js
View File

@@ -29,7 +29,7 @@ add_task(function* () {
yield exportEvents;
let stat = yield OS.File.stat(destPath);
do_print(stat.size);
info(stat.size);
ok(stat.size > 0, "destination file is more than 0 bytes");
heapWorker.destroy();

2
devtools/client/memory/test/unit/test_action-select-snapshot.js
View File

@@ -23,7 +23,7 @@ add_task(function* () {
({ snapshots }) => snapshots.length === 5 && snapshots.every(isDone));
for (let i = 0; i < 5; i++) {
do_print(`Selecting snapshot[${i}]`);
info(`Selecting snapshot[${i}]`);
store.dispatch(actions.selectSnapshot(store.getState().snapshots[i].id));
yield waitUntilState(store, ({ snapshots }) => snapshots[i].selected);

2
devtools/client/responsive.html/test/unit/head.js
View File

@@ -16,6 +16,6 @@ const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const flags = require("devtools/shared/flags");
flags.testing = true;
do_register_cleanup(() => {
registerCleanupFunction(() => {
flags.testing = false;
});

2
devtools/client/shared/redux/middleware/test/test_middleware-task-01.js
View File

@@ -48,7 +48,7 @@ function fetch2(data) {
}
function reducer(state = [], action) {
do_print("Action called: " + action.type);
info("Action called: " + action.type);
if (["fetch1", "fetch2"].includes(action.type)) {
state.push(action);
}

2
devtools/client/shared/redux/middleware/test/test_middleware-task-02.js
View File

@@ -59,7 +59,7 @@ function fetchAsync(data) {
}
function reducer(state = [], action) {
do_print("Action called: " + action.type);
info("Action called: " + action.type);
if (/fetch/.test(action.type)) {
state.push(action);
}

2
devtools/client/shared/redux/middleware/test/test_middleware-task-03.js
View File

@@ -34,7 +34,7 @@ function generatorError() {
}
function reducer(state = [], action) {
do_print("Action called: " + action.type);
info("Action called: " + action.type);
if (action.type === ERROR_TYPE) {
state.push(action);
}

2
devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js
View File

@@ -26,7 +26,7 @@ function run_test() {
let item1 = scope.addItem("a", { value: "1" });
let item2 = scope.addItem("b", { value: "2" });
do_print("Performing a search without a controller.");
info("Performing a search without a controller.");
vv._doSearch("a");
equal(item1.target.hasAttribute("unmatched"), false,

2
devtools/client/shared/test/unit/test_advanceValidate.js
View File

@@ -16,7 +16,7 @@ const {advanceValidate} = require("devtools/client/inspector/shared/utils");
const sampleInput = '\\symbol "string" url(somewhere)';
function testInsertion(where, result, testName) {
do_print(testName);
info(testName);
equal(advanceValidate(Ci.nsIDOMKeyEvent.DOM_VK_SEMICOLON, sampleInput, where),
result, "testing advanceValidate at " + where);
}

6
devtools/client/shared/test/unit/test_attribute-parsing-01.js
View File

@@ -56,14 +56,14 @@ const TEST_DATA = [{
function run_test() {
for (let {value, splitChar, expected} of TEST_DATA) {
do_print("Splitting string: " + value);
info("Splitting string: " + value);
let tokens = splitBy(value, splitChar);
do_print("Checking that the number of parsed tokens is correct");
info("Checking that the number of parsed tokens is correct");
Assert.equal(tokens.length, expected.length);
for (let i = 0; i < tokens.length; i++) {
do_print("Checking the data in token " + i);
info("Checking the data in token " + i);
Assert.equal(tokens[i].value, expected[i].value);
if (expected[i].type) {
Assert.equal(tokens[i].type, expected[i].type);

6
devtools/client/shared/test/unit/test_attribute-parsing-02.js
View File

@@ -110,7 +110,7 @@ const TEST_DATA = [{
function run_test() {
for (let {tagName, namespaceURI, attributeName,
otherAttributes, attributeValue, expected} of TEST_DATA) {
do_print("Testing <" + tagName + " " + attributeName + "='" + attributeValue + "'>");
info("Testing <" + tagName + " " + attributeName + "='" + attributeValue + "'>");
let attributes = [
...otherAttributes || [],
@@ -122,11 +122,11 @@ function run_test() {
continue;
}
do_print("Checking that the number of parsed tokens is correct");
info("Checking that the number of parsed tokens is correct");
Assert.equal(tokens.length, expected.length);
for (let i = 0; i < tokens.length; i++) {
do_print("Checking the data in token " + i);
info("Checking the data in token " + i);
Assert.equal(tokens[i].value, expected[i].value);
Assert.equal(tokens[i].type, expected[i].type);
}

8
devtools/client/shared/test/unit/test_bezierCanvas.js
View File

@@ -18,7 +18,7 @@ function run_test() {
}
function offsetsGetterReturnsData() {
do_print("offsets getter returns an array of 2 offset objects");
info("offsets getter returns an array of 2 offset objects");
let b = new BezierCanvas(getCanvasMock(), getCubicBezier(), [.25, 0]);
let offsets = b.offsets;
@@ -35,7 +35,7 @@ function offsetsGetterReturnsData() {
Assert.equal(offsets[1].top, "100px");
Assert.equal(offsets[1].left, "200px");
do_print("offsets getter returns data according to current padding");
info("offsets getter returns data according to current padding");
b = new BezierCanvas(getCanvasMock(), getCubicBezier(), [0, 0]);
offsets = b.offsets;
@@ -47,7 +47,7 @@ function offsetsGetterReturnsData() {
}
function convertsOffsetsToCoordinates() {
do_print("Converts offsets to coordinates");
info("Converts offsets to coordinates");
let b = new BezierCanvas(getCanvasMock(), getCubicBezier(), [.25, 0]);
@@ -75,7 +75,7 @@ function convertsOffsetsToCoordinates() {
}
function plotsCanvas() {
do_print("Plots the curve to the canvas");
info("Plots the curve to the canvas");
let hasDrawnCurve = false;
let b = new BezierCanvas(getCanvasMock(), getCubicBezier(), [.25, 0]);

14
devtools/client/shared/test/unit/test_cubicBezier.js
View File

@@ -51,7 +51,7 @@ function throwsWhenIncorrectCoordinates() {
}
function convertsStringCoordinates() {
do_print("Converts string coordinates to numbers");
info("Converts string coordinates to numbers");
let c = new CubicBezier(["0", "1", ".5", "-2"]);
Assert.equal(c.coordinates[0], 0);
@@ -61,7 +61,7 @@ function convertsStringCoordinates() {
}
function coordinatesToStringOutputsAString() {
do_print("coordinates.toString() outputs a string representation");
info("coordinates.toString() outputs a string representation");
let c = new CubicBezier(["0", "1", "0.5", "-2"]);
let string = c.coordinates.toString();
@@ -73,7 +73,7 @@ function coordinatesToStringOutputsAString() {
}
function pointGettersReturnPointCoordinatesArrays() {
do_print("Points getters return arrays of coordinates");
info("Points getters return arrays of coordinates");
let c = new CubicBezier([0, .2, .5, 1]);
Assert.equal(c.P1[0], 0);
@@ -83,14 +83,14 @@ function pointGettersReturnPointCoordinatesArrays() {
}
function toStringOutputsCubicBezierValue() {
do_print("toString() outputs the cubic-bezier() value");
info("toString() outputs the cubic-bezier() value");
let c = new CubicBezier([0, 1, 1, 0]);
Assert.equal(c.toString(), "cubic-bezier(0,1,1,0)");
}
function toStringOutputsCssPresetValues() {
do_print("toString() outputs the css predefined values");
info("toString() outputs the css predefined values");
let c = new CubicBezier([0, 0, 1, 1]);
Assert.equal(c.toString(), "linear");
@@ -109,7 +109,7 @@ function toStringOutputsCssPresetValues() {
}
function testParseTimingFunction() {
do_print("test parseTimingFunction");
info("test parseTimingFunction");
for (let test of ["ease", "linear", "ease-in", "ease-out", "ease-in-out"]) {
ok(parseTimingFunction(test), test);
@@ -133,7 +133,7 @@ function testParseTimingFunction() {
}
function do_check_throws(cb, info) {
do_print(info);
info(info);
let hasThrown = false;
try {

2
devtools/client/shared/test/unit/test_escapeCSSComment.js
View File

@@ -30,7 +30,7 @@ function run_test() {
let i = 0;
for (let test of TEST_DATA) {
++i;
do_print("Test #" + i);
info("Test #" + i);
let escaped = escapeCSSComment(test.input);
equal(escaped, test.expected);

18
devtools/client/shared/test/unit/test_parseDeclarations.js
View File

@@ -385,19 +385,19 @@ function run_test() {
// Test parseDeclarations.
function run_basic_tests() {
for (let test of TEST_DATA) {
do_print("Test input string " + test.input);
info("Test input string " + test.input);
let output;
try {
output = parseDeclarations(isCssPropertyKnown, test.input,
test.parseComments);
} catch (e) {
do_print("parseDeclarations threw an exception with the given input " +
info("parseDeclarations threw an exception with the given input " +
"string");
if (test.throws) {
do_print("Exception expected");
info("Exception expected");
Assert.ok(true);
} else {
do_print("Exception unexpected\n" + e);
info("Exception unexpected\n" + e);
Assert.ok(false);
}
}
@@ -423,7 +423,7 @@ const COMMENT_DATA = [
// Test parseCommentDeclarations.
function run_comment_tests() {
for (let test of COMMENT_DATA) {
do_print("Test input string " + test.input);
info("Test input string " + test.input);
let output = _parseCommentDeclarations(isCssPropertyKnown, test.input, 0,
test.input.length + 4);
deepEqual(output, test.expected);
@@ -445,9 +445,9 @@ const NAMED_DATA = [
// Test parseNamedDeclarations.
function run_named_tests() {
for (let test of NAMED_DATA) {
do_print("Test input string " + test.input);
info("Test input string " + test.input);
let output = parseNamedDeclarations(isCssPropertyKnown, test.input, true);
do_print(JSON.stringify(output));
info(JSON.stringify(output));
deepEqual(output, test.expected);
}
}
@@ -456,7 +456,7 @@ function assertOutput(actual, expected) {
if (actual.length === expected.length) {
for (let i = 0; i < expected.length; i++) {
Assert.ok(!!actual[i]);
do_print("Check that the output item has the expected name, " +
info("Check that the output item has the expected name, " +
"value and priority");
Assert.equal(expected[i].name, actual[i].name);
Assert.equal(expected[i].value, actual[i].value);
@@ -468,7 +468,7 @@ function assertOutput(actual, expected) {
}
} else {
for (let prop of actual) {
do_print("Actual output contained: {name: " + prop.name + ", value: " +
info("Actual output contained: {name: " + prop.name + ", value: " +
prop.value + ", priority: " + prop.priority + "}");
}
Assert.equal(actual.length, expected.length);

10
devtools/client/shared/test/unit/test_parseSingleValue.js
View File

@@ -68,18 +68,18 @@ const TEST_DATA = [
function run_test() {
for (let test of TEST_DATA) {
do_print("Test input value " + test.input);
info("Test input value " + test.input);
try {
let output = parseSingleValue(isCssPropertyKnown, test.input);
assertOutput(output, test.expected);
} catch (e) {
do_print("parseSingleValue threw an exception with the given input " +
info("parseSingleValue threw an exception with the given input " +
"value");
if (test.throws) {
do_print("Exception expected");
info("Exception expected");
Assert.ok(true);
} else {
do_print("Exception unexpected\n" + e);
info("Exception unexpected\n" + e);
Assert.ok(false);
}
}
@@ -87,7 +87,7 @@ function run_test() {
}
function assertOutput(actual, expected) {
do_print("Check that the output has the expected value and priority");
info("Check that the output has the expected value and priority");
Assert.equal(expected.value, actual.value);
Assert.equal(expected.priority, actual.priority);
}

6
devtools/client/shared/test/unit/test_suggestion-picker.js
View File

@@ -44,7 +44,7 @@ const TEST_DATA = [
];
function ensureMostRelevantIndexProvidedByHelperFunction() {
do_print("Running ensureMostRelevantIndexProvidedByHelperFunction()");
info("Running ensureMostRelevantIndexProvidedByHelperFunction()");
for (let testData of TEST_DATA) {
let { items, sortedItems, expectedIndex } = testData;
@@ -126,7 +126,7 @@ const CSS_TEST_DATA = [
];
function ensureMostRelevantIndexProvidedByClassMethod() {
do_print("Running ensureMostRelevantIndexProvidedByClassMethod()");
info("Running ensureMostRelevantIndexProvidedByClassMethod()");
for (let testData of CSS_TEST_DATA) {
let { items, expectedIndex } = testData;
@@ -136,7 +136,7 @@ function ensureMostRelevantIndexProvidedByClassMethod() {
}
function ensureErrorThrownWithInvalidArguments() {
do_print("Running ensureErrorThrownWithInvalidTypeArgument()");
info("Running ensureErrorThrownWithInvalidTypeArgument()");
let expectedError = "Please provide valid items and sortedItems arrays.";
// No arguments passed.

2
devtools/server/tests/unit/test_animation_name.js
View File

@@ -77,7 +77,7 @@ function run_test() {
}];
for (let { desc, animation, props, expectedName } of TEST_DATA) {
do_print(desc);
info(desc);
for (let key in props) {
animation[key] = props[key];
}

2
devtools/server/tests/unit/test_animation_type.js
View File

@@ -61,7 +61,7 @@ function run_test() {
}];
for (let { desc, animation, expectedType } of TEST_DATA) {
do_print(desc);
info(desc);
let actor = AnimationPlayerActor({}, animation);
Assert.equal(actor.getType(), expectedType);
}

2
devtools/server/tests/unit/test_breakpoint-02.js
View File

@@ -52,7 +52,7 @@ function test_breakpoint_running() {
// so just make sure we got the expected response from the actor.
Assert.notEqual(response.error, "noScript");
do_execute_soon(function () {
executeSoon(function () {
gClient.close().then(gCallback);
});
});

4
devtools/server/tests/unit/test_client_request.js
View File

@@ -55,13 +55,13 @@ function init() {
function checkStack(expectedName) {
if (!Services.prefs.getBoolPref("javascript.options.asyncstack")) {
do_print("Async stacks are disabled.");
info("Async stacks are disabled.");
return;
}
let stack = Components.stack;
while (stack) {
do_print(stack.name);
info(stack.name);
if (stack.name == expectedName) {
// Reached back to outer function before request
ok(true, "Complete stack");

2
devtools/server/tests/unit/test_dbgclient_debuggerstatement.js
View File

@@ -24,7 +24,7 @@ function run_test() {
}
function test_threadAttach(threadActorID) {
do_print("Trying to attach to thread " + threadActorID);
info("Trying to attach to thread " + threadActorID);
gTabClient.attachThread({}, function (response, threadClient) {
Assert.equal(threadClient.state, "paused");
Assert.equal(threadClient.actor, threadActorID);

4
devtools/server/tests/unit/test_eventlooplag_actor.js
View File

@@ -27,7 +27,7 @@ function run_test() {
front.start().then(success => {
Assert.ok(success);
front.once("event-loop-lag", gotLagEvent);
do_execute_soon(lag);
executeSoon(lag);
});
});
});
@@ -46,7 +46,7 @@ function run_test() {
// Got a lag event. The test will time out if the actor
// fails to detect the lag.
function gotLagEvent(time) {
do_print("lag: " + time);
info("lag: " + time);
Assert.ok(time >= threshold);
front.stop().then(() => {
finishClient(client);

12
devtools/server/tests/unit/test_getRuleText.js
View File

@@ -112,22 +112,22 @@ const TEST_DATA = [
function run_test() {
for (let test of TEST_DATA) {
do_print("Starting test: " + test.desc);
do_print("Input string " + test.input);
info("Starting test: " + test.desc);
info("Input string " + test.input);
let output;
try {
output = getRuleText(test.input, test.line, test.column);
if (test.throws) {
do_print("Test should have thrown");
info("Test should have thrown");
Assert.ok(false);
}
} catch (e) {
do_print("getRuleText threw an exception with the given input string");
info("getRuleText threw an exception with the given input string");
if (test.throws) {
do_print("Exception expected");
info("Exception expected");
Assert.ok(true);
} else {
do_print("Exception unexpected\n" + e);
info("Exception unexpected\n" + e);
Assert.ok(false);
}
}

Some files were not shown because too many files have changed in this diff Show More