Browse Source

add a new script

Bill Gianopoulos 3 years ago
parent
commit
4128b5faf0
1 changed files with 112 additions and 0 deletions
  1. 112 0
      scripts/mozilla-do_check2Assert.patch

+ 112 - 0
scripts/mozilla-do_check2Assert.patch

@@ -0,0 +1,112 @@
+diff --git a/js/xpconnect/tests/unit/test_function_names.js b/js/xpconnect/tests/unit/test_function_names.js
+--- a/js/xpconnect/tests/unit/test_function_names.js
++++ b/js/xpconnect/tests/unit/test_function_names.js
+@@ -25,17 +25,17 @@ function run_test() {
+   ];
+ 
+   // Use the observer service so we can get double-wrapped functions.
+   var obs = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+ 
+   function observer(subject, topic, data)
+   {
+     let named = subject.QueryInterface(Ci.nsINamed);
+-    do_check_eq(named.name, data);
++    Assert.equal(named.name, data);
+     dump(`name: ${named.name}\n`);
+   }
+   obs.addObserver(observer, "test-obs-fun", false);
+ 
+   for (let [f, requiredName] of functions) {
+     obs.notifyObservers(f, "test-obs-fun", requiredName);
+   }
+ }
+diff --git a/storage/test/unit/test_js_helpers.js b/storage/test/unit/test_js_helpers.js
+--- a/storage/test/unit/test_js_helpers.js
++++ b/storage/test/unit/test_js_helpers.js
+@@ -58,27 +58,27 @@ function test_row_prototype() {
+   stmt.finalize();
+ }
+ 
+ function test_row_enumerate() {
+   let stmt = createStatement(
+     "SELECT * FROM test"
+   );
+ 
+-  do_check_true(stmt.executeStep());
++  Assert.ok(stmt.executeStep());
+ 
+   let expected = ["id", "string"];
+   let expected_values = [123, "foo"];
+   let index = 0;
+   for (let name in stmt.row) {
+-    do_check_eq(name, expected[index]);
+-    do_check_eq(stmt.row[name], expected_values[index]);
++    Assert.equal(name, expected[index]);
++    Assert.equal(stmt.row[name], expected_values[index]);
+     index++;
+   }
+-  do_check_eq(index, 2);
++  Assert.equal(index, 2);
+ 
+   // Save off the row helper, then forget the statement and trigger a GC.  We
+   // want to ensure that if the row helper is retained but the statement is
+   // destroyed, that no crash occurs and that the late access attempt simply
+   // throws an error.
+   let savedOffRow = stmt.row;
+   stmt = null;
+   Components.utils.forceGC();
+diff --git a/toolkit/components/search/tests/xpcshell/test_addEngineWithDetailsObject.js b/toolkit/components/search/tests/xpcshell/test_addEngineWithDetailsObject.js
+--- a/toolkit/components/search/tests/xpcshell/test_addEngineWithDetailsObject.js
++++ b/toolkit/components/search/tests/xpcshell/test_addEngineWithDetailsObject.js
+@@ -9,17 +9,17 @@ const kSearchSuggestURL = "http://exampl
+ const kIconURL = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==";
+ const kDescription = "Test Description";
+ const kAlias = "alias_foo"
+ const kSearchTerm = "foo";
+ const kExtensionID = "test@example.com";
+ const URLTYPE_SUGGEST_JSON = "application/x-suggestions+json";
+ 
+ add_task(async function test_addEngineWithDetails() {
+-  do_check_false(Services.search.isInitialized);
++  Assert.ok(!Services.search.isInitialized);
+ 
+   Services.prefs.getDefaultBranch(BROWSER_SEARCH_PREF)
+           .setBoolPref("reset.enabled", true);
+ 
+   await asyncInit();
+ 
+   Services.search.addEngineWithDetails(kSearchEngineID, {
+     template: kSearchEngineURL,
+@@ -28,26 +28,26 @@ add_task(async function test_addEngineWi
+     suggestURL: kSearchSuggestURL,
+     alias: "alias_foo",
+     extensionID: kExtensionID,
+   });
+ 
+   // An engine added with addEngineWithDetails should have a load path, even
+   // though we can't point to a specific file.
+   let engine = Services.search.getEngineByName(kSearchEngineID);
+-  do_check_eq(engine.wrappedJSObject._loadPath, "[other]addEngineWithDetails:" + kExtensionID);
+-  do_check_eq(engine.description, kDescription);
+-  do_check_eq(engine.iconURI.spec, kIconURL);
+-  do_check_eq(engine.alias, kAlias);
++  Assert.equal(engine.wrappedJSObject._loadPath, "[other]addEngineWithDetails:" + kExtensionID);
++  Assert.equal(engine.description, kDescription);
++  Assert.equal(engine.iconURI.spec, kIconURL);
++  Assert.equal(engine.alias, kAlias);
+ 
+   // Set the engine as default; this should set a loadPath verification hash,
+   // which should ensure we don't show the search reset prompt.
+   Services.search.currentEngine = engine;
+ 
+   let expectedURL = kSearchEngineURL.replace("{searchTerms}", kSearchTerm);
+   let submission =
+     Services.search.currentEngine.getSubmission(kSearchTerm, null, "searchbar");
+-  do_check_eq(submission.uri.spec, expectedURL);
++  Assert.equal(submission.uri.spec, expectedURL);
+   let expectedSuggestURL = kSearchSuggestURL.replace("{searchTerms}", kSearchTerm);
+   let submissionSuggest =
+     Services.search.currentEngine.getSubmission(kSearchTerm, URLTYPE_SUGGEST_JSON);
+-  do_check_eq(submissionSuggest.uri.spec, expectedSuggestURL);
++  Assert.equal(submissionSuggest.uri.spec, expectedSuggestURL);
+ });