From 86fc8c7fb0c084c9531a52c5d53c51d904243001 Mon Sep 17 00:00:00 2001 From: Mike de Boer Date: Fri, 4 Mar 2016 14:32:32 +0100 Subject: [PATCH] Bug 1241930: Part 5 - convert all assertion methods used inside content tasks to the Assert.* family in dom tests. r=mconley --- dom/base/test/browser_bug593387.js | 2 +- dom/base/test/browser_bug902350.js | 8 ++--- .../test/mochitest/browser_bug1163570.js | 19 +++++------ dom/tests/browser/browser_frame_elements.js | 32 +++++++++---------- 4 files changed, 28 insertions(+), 33 deletions(-) diff --git a/dom/base/test/browser_bug593387.js b/dom/base/test/browser_bug593387.js index 1179ca88335..aa4f9dc0f7b 100644 --- a/dom/base/test/browser_bug593387.js +++ b/dom/base/test/browser_bug593387.js @@ -60,7 +60,7 @@ function testXFOFrameInContent(newBrowser) { // Test that the frame DID NOT load var test = this.contentDocument.getElementById("test"); - is(test, null, "should be about:blank"); + Assert.equal(test, null, "should be about:blank"); deferred.resolve(); }, true); diff --git a/dom/base/test/browser_bug902350.js b/dom/base/test/browser_bug902350.js index 58e1ed95670..bf31d61cfcc 100644 --- a/dom/base/test/browser_bug902350.js +++ b/dom/base/test/browser_bug902350.js @@ -60,11 +60,9 @@ function MixedTest1B() { function MixedTest1C() { ContentTask.spawn(gTestBrowser, null, function() { - return content.location.href; - }).then(url => { - ok(gTestBrowser.contentWindow.location == "http://example.com/", "Navigating to insecure domain through target='_top' failed.") - MixedTestsCompleted(); - }); + Assert.equal(content.location.href, "http://example.com/", + "Navigating to insecure domain through target='_top' failed.") + }).then(MixedTestsCompleted); } diff --git a/dom/plugins/test/mochitest/browser_bug1163570.js b/dom/plugins/test/mochitest/browser_bug1163570.js index 3926c53ee0c..8b4fdcc0c2b 100644 --- a/dom/plugins/test/mochitest/browser_bug1163570.js +++ b/dom/plugins/test/mochitest/browser_bug1163570.js @@ -52,14 +52,12 @@ add_task(function* () { yield promiseTabLoad(pluginTab, gTestRoot + "plugin_test.html"); yield promiseTabLoad(prefTab, "about:preferences"); - let result = yield ContentTask.spawn(gBrowser.selectedBrowser, null, function*() { + yield ContentTask.spawn(gBrowser.selectedBrowser, null, function*() { let doc = content.document; let plugin = doc.getElementById("testplugin"); - return !!plugin; + Assert.ok(!!plugin, "plugin is loaded"); }); - is(result, true, "plugin is loaded"); - let ppromise = promiseWaitForEvent(window, "MozAfterPaint"); gBrowser.selectedTab = prefTab; yield ppromise; @@ -80,24 +78,23 @@ add_task(function* () { EventUtils.synthesizeMouseAtCenter(tabStripContainer.childNodes[1], {}, window); yield ppromise; - result = yield ContentTask.spawn(pluginTab.linkedBrowser, null, function*() { + yield ContentTask.spawn(pluginTab.linkedBrowser, null, function*() { let doc = content.document; let plugin = doc.getElementById("testplugin"); - return XPCNativeWrapper.unwrap(plugin).nativeWidgetIsVisible(); + Assert.ok(XPCNativeWrapper.unwrap(plugin).nativeWidgetIsVisible(), + "plugin is visible"); }); - is(result, true, "plugin is visible"); - ppromise = promiseWaitForEvent(window, "MozAfterPaint"); EventUtils.synthesizeMouseAtCenter(tabStripContainer.childNodes[2], {}, window); yield ppromise; - result = yield ContentTask.spawn(pluginTab.linkedBrowser, null, function*() { + yield ContentTask.spawn(pluginTab.linkedBrowser, null, function*() { let doc = content.document; let plugin = doc.getElementById("testplugin"); - return XPCNativeWrapper.unwrap(plugin).nativeWidgetIsVisible(); + Assert.ok(!XPCNativeWrapper.unwrap(plugin).nativeWidgetIsVisible(), + "plugin is hidden"); }); - is(result, false, "plugin is hidden"); } gBrowser.removeTab(prefTab); diff --git a/dom/tests/browser/browser_frame_elements.js b/dom/tests/browser/browser_frame_elements.js index 75abfcd09ed..5c4989bf875 100644 --- a/dom/tests/browser/browser_frame_elements.js +++ b/dom/tests/browser/browser_frame_elements.js @@ -37,32 +37,32 @@ function startTests() { info("Checking top window"); let gWindow = content; - is (gWindow.top, gWindow, "gWindow is top"); - is (gWindow.parent, gWindow, "gWindow is parent"); + Assert.equal(gWindow.top, gWindow, "gWindow is top"); + Assert.equal(gWindow.parent, gWindow, "gWindow is parent"); info("Checking about:blank iframe"); let iframeBlank = gWindow.document.querySelector("#iframe-blank"); - ok (iframeBlank, "Iframe exists on page"); + Assert.ok(iframeBlank, "Iframe exists on page"); let iframeBlankUtils = getWindowUtils(iframeBlank.contentWindow); - is (iframeBlankUtils.containerElement, iframeBlank, "Container element for iframe window is iframe"); - is (iframeBlank.contentWindow.top, gWindow, "gWindow is top"); - is (iframeBlank.contentWindow.parent, gWindow, "gWindow is parent"); + Assert.equal(iframeBlankUtils.containerElement, iframeBlank, "Container element for iframe window is iframe"); + Assert.equal(iframeBlank.contentWindow.top, gWindow, "gWindow is top"); + Assert.equal(iframeBlank.contentWindow.parent, gWindow, "gWindow is parent"); info("Checking iframe with data url src"); let iframeDataUrl = gWindow.document.querySelector("#iframe-data-url"); - ok (iframeDataUrl, "Iframe exists on page"); + Assert.ok(iframeDataUrl, "Iframe exists on page"); let iframeDataUrlUtils = getWindowUtils(iframeDataUrl.contentWindow); - is (iframeDataUrlUtils.containerElement, iframeDataUrl, "Container element for iframe window is iframe"); - is (iframeDataUrl.contentWindow.top, gWindow, "gWindow is top"); - is (iframeDataUrl.contentWindow.parent, gWindow, "gWindow is parent"); + Assert.equal(iframeDataUrlUtils.containerElement, iframeDataUrl, "Container element for iframe window is iframe"); + Assert.equal(iframeDataUrl.contentWindow.top, gWindow, "gWindow is top"); + Assert.equal(iframeDataUrl.contentWindow.parent, gWindow, "gWindow is parent"); info("Checking object with data url data attribute"); let objectDataUrl = gWindow.document.querySelector("#object-data-url"); - ok (objectDataUrl, "Object exists on page"); + Assert.ok(objectDataUrl, "Object exists on page"); let objectDataUrlUtils = getWindowUtils(objectDataUrl.contentWindow); - is (objectDataUrlUtils.containerElement, objectDataUrl, "Container element for object window is the object"); - is (objectDataUrl.contentWindow.top, gWindow, "gWindow is top"); - is (objectDataUrl.contentWindow.parent, gWindow, "gWindow is parent"); + Assert.equal(objectDataUrlUtils.containerElement, objectDataUrl, "Container element for object window is the object"); + Assert.equal(objectDataUrl.contentWindow.top, gWindow, "gWindow is top"); + Assert.equal(objectDataUrl.contentWindow.parent, gWindow, "gWindow is parent"); } function* mozBrowserTests(browser) { @@ -75,9 +75,9 @@ function* mozBrowserTests(browser) { let mozBrowserFrame = content.document.createElement("iframe"); mozBrowserFrame.setAttribute("mozbrowser", ""); content.document.body.appendChild(mozBrowserFrame); - is (mozBrowserFrame.contentWindow.top, mozBrowserFrame.contentWindow, + Assert.equal(mozBrowserFrame.contentWindow.top, mozBrowserFrame.contentWindow, "Mozbrowser top == iframe window"); - is (mozBrowserFrame.contentWindow.parent, mozBrowserFrame.contentWindow, + Assert.equal(mozBrowserFrame.contentWindow.parent, mozBrowserFrame.contentWindow, "Mozbrowser parent == iframe window"); });