From 563458af7d9cdb076562e7506ce69b718871a01d Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Tue, 23 Feb 2021 17:37:03 +0000 Subject: [PATCH] Bug 1690475 - [remote] Reorganize xpcshell and browser chrome tests. r=remote-protocol-reviewers,jdescottes Differential Revision: https://phabricator.services.mozilla.com/D106062 --- .eslintignore | 2 +- remote/cdp/moz.build | 19 +++++++++++++++++++ remote/{ => cdp}/test/browser/README.md | 0 remote/{ => cdp}/test/browser/browser.ini | 0 .../{ => cdp}/test/browser/browser_agent.js | 0 remote/{ => cdp}/test/browser/browser_cdp.js | 0 .../{ => cdp}/test/browser/browser_httpd.js | 0 .../test/browser/browser_main_target.js | 0 .../{ => cdp}/test/browser/browser_session.js | 0 remote/{ => cdp}/test/browser/browser_tabs.js | 0 .../test/browser/chrome-remote-interface.js | 0 remote/{ => cdp}/test/browser/dom/browser.ini | 4 ++-- .../test/browser/dom/browser_describeNode.js | 0 .../test/browser/dom/browser_resolveNode.js | 0 .../log => cdp/test/browser/dom}/head.js | 2 +- .../test/browser/emulation/browser.ini | 4 ++-- .../browser_setDeviceMetricsOverride.js | 0 .../browser_setTouchEmulationEnabled.js | 0 .../emulation/browser_setUserAgentOverride.js | 0 .../test/browser/emulation}/head.js | 2 +- remote/{ => cdp}/test/browser/head.js | 2 +- .../{ => cdp}/test/browser/input/browser.ini | 4 ++-- .../browser/input/browser_dispatchKeyEvent.js | 0 .../input/browser_dispatchKeyEvent_events.js | 2 +- .../input/browser_dispatchKeyEvent_race.js | 2 +- .../input/browser_dispatchMouseEvent.js | 0 .../input/doc_dispatchKeyEvent_race.html | 0 .../test/browser/input/doc_events.html | 0 remote/{ => cdp}/test/browser/input/head.js | 2 +- remote/{ => cdp}/test/browser/io/browser.ini | 4 ++-- .../test/browser/io/browser_close.js | 0 .../{ => cdp}/test/browser/io/browser_read.js | 0 remote/{ => cdp}/test/browser/io/head.js | 2 +- remote/{ => cdp}/test/browser/log/browser.ini | 4 ++-- .../test/browser/log/browser_entryAdded.js | 0 .../runtime => cdp/test/browser/log}/head.js | 2 +- .../test/browser/network/browser.ini | 4 ++-- .../browser/network/browser_deleteCookies.js | 8 ++++---- .../browser_emulateNetworkConditions.js | 2 +- .../browser/network/browser_getAllCookies.js | 6 +++--- .../browser/network/browser_getCookies.js | 6 +++--- .../network/browser_navigationEvents.js | 2 +- .../network/browser_requestWillBeSent.js | 2 +- .../network/browser_responseReceived.js | 2 +- .../network/browser_setCacheDisabled.js | 2 +- .../test/browser/network/browser_setCookie.js | 2 +- .../browser/network/browser_setCookies.js | 0 .../network/browser_setUserAgentOverride.js | 0 .../test/browser/network/doc_empty.html | 0 .../test/browser/network/doc_frameset.html | 0 .../browser/network/doc_networkEvents.html | 0 .../browser/network/file_framesetEvents.js | 0 .../browser/network/file_networkEvents.js | 0 remote/{ => cdp}/test/browser/network/head.js | 2 +- .../test/browser/network/sjs-cookies.sjs | 0 .../{ => cdp}/test/browser/page/browser.ini | 4 ++-- .../test/browser/page/browser_bringToFront.js | 0 .../browser/page/browser_captureScreenshot.js | 0 .../page/browser_createIsolatedWorld.js | 0 .../page/browser_domContentEventFired.js | 0 .../browser/page/browser_frameAttached.js | 0 .../browser/page/browser_frameDetached.js | 0 .../browser/page/browser_frameNavigated.js | 0 .../page/browser_frameStartedLoading.js | 0 .../page/browser_frameStoppedLoading.js | 0 .../test/browser/page/browser_getFrameTree.js | 0 .../browser/page/browser_getLayoutMetrics.js | 0 .../page/browser_getNavigationHistory.js | 4 ++-- .../page/browser_javascriptDialog_alert.js | 0 .../browser_javascriptDialog_beforeunload.js | 0 .../page/browser_javascriptDialog_confirm.js | 0 .../browser_javascriptDialog_otherTarget.js | 0 .../page/browser_javascriptDialog_prompt.js | 0 .../browser/page/browser_lifecycleEvent.js | 2 +- .../browser/page/browser_loadEventFired.js | 0 .../test/browser/page/browser_navigate.js | 4 ++-- .../page/browser_navigateToHistoryEntry.js | 0 .../browser/page/browser_navigationEvents.js | 0 .../test/browser/page/browser_printToPDF.js | 0 .../test/browser/page/browser_reload.js | 0 .../browser/page/browser_runtimeEvents.js | 0 .../browser_scriptToEvaluateOnNewDocument.js | 0 .../test/browser/page/doc_empty.html | 0 remote/{ => cdp}/test/browser/page/head.js | 2 +- .../test/browser/page/sjs_redirect.sjs | 0 .../test/browser/runtime/browser.ini | 4 ++-- .../browser/runtime/browser_callFunctionOn.js | 0 .../browser_callFunctionOn_returnByValue.js | 0 .../runtime/browser_consoleAPICalled.js | 2 +- .../test/browser/runtime/browser_evaluate.js | 0 .../runtime/browser_exceptionThrown.js | 2 +- .../runtime/browser_executionContextEvents.js | 0 .../browser/runtime/browser_getProperties.js | 0 .../browser/runtime/browser_remoteObjects.js | 0 .../browser/runtime/doc_console_events.html | 0 .../test/browser/runtime}/head.js | 2 +- .../test/browser/security/browser.ini | 4 ++-- .../browser_setIgnoreCertificateErrors.js | 0 remote/cdp/test/browser/security/head.js | 11 +++++++++++ .../{ => cdp}/test/browser/target/browser.ini | 4 ++-- .../browser/target/browser_activateTarget.js | 0 .../browser/target/browser_attachToTarget.js | 0 .../target/browser_attachedToTarget.js | 2 +- .../browser/target/browser_browserContext.js | 0 .../browser/target/browser_closeTarget.js | 0 .../test/browser/target/browser_getTargets.js | 2 +- .../target/browser_sendMessageToTarget.js | 0 .../target/browser_setDiscoverTargets.js | 0 .../browser/target/browser_targetCreated.js | 0 .../browser/target/browser_targetDestroyed.js | 0 .../test/browser/target/doc_test.html | 0 remote/cdp/test/browser/target/head.js | 11 +++++++++++ .../test/xpcshell}/test_Connection.js | 0 .../test/xpcshell}/test_DomainCache.js | 0 .../unit => cdp/test/xpcshell}/test_Error.js | 0 .../test/xpcshell}/test_Session.js | 0 .../test/xpcshell}/test_StreamRegistry.js | 0 .../unit => cdp/test/xpcshell}/xpcshell.ini | 2 -- remote/doc/Testing.md | 16 +++++++++------- remote/moz.build | 3 ++- remote/shared/moz.build | 5 +++++ .../test/xpcshell}/test_Format.js | 0 .../test/xpcshell}/test_Sync.js | 0 remote/shared/test/xpcshell/xpcshell.ini | 9 +++++++++ remote/test/browser/security/head.js | 11 ----------- remote/test/browser/target/head.js | 11 ----------- remote/test/moz.build | 18 ------------------ tools/rewriting/ThirdPartyPaths.txt | 2 +- 128 files changed, 124 insertions(+), 108 deletions(-) create mode 100644 remote/cdp/moz.build rename remote/{ => cdp}/test/browser/README.md (100%) rename remote/{ => cdp}/test/browser/browser.ini (100%) rename remote/{ => cdp}/test/browser/browser_agent.js (100%) rename remote/{ => cdp}/test/browser/browser_cdp.js (100%) rename remote/{ => cdp}/test/browser/browser_httpd.js (100%) rename remote/{ => cdp}/test/browser/browser_main_target.js (100%) rename remote/{ => cdp}/test/browser/browser_session.js (100%) rename remote/{ => cdp}/test/browser/browser_tabs.js (100%) rename remote/{ => cdp}/test/browser/chrome-remote-interface.js (100%) rename remote/{ => cdp}/test/browser/dom/browser.ini (62%) rename remote/{ => cdp}/test/browser/dom/browser_describeNode.js (100%) rename remote/{ => cdp}/test/browser/dom/browser_resolveNode.js (100%) rename remote/{test/browser/log => cdp/test/browser/dom}/head.js (74%) rename remote/{ => cdp}/test/browser/emulation/browser.ini (69%) rename remote/{ => cdp}/test/browser/emulation/browser_setDeviceMetricsOverride.js (100%) rename remote/{ => cdp}/test/browser/emulation/browser_setTouchEmulationEnabled.js (100%) rename remote/{ => cdp}/test/browser/emulation/browser_setUserAgentOverride.js (100%) rename remote/{test/browser/dom => cdp/test/browser/emulation}/head.js (74%) rename remote/{ => cdp}/test/browser/head.js (99%) rename remote/{ => cdp}/test/browser/input/browser.ini (77%) rename remote/{ => cdp}/test/browser/input/browser_dispatchKeyEvent.js (100%) rename remote/{ => cdp}/test/browser/input/browser_dispatchKeyEvent_events.js (98%) rename remote/{ => cdp}/test/browser/input/browser_dispatchKeyEvent_race.js (97%) rename remote/{ => cdp}/test/browser/input/browser_dispatchMouseEvent.js (100%) rename remote/{ => cdp}/test/browser/input/doc_dispatchKeyEvent_race.html (100%) rename remote/{ => cdp}/test/browser/input/doc_events.html (100%) rename remote/{ => cdp}/test/browser/input/head.js (98%) rename remote/{ => cdp}/test/browser/io/browser.ini (59%) rename remote/{ => cdp}/test/browser/io/browser_close.js (100%) rename remote/{ => cdp}/test/browser/io/browser_read.js (100%) rename remote/{ => cdp}/test/browser/io/head.js (90%) rename remote/{ => cdp}/test/browser/log/browser.ini (57%) rename remote/{ => cdp}/test/browser/log/browser_entryAdded.js (100%) rename remote/{test/browser/runtime => cdp/test/browser/log}/head.js (74%) rename remote/{ => cdp}/test/browser/network/browser.ini (87%) rename remote/{ => cdp}/test/browser/network/browser_deleteCookies.js (96%) rename remote/{ => cdp}/test/browser/network/browser_emulateNetworkConditions.js (98%) rename remote/{ => cdp}/test/browser/network/browser_getAllCookies.js (97%) rename remote/{ => cdp}/test/browser/network/browser_getCookies.js (97%) rename remote/{ => cdp}/test/browser/network/browser_navigationEvents.js (98%) rename remote/{ => cdp}/test/browser/network/browser_requestWillBeSent.js (98%) rename remote/{ => cdp}/test/browser/network/browser_responseReceived.js (98%) rename remote/{ => cdp}/test/browser/network/browser_setCacheDisabled.js (97%) rename remote/{ => cdp}/test/browser/network/browser_setCookie.js (98%) rename remote/{ => cdp}/test/browser/network/browser_setCookies.js (100%) rename remote/{ => cdp}/test/browser/network/browser_setUserAgentOverride.js (100%) rename remote/{ => cdp}/test/browser/network/doc_empty.html (100%) rename remote/{ => cdp}/test/browser/network/doc_frameset.html (100%) rename remote/{ => cdp}/test/browser/network/doc_networkEvents.html (100%) rename remote/{ => cdp}/test/browser/network/file_framesetEvents.js (100%) rename remote/{ => cdp}/test/browser/network/file_networkEvents.js (100%) rename remote/{ => cdp}/test/browser/network/head.js (96%) rename remote/{ => cdp}/test/browser/network/sjs-cookies.sjs (100%) rename remote/{ => cdp}/test/browser/page/browser.ini (91%) rename remote/{ => cdp}/test/browser/page/browser_bringToFront.js (100%) rename remote/{ => cdp}/test/browser/page/browser_captureScreenshot.js (100%) rename remote/{ => cdp}/test/browser/page/browser_createIsolatedWorld.js (100%) rename remote/{ => cdp}/test/browser/page/browser_domContentEventFired.js (100%) rename remote/{ => cdp}/test/browser/page/browser_frameAttached.js (100%) rename remote/{ => cdp}/test/browser/page/browser_frameDetached.js (100%) rename remote/{ => cdp}/test/browser/page/browser_frameNavigated.js (100%) rename remote/{ => cdp}/test/browser/page/browser_frameStartedLoading.js (100%) rename remote/{ => cdp}/test/browser/page/browser_frameStoppedLoading.js (100%) rename remote/{ => cdp}/test/browser/page/browser_getFrameTree.js (100%) rename remote/{ => cdp}/test/browser/page/browser_getLayoutMetrics.js (100%) rename remote/{ => cdp}/test/browser/page/browser_getNavigationHistory.js (91%) rename remote/{ => cdp}/test/browser/page/browser_javascriptDialog_alert.js (100%) rename remote/{ => cdp}/test/browser/page/browser_javascriptDialog_beforeunload.js (100%) rename remote/{ => cdp}/test/browser/page/browser_javascriptDialog_confirm.js (100%) rename remote/{ => cdp}/test/browser/page/browser_javascriptDialog_otherTarget.js (100%) rename remote/{ => cdp}/test/browser/page/browser_javascriptDialog_prompt.js (100%) rename remote/{ => cdp}/test/browser/page/browser_lifecycleEvent.js (98%) rename remote/{ => cdp}/test/browser/page/browser_loadEventFired.js (100%) rename remote/{ => cdp}/test/browser/page/browser_navigate.js (98%) rename remote/{ => cdp}/test/browser/page/browser_navigateToHistoryEntry.js (100%) rename remote/{ => cdp}/test/browser/page/browser_navigationEvents.js (100%) rename remote/{ => cdp}/test/browser/page/browser_printToPDF.js (100%) rename remote/{ => cdp}/test/browser/page/browser_reload.js (100%) rename remote/{ => cdp}/test/browser/page/browser_runtimeEvents.js (100%) rename remote/{ => cdp}/test/browser/page/browser_scriptToEvaluateOnNewDocument.js (100%) rename remote/{ => cdp}/test/browser/page/doc_empty.html (100%) rename remote/{ => cdp}/test/browser/page/head.js (97%) rename remote/{ => cdp}/test/browser/page/sjs_redirect.sjs (100%) rename remote/{ => cdp}/test/browser/runtime/browser.ini (82%) rename remote/{ => cdp}/test/browser/runtime/browser_callFunctionOn.js (100%) rename remote/{ => cdp}/test/browser/runtime/browser_callFunctionOn_returnByValue.js (100%) rename remote/{ => cdp}/test/browser/runtime/browser_consoleAPICalled.js (98%) rename remote/{ => cdp}/test/browser/runtime/browser_evaluate.js (100%) rename remote/{ => cdp}/test/browser/runtime/browser_exceptionThrown.js (97%) rename remote/{ => cdp}/test/browser/runtime/browser_executionContextEvents.js (100%) rename remote/{ => cdp}/test/browser/runtime/browser_getProperties.js (100%) rename remote/{ => cdp}/test/browser/runtime/browser_remoteObjects.js (100%) rename remote/{ => cdp}/test/browser/runtime/doc_console_events.html (100%) rename remote/{test/browser/emulation => cdp/test/browser/runtime}/head.js (74%) rename remote/{ => cdp}/test/browser/security/browser.ini (60%) rename remote/{ => cdp}/test/browser/security/browser_setIgnoreCertificateErrors.js (100%) create mode 100644 remote/cdp/test/browser/security/head.js rename remote/{ => cdp}/test/browser/target/browser.ini (84%) rename remote/{ => cdp}/test/browser/target/browser_activateTarget.js (100%) rename remote/{ => cdp}/test/browser/target/browser_attachToTarget.js (100%) rename remote/{ => cdp}/test/browser/target/browser_attachedToTarget.js (94%) rename remote/{ => cdp}/test/browser/target/browser_browserContext.js (100%) rename remote/{ => cdp}/test/browser/target/browser_closeTarget.js (100%) rename remote/{ => cdp}/test/browser/target/browser_getTargets.js (94%) rename remote/{ => cdp}/test/browser/target/browser_sendMessageToTarget.js (100%) rename remote/{ => cdp}/test/browser/target/browser_setDiscoverTargets.js (100%) rename remote/{ => cdp}/test/browser/target/browser_targetCreated.js (100%) rename remote/{ => cdp}/test/browser/target/browser_targetDestroyed.js (100%) rename remote/{ => cdp}/test/browser/target/doc_test.html (100%) create mode 100644 remote/cdp/test/browser/target/head.js rename remote/{test/unit => cdp/test/xpcshell}/test_Connection.js (100%) rename remote/{test/unit => cdp/test/xpcshell}/test_DomainCache.js (100%) rename remote/{test/unit => cdp/test/xpcshell}/test_Error.js (100%) rename remote/{test/unit => cdp/test/xpcshell}/test_Session.js (100%) rename remote/{test/unit => cdp/test/xpcshell}/test_StreamRegistry.js (100%) rename remote/{test/unit => cdp/test/xpcshell}/xpcshell.ini (91%) create mode 100644 remote/shared/moz.build rename remote/{test/unit => shared/test/xpcshell}/test_Format.js (100%) rename remote/{test/unit => shared/test/xpcshell}/test_Sync.js (100%) create mode 100644 remote/shared/test/xpcshell/xpcshell.ini delete mode 100644 remote/test/browser/security/head.js delete mode 100644 remote/test/browser/target/head.js delete mode 100644 remote/test/moz.build diff --git a/.eslintignore b/.eslintignore index f8ec3dc7e33f..84a0d60e1a32 100644 --- a/.eslintignore +++ b/.eslintignore @@ -158,7 +158,7 @@ python/ # These are (mainly) imported code that we don't want to lint to make imports easier. remote/cdp/Protocol.jsm -remote/test/browser/chrome-remote-interface.js +remote/cdp/test/browser/chrome-remote-interface.js # services/ exclusions diff --git a/remote/cdp/moz.build b/remote/cdp/moz.build new file mode 100644 index 000000000000..9147d4490ea4 --- /dev/null +++ b/remote/cdp/moz.build @@ -0,0 +1,19 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +BROWSER_CHROME_MANIFESTS += [ + "test/browser/browser.ini", + "test/browser/dom/browser.ini", + "test/browser/emulation/browser.ini", + "test/browser/input/browser.ini", + "test/browser/io/browser.ini", + "test/browser/log/browser.ini", + "test/browser/network/browser.ini", + "test/browser/page/browser.ini", + "test/browser/runtime/browser.ini", + "test/browser/security/browser.ini", + "test/browser/target/browser.ini", +] + +XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] diff --git a/remote/test/browser/README.md b/remote/cdp/test/browser/README.md similarity index 100% rename from remote/test/browser/README.md rename to remote/cdp/test/browser/README.md diff --git a/remote/test/browser/browser.ini b/remote/cdp/test/browser/browser.ini similarity index 100% rename from remote/test/browser/browser.ini rename to remote/cdp/test/browser/browser.ini diff --git a/remote/test/browser/browser_agent.js b/remote/cdp/test/browser/browser_agent.js similarity index 100% rename from remote/test/browser/browser_agent.js rename to remote/cdp/test/browser/browser_agent.js diff --git a/remote/test/browser/browser_cdp.js b/remote/cdp/test/browser/browser_cdp.js similarity index 100% rename from remote/test/browser/browser_cdp.js rename to remote/cdp/test/browser/browser_cdp.js diff --git a/remote/test/browser/browser_httpd.js b/remote/cdp/test/browser/browser_httpd.js similarity index 100% rename from remote/test/browser/browser_httpd.js rename to remote/cdp/test/browser/browser_httpd.js diff --git a/remote/test/browser/browser_main_target.js b/remote/cdp/test/browser/browser_main_target.js similarity index 100% rename from remote/test/browser/browser_main_target.js rename to remote/cdp/test/browser/browser_main_target.js diff --git a/remote/test/browser/browser_session.js b/remote/cdp/test/browser/browser_session.js similarity index 100% rename from remote/test/browser/browser_session.js rename to remote/cdp/test/browser/browser_session.js diff --git a/remote/test/browser/browser_tabs.js b/remote/cdp/test/browser/browser_tabs.js similarity index 100% rename from remote/test/browser/browser_tabs.js rename to remote/cdp/test/browser/browser_tabs.js diff --git a/remote/test/browser/chrome-remote-interface.js b/remote/cdp/test/browser/chrome-remote-interface.js similarity index 100% rename from remote/test/browser/chrome-remote-interface.js rename to remote/cdp/test/browser/chrome-remote-interface.js diff --git a/remote/test/browser/dom/browser.ini b/remote/cdp/test/browser/dom/browser.ini similarity index 62% rename from remote/test/browser/dom/browser.ini rename to remote/cdp/test/browser/dom/browser.ini index 77f9558308c9..d2e5401b39f3 100644 --- a/remote/test/browser/dom/browser.ini +++ b/remote/cdp/test/browser/dom/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js [browser_describeNode.js] diff --git a/remote/test/browser/dom/browser_describeNode.js b/remote/cdp/test/browser/dom/browser_describeNode.js similarity index 100% rename from remote/test/browser/dom/browser_describeNode.js rename to remote/cdp/test/browser/dom/browser_describeNode.js diff --git a/remote/test/browser/dom/browser_resolveNode.js b/remote/cdp/test/browser/dom/browser_resolveNode.js similarity index 100% rename from remote/test/browser/dom/browser_resolveNode.js rename to remote/cdp/test/browser/dom/browser_resolveNode.js diff --git a/remote/test/browser/log/head.js b/remote/cdp/test/browser/dom/head.js similarity index 74% rename from remote/test/browser/log/head.js rename to remote/cdp/test/browser/dom/head.js index 7131e98b6f0c..226595800d23 100644 --- a/remote/test/browser/log/head.js +++ b/remote/cdp/test/browser/dom/head.js @@ -6,6 +6,6 @@ /* import-globals-from ../head.js */ Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", this ); diff --git a/remote/test/browser/emulation/browser.ini b/remote/cdp/test/browser/emulation/browser.ini similarity index 69% rename from remote/test/browser/emulation/browser.ini rename to remote/cdp/test/browser/emulation/browser.ini index c604dd98b37a..1f9123b69c6f 100644 --- a/remote/test/browser/emulation/browser.ini +++ b/remote/cdp/test/browser/emulation/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js [browser_setDeviceMetricsOverride.js] diff --git a/remote/test/browser/emulation/browser_setDeviceMetricsOverride.js b/remote/cdp/test/browser/emulation/browser_setDeviceMetricsOverride.js similarity index 100% rename from remote/test/browser/emulation/browser_setDeviceMetricsOverride.js rename to remote/cdp/test/browser/emulation/browser_setDeviceMetricsOverride.js diff --git a/remote/test/browser/emulation/browser_setTouchEmulationEnabled.js b/remote/cdp/test/browser/emulation/browser_setTouchEmulationEnabled.js similarity index 100% rename from remote/test/browser/emulation/browser_setTouchEmulationEnabled.js rename to remote/cdp/test/browser/emulation/browser_setTouchEmulationEnabled.js diff --git a/remote/test/browser/emulation/browser_setUserAgentOverride.js b/remote/cdp/test/browser/emulation/browser_setUserAgentOverride.js similarity index 100% rename from remote/test/browser/emulation/browser_setUserAgentOverride.js rename to remote/cdp/test/browser/emulation/browser_setUserAgentOverride.js diff --git a/remote/test/browser/dom/head.js b/remote/cdp/test/browser/emulation/head.js similarity index 74% rename from remote/test/browser/dom/head.js rename to remote/cdp/test/browser/emulation/head.js index 7131e98b6f0c..226595800d23 100644 --- a/remote/test/browser/dom/head.js +++ b/remote/cdp/test/browser/emulation/head.js @@ -6,6 +6,6 @@ /* import-globals-from ../head.js */ Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", this ); diff --git a/remote/test/browser/head.js b/remote/cdp/test/browser/head.js similarity index 99% rename from remote/test/browser/head.js rename to remote/cdp/test/browser/head.js index 86f21a66467f..f0fef520420f 100644 --- a/remote/test/browser/head.js +++ b/remote/cdp/test/browser/head.js @@ -134,7 +134,7 @@ async function getCDP() { const window = document.defaultView.wrappedJSObject; Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/chrome-remote-interface.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/chrome-remote-interface.js", window ); diff --git a/remote/test/browser/input/browser.ini b/remote/cdp/test/browser/input/browser.ini similarity index 77% rename from remote/test/browser/input/browser.ini rename to remote/cdp/test/browser/input/browser.ini index a2fb2f515ec0..865e5a7c15f2 100644 --- a/remote/test/browser/input/browser.ini +++ b/remote/cdp/test/browser/input/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js doc_events.html doc_dispatchKeyEvent_race.html diff --git a/remote/test/browser/input/browser_dispatchKeyEvent.js b/remote/cdp/test/browser/input/browser_dispatchKeyEvent.js similarity index 100% rename from remote/test/browser/input/browser_dispatchKeyEvent.js rename to remote/cdp/test/browser/input/browser_dispatchKeyEvent.js diff --git a/remote/test/browser/input/browser_dispatchKeyEvent_events.js b/remote/cdp/test/browser/input/browser_dispatchKeyEvent_events.js similarity index 98% rename from remote/test/browser/input/browser_dispatchKeyEvent_events.js rename to remote/cdp/test/browser/input/browser_dispatchKeyEvent_events.js index 24a5efdcb604..219c4ed20b39 100644 --- a/remote/test/browser/input/browser_dispatchKeyEvent_events.js +++ b/remote/cdp/test/browser/input/browser_dispatchKeyEvent_events.js @@ -4,7 +4,7 @@ "use strict"; const PAGE_URL = - "http://example.com/browser/remote/test/browser/input/doc_events.html"; + "http://example.com/browser/remote/cdp/test/browser/input/doc_events.html"; add_task(async function testShiftEvents({ client }) { await setupForInput(PAGE_URL); diff --git a/remote/test/browser/input/browser_dispatchKeyEvent_race.js b/remote/cdp/test/browser/input/browser_dispatchKeyEvent_race.js similarity index 97% rename from remote/test/browser/input/browser_dispatchKeyEvent_race.js rename to remote/cdp/test/browser/input/browser_dispatchKeyEvent_race.js index 97daccf0eebb..4afc148fa05d 100644 --- a/remote/test/browser/input/browser_dispatchKeyEvent_race.js +++ b/remote/cdp/test/browser/input/browser_dispatchKeyEvent_race.js @@ -27,7 +27,7 @@ // in different processes. const PAGE_URL = - "http://example.com/browser/remote/test/browser/input/doc_dispatchKeyEvent_race.html"; + "http://example.com/browser/remote/cdp/test/browser/input/doc_dispatchKeyEvent_race.html"; add_task(async function({ client }) { await loadURL(PAGE_URL); diff --git a/remote/test/browser/input/browser_dispatchMouseEvent.js b/remote/cdp/test/browser/input/browser_dispatchMouseEvent.js similarity index 100% rename from remote/test/browser/input/browser_dispatchMouseEvent.js rename to remote/cdp/test/browser/input/browser_dispatchMouseEvent.js diff --git a/remote/test/browser/input/doc_dispatchKeyEvent_race.html b/remote/cdp/test/browser/input/doc_dispatchKeyEvent_race.html similarity index 100% rename from remote/test/browser/input/doc_dispatchKeyEvent_race.html rename to remote/cdp/test/browser/input/doc_dispatchKeyEvent_race.html diff --git a/remote/test/browser/input/doc_events.html b/remote/cdp/test/browser/input/doc_events.html similarity index 100% rename from remote/test/browser/input/doc_events.html rename to remote/cdp/test/browser/input/doc_events.html diff --git a/remote/test/browser/input/head.js b/remote/cdp/test/browser/input/head.js similarity index 98% rename from remote/test/browser/input/head.js rename to remote/cdp/test/browser/input/head.js index 910532f85a30..5fdea02783a8 100644 --- a/remote/test/browser/input/head.js +++ b/remote/cdp/test/browser/input/head.js @@ -6,7 +6,7 @@ /* import-globals-from ../head.js */ Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", this ); diff --git a/remote/test/browser/io/browser.ini b/remote/cdp/test/browser/io/browser.ini similarity index 59% rename from remote/test/browser/io/browser.ini rename to remote/cdp/test/browser/io/browser.ini index 352fa38433bf..8c42a538b640 100644 --- a/remote/test/browser/io/browser.ini +++ b/remote/cdp/test/browser/io/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js [browser_close.js] diff --git a/remote/test/browser/io/browser_close.js b/remote/cdp/test/browser/io/browser_close.js similarity index 100% rename from remote/test/browser/io/browser_close.js rename to remote/cdp/test/browser/io/browser_close.js diff --git a/remote/test/browser/io/browser_read.js b/remote/cdp/test/browser/io/browser_read.js similarity index 100% rename from remote/test/browser/io/browser_read.js rename to remote/cdp/test/browser/io/browser_read.js diff --git a/remote/test/browser/io/head.js b/remote/cdp/test/browser/io/head.js similarity index 90% rename from remote/test/browser/io/head.js rename to remote/cdp/test/browser/io/head.js index d3f530805a15..a1eafb303dbf 100644 --- a/remote/test/browser/io/head.js +++ b/remote/cdp/test/browser/io/head.js @@ -6,7 +6,7 @@ /* import-globals-from ../head.js */ Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", this ); diff --git a/remote/test/browser/log/browser.ini b/remote/cdp/test/browser/log/browser.ini similarity index 57% rename from remote/test/browser/log/browser.ini rename to remote/cdp/test/browser/log/browser.ini index 421c01994fd5..bea7aaba6a90 100644 --- a/remote/test/browser/log/browser.ini +++ b/remote/cdp/test/browser/log/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js [browser_entryAdded.js] diff --git a/remote/test/browser/log/browser_entryAdded.js b/remote/cdp/test/browser/log/browser_entryAdded.js similarity index 100% rename from remote/test/browser/log/browser_entryAdded.js rename to remote/cdp/test/browser/log/browser_entryAdded.js diff --git a/remote/test/browser/runtime/head.js b/remote/cdp/test/browser/log/head.js similarity index 74% rename from remote/test/browser/runtime/head.js rename to remote/cdp/test/browser/log/head.js index 7131e98b6f0c..226595800d23 100644 --- a/remote/test/browser/runtime/head.js +++ b/remote/cdp/test/browser/log/head.js @@ -6,6 +6,6 @@ /* import-globals-from ../head.js */ Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", this ); diff --git a/remote/test/browser/network/browser.ini b/remote/cdp/test/browser/network/browser.ini similarity index 87% rename from remote/test/browser/network/browser.ini rename to remote/cdp/test/browser/network/browser.ini index 274291c3f366..abe20e36aae9 100644 --- a/remote/test/browser/network/browser.ini +++ b/remote/cdp/test/browser/network/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js doc_empty.html doc_frameset.html diff --git a/remote/test/browser/network/browser_deleteCookies.js b/remote/cdp/test/browser/network/browser_deleteCookies.js similarity index 96% rename from remote/test/browser/network/browser_deleteCookies.js rename to remote/cdp/test/browser/network/browser_deleteCookies.js index 70489cdd7d2a..03081153973b 100644 --- a/remote/test/browser/network/browser_deleteCookies.js +++ b/remote/cdp/test/browser/network/browser_deleteCookies.js @@ -3,7 +3,7 @@ "use strict"; -const SJS_PATH = "/browser/remote/test/browser/network/sjs-cookies.sjs"; +const SJS_PATH = "/browser/remote/cdp/test/browser/network/sjs-cookies.sjs"; const DEFAULT_HOST = "http://example.org"; const DEFAULT_HOSTNAME = "example.org"; @@ -230,9 +230,9 @@ add_task(async function forSpecificDomainAndURL({ client }) { add_task(async function path({ client }) { const { Network } = client; - const PATH = "/browser/remote/test/browser/"; - const PARENT_PATH = "/browser/remote/test/"; - const SUB_PATH = "/browser/remote/test/browser/network/"; + const PATH = "/browser/remote/cdp/test/browser/"; + const PARENT_PATH = "/browser/remote/cdp/test/"; + const SUB_PATH = "/browser/remote/cdp/test/browser/network/"; const cookie = { name: "foo", diff --git a/remote/test/browser/network/browser_emulateNetworkConditions.js b/remote/cdp/test/browser/network/browser_emulateNetworkConditions.js similarity index 98% rename from remote/test/browser/network/browser_emulateNetworkConditions.js rename to remote/cdp/test/browser/network/browser_emulateNetworkConditions.js index 8eacdacd3283..e150fab26836 100644 --- a/remote/test/browser/network/browser_emulateNetworkConditions.js +++ b/remote/cdp/test/browser/network/browser_emulateNetworkConditions.js @@ -4,7 +4,7 @@ "use strict"; const pageEmptyURL = - "http://example.com/browser/remote/test/browser/page/doc_empty.html"; + "http://example.com/browser/remote/cdp/test/browser/page/doc_empty.html"; /** * Acts just as `add_task`, but does cleanup afterwards diff --git a/remote/test/browser/network/browser_getAllCookies.js b/remote/cdp/test/browser/network/browser_getAllCookies.js similarity index 97% rename from remote/test/browser/network/browser_getAllCookies.js rename to remote/cdp/test/browser/network/browser_getAllCookies.js index e3d07faba689..080e76ef767c 100644 --- a/remote/test/browser/network/browser_getAllCookies.js +++ b/remote/cdp/test/browser/network/browser_getAllCookies.js @@ -3,7 +3,7 @@ "use strict"; -const SJS_PATH = "/browser/remote/test/browser/network/sjs-cookies.sjs"; +const SJS_PATH = "/browser/remote/cdp/test/browser/network/sjs-cookies.sjs"; const DEFAULT_HOST = "http://example.org"; const ALT_HOST = "http://example.net"; @@ -143,8 +143,8 @@ add_task(async function session({ client }) { add_task(async function path({ client }) { const { Network } = client; - const PATH = "/browser/remote/test/browser/"; - const PARENT_PATH = "/browser/remote/test/"; + const PATH = "/browser/remote/cdp/test/browser/"; + const PARENT_PATH = "/browser/remote/cdp/test/"; await loadURL(`${DEFAULT_URL}?name=foo&value=bar&path=${PATH}`); diff --git a/remote/test/browser/network/browser_getCookies.js b/remote/cdp/test/browser/network/browser_getCookies.js similarity index 97% rename from remote/test/browser/network/browser_getCookies.js rename to remote/cdp/test/browser/network/browser_getCookies.js index c53fe9f0cccf..cbde3f9f59f2 100644 --- a/remote/test/browser/network/browser_getCookies.js +++ b/remote/cdp/test/browser/network/browser_getCookies.js @@ -3,7 +3,7 @@ "use strict"; -const SJS_PATH = "/browser/remote/test/browser/network/sjs-cookies.sjs"; +const SJS_PATH = "/browser/remote/cdp/test/browser/network/sjs-cookies.sjs"; const DEFAULT_HOST = "http://example.org"; const ALT_HOST = "http://example.net"; @@ -140,8 +140,8 @@ add_task(async function session({ client }) { add_task(async function path({ client }) { const { Network } = client; - const PATH = "/browser/remote/test/browser/"; - const PARENT_PATH = "/browser/remote/test/"; + const PATH = "/browser/remote/cdp/test/browser/"; + const PARENT_PATH = "/browser/remote/cdp/test/"; await loadURL(`${DEFAULT_URL}?name=foo&value=bar&path=${PATH}`); diff --git a/remote/test/browser/network/browser_navigationEvents.js b/remote/cdp/test/browser/network/browser_navigationEvents.js similarity index 98% rename from remote/test/browser/network/browser_navigationEvents.js rename to remote/cdp/test/browser/network/browser_navigationEvents.js index 4f088214182b..f890643d0686 100644 --- a/remote/test/browser/network/browser_navigationEvents.js +++ b/remote/cdp/test/browser/network/browser_navigationEvents.js @@ -6,7 +6,7 @@ // Test order and consistency of Network/Page events as a whole. // Details of specific events are checked in event-specific test files. -const BASE_PATH = "http://example.com/browser/remote/test/browser/network"; +const BASE_PATH = "http://example.com/browser/remote/cdp/test/browser/network"; const FRAMESET_URL = `${BASE_PATH}/doc_frameset.html`; const FRAMESET_JS_URL = `${BASE_PATH}/file_framesetEvents.js`; const PAGE_URL = `${BASE_PATH}/doc_networkEvents.html`; diff --git a/remote/test/browser/network/browser_requestWillBeSent.js b/remote/cdp/test/browser/network/browser_requestWillBeSent.js similarity index 98% rename from remote/test/browser/network/browser_requestWillBeSent.js rename to remote/cdp/test/browser/network/browser_requestWillBeSent.js index 274bf50e51c0..a44efdb9c1a4 100644 --- a/remote/test/browser/network/browser_requestWillBeSent.js +++ b/remote/cdp/test/browser/network/browser_requestWillBeSent.js @@ -3,7 +3,7 @@ "use strict"; -const BASE_PATH = "http://example.com/browser/remote/test/browser/network"; +const BASE_PATH = "http://example.com/browser/remote/cdp/test/browser/network"; const FRAMESET_URL = `${BASE_PATH}/doc_frameset.html`; const FRAMESET_JS_URL = `${BASE_PATH}/file_framesetEvents.js`; const PAGE_URL = `${BASE_PATH}/doc_networkEvents.html`; diff --git a/remote/test/browser/network/browser_responseReceived.js b/remote/cdp/test/browser/network/browser_responseReceived.js similarity index 98% rename from remote/test/browser/network/browser_responseReceived.js rename to remote/cdp/test/browser/network/browser_responseReceived.js index a258c95010cd..2cdb22f488ad 100644 --- a/remote/test/browser/network/browser_responseReceived.js +++ b/remote/cdp/test/browser/network/browser_responseReceived.js @@ -3,7 +3,7 @@ "use strict"; -const BASE_PATH = "http://example.com/browser/remote/test/browser/network"; +const BASE_PATH = "http://example.com/browser/remote/cdp/test/browser/network"; const FRAMESET_URL = `${BASE_PATH}/doc_frameset.html`; const FRAMESET_JS_URL = `${BASE_PATH}/file_framesetEvents.js`; const PAGE_URL = `${BASE_PATH}/doc_networkEvents.html`; diff --git a/remote/test/browser/network/browser_setCacheDisabled.js b/remote/cdp/test/browser/network/browser_setCacheDisabled.js similarity index 97% rename from remote/test/browser/network/browser_setCacheDisabled.js rename to remote/cdp/test/browser/network/browser_setCacheDisabled.js index 610c4b75311c..a096d3b57a46 100644 --- a/remote/test/browser/network/browser_setCacheDisabled.js +++ b/remote/cdp/test/browser/network/browser_setCacheDisabled.js @@ -6,7 +6,7 @@ const { INHIBIT_CACHING, LOAD_BYPASS_CACHE, LOAD_NORMAL } = Ci.nsIRequest; const TEST_PAGE = - "http://example.com/browser/remote/test/browser/network/doc_empty.html"; + "http://example.com/browser/remote/cdp/test/browser/network/doc_empty.html"; add_task(async function cacheEnabledAfterDisabled({ client }) { const { Network } = client; diff --git a/remote/test/browser/network/browser_setCookie.js b/remote/cdp/test/browser/network/browser_setCookie.js similarity index 98% rename from remote/test/browser/network/browser_setCookie.js rename to remote/cdp/test/browser/network/browser_setCookie.js index bb16e65c561b..eb49cbf2c90f 100644 --- a/remote/test/browser/network/browser_setCookie.js +++ b/remote/cdp/test/browser/network/browser_setCookie.js @@ -3,7 +3,7 @@ "use strict"; -const SJS_PATH = "/browser/remote/test/browser/network/sjs-cookies.sjs"; +const SJS_PATH = "/browser/remote/cdp/test/browser/network/sjs-cookies.sjs"; const DEFAULT_HOST = "example.org"; const ALT_HOST = "foo.example.org"; diff --git a/remote/test/browser/network/browser_setCookies.js b/remote/cdp/test/browser/network/browser_setCookies.js similarity index 100% rename from remote/test/browser/network/browser_setCookies.js rename to remote/cdp/test/browser/network/browser_setCookies.js diff --git a/remote/test/browser/network/browser_setUserAgentOverride.js b/remote/cdp/test/browser/network/browser_setUserAgentOverride.js similarity index 100% rename from remote/test/browser/network/browser_setUserAgentOverride.js rename to remote/cdp/test/browser/network/browser_setUserAgentOverride.js diff --git a/remote/test/browser/network/doc_empty.html b/remote/cdp/test/browser/network/doc_empty.html similarity index 100% rename from remote/test/browser/network/doc_empty.html rename to remote/cdp/test/browser/network/doc_empty.html diff --git a/remote/test/browser/network/doc_frameset.html b/remote/cdp/test/browser/network/doc_frameset.html similarity index 100% rename from remote/test/browser/network/doc_frameset.html rename to remote/cdp/test/browser/network/doc_frameset.html diff --git a/remote/test/browser/network/doc_networkEvents.html b/remote/cdp/test/browser/network/doc_networkEvents.html similarity index 100% rename from remote/test/browser/network/doc_networkEvents.html rename to remote/cdp/test/browser/network/doc_networkEvents.html diff --git a/remote/test/browser/network/file_framesetEvents.js b/remote/cdp/test/browser/network/file_framesetEvents.js similarity index 100% rename from remote/test/browser/network/file_framesetEvents.js rename to remote/cdp/test/browser/network/file_framesetEvents.js diff --git a/remote/test/browser/network/file_networkEvents.js b/remote/cdp/test/browser/network/file_networkEvents.js similarity index 100% rename from remote/test/browser/network/file_networkEvents.js rename to remote/cdp/test/browser/network/file_networkEvents.js diff --git a/remote/test/browser/network/head.js b/remote/cdp/test/browser/network/head.js similarity index 96% rename from remote/test/browser/network/head.js rename to remote/cdp/test/browser/network/head.js index d3a9786a4be7..91d8698674f7 100644 --- a/remote/test/browser/network/head.js +++ b/remote/cdp/test/browser/network/head.js @@ -6,7 +6,7 @@ /* import-globals-from ../head.js */ Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", this ); diff --git a/remote/test/browser/network/sjs-cookies.sjs b/remote/cdp/test/browser/network/sjs-cookies.sjs similarity index 100% rename from remote/test/browser/network/sjs-cookies.sjs rename to remote/cdp/test/browser/network/sjs-cookies.sjs diff --git a/remote/test/browser/page/browser.ini b/remote/cdp/test/browser/page/browser.ini similarity index 91% rename from remote/test/browser/page/browser.ini rename to remote/cdp/test/browser/page/browser.ini index 30f5638e7e86..972cb41d5617 100644 --- a/remote/test/browser/page/browser.ini +++ b/remote/cdp/test/browser/page/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js doc_empty.html sjs_redirect.sjs diff --git a/remote/test/browser/page/browser_bringToFront.js b/remote/cdp/test/browser/page/browser_bringToFront.js similarity index 100% rename from remote/test/browser/page/browser_bringToFront.js rename to remote/cdp/test/browser/page/browser_bringToFront.js diff --git a/remote/test/browser/page/browser_captureScreenshot.js b/remote/cdp/test/browser/page/browser_captureScreenshot.js similarity index 100% rename from remote/test/browser/page/browser_captureScreenshot.js rename to remote/cdp/test/browser/page/browser_captureScreenshot.js diff --git a/remote/test/browser/page/browser_createIsolatedWorld.js b/remote/cdp/test/browser/page/browser_createIsolatedWorld.js similarity index 100% rename from remote/test/browser/page/browser_createIsolatedWorld.js rename to remote/cdp/test/browser/page/browser_createIsolatedWorld.js diff --git a/remote/test/browser/page/browser_domContentEventFired.js b/remote/cdp/test/browser/page/browser_domContentEventFired.js similarity index 100% rename from remote/test/browser/page/browser_domContentEventFired.js rename to remote/cdp/test/browser/page/browser_domContentEventFired.js diff --git a/remote/test/browser/page/browser_frameAttached.js b/remote/cdp/test/browser/page/browser_frameAttached.js similarity index 100% rename from remote/test/browser/page/browser_frameAttached.js rename to remote/cdp/test/browser/page/browser_frameAttached.js diff --git a/remote/test/browser/page/browser_frameDetached.js b/remote/cdp/test/browser/page/browser_frameDetached.js similarity index 100% rename from remote/test/browser/page/browser_frameDetached.js rename to remote/cdp/test/browser/page/browser_frameDetached.js diff --git a/remote/test/browser/page/browser_frameNavigated.js b/remote/cdp/test/browser/page/browser_frameNavigated.js similarity index 100% rename from remote/test/browser/page/browser_frameNavigated.js rename to remote/cdp/test/browser/page/browser_frameNavigated.js diff --git a/remote/test/browser/page/browser_frameStartedLoading.js b/remote/cdp/test/browser/page/browser_frameStartedLoading.js similarity index 100% rename from remote/test/browser/page/browser_frameStartedLoading.js rename to remote/cdp/test/browser/page/browser_frameStartedLoading.js diff --git a/remote/test/browser/page/browser_frameStoppedLoading.js b/remote/cdp/test/browser/page/browser_frameStoppedLoading.js similarity index 100% rename from remote/test/browser/page/browser_frameStoppedLoading.js rename to remote/cdp/test/browser/page/browser_frameStoppedLoading.js diff --git a/remote/test/browser/page/browser_getFrameTree.js b/remote/cdp/test/browser/page/browser_getFrameTree.js similarity index 100% rename from remote/test/browser/page/browser_getFrameTree.js rename to remote/cdp/test/browser/page/browser_getFrameTree.js diff --git a/remote/test/browser/page/browser_getLayoutMetrics.js b/remote/cdp/test/browser/page/browser_getLayoutMetrics.js similarity index 100% rename from remote/test/browser/page/browser_getLayoutMetrics.js rename to remote/cdp/test/browser/page/browser_getLayoutMetrics.js diff --git a/remote/test/browser/page/browser_getNavigationHistory.js b/remote/cdp/test/browser/page/browser_getNavigationHistory.js similarity index 91% rename from remote/test/browser/page/browser_getNavigationHistory.js rename to remote/cdp/test/browser/page/browser_getNavigationHistory.js index 27f9e30c94c2..9a68bad5cc6f 100644 --- a/remote/test/browser/page/browser_getNavigationHistory.js +++ b/remote/cdp/test/browser/page/browser_getNavigationHistory.js @@ -49,9 +49,9 @@ add_task(async function locationRedirect({ client }) { const { Page } = client; const pageEmptyURL = - "http://example.com/browser/remote/test/browser/page/doc_empty.html"; + "http://example.com/browser/remote/cdp/test/browser/page/doc_empty.html"; const sjsURL = - "http://example.com/browser/remote/test/browser/page/sjs_redirect.sjs"; + "http://example.com/browser/remote/cdp/test/browser/page/sjs_redirect.sjs"; const redirectURL = `${sjsURL}?${pageEmptyURL}`; const data = [ diff --git a/remote/test/browser/page/browser_javascriptDialog_alert.js b/remote/cdp/test/browser/page/browser_javascriptDialog_alert.js similarity index 100% rename from remote/test/browser/page/browser_javascriptDialog_alert.js rename to remote/cdp/test/browser/page/browser_javascriptDialog_alert.js diff --git a/remote/test/browser/page/browser_javascriptDialog_beforeunload.js b/remote/cdp/test/browser/page/browser_javascriptDialog_beforeunload.js similarity index 100% rename from remote/test/browser/page/browser_javascriptDialog_beforeunload.js rename to remote/cdp/test/browser/page/browser_javascriptDialog_beforeunload.js diff --git a/remote/test/browser/page/browser_javascriptDialog_confirm.js b/remote/cdp/test/browser/page/browser_javascriptDialog_confirm.js similarity index 100% rename from remote/test/browser/page/browser_javascriptDialog_confirm.js rename to remote/cdp/test/browser/page/browser_javascriptDialog_confirm.js diff --git a/remote/test/browser/page/browser_javascriptDialog_otherTarget.js b/remote/cdp/test/browser/page/browser_javascriptDialog_otherTarget.js similarity index 100% rename from remote/test/browser/page/browser_javascriptDialog_otherTarget.js rename to remote/cdp/test/browser/page/browser_javascriptDialog_otherTarget.js diff --git a/remote/test/browser/page/browser_javascriptDialog_prompt.js b/remote/cdp/test/browser/page/browser_javascriptDialog_prompt.js similarity index 100% rename from remote/test/browser/page/browser_javascriptDialog_prompt.js rename to remote/cdp/test/browser/page/browser_javascriptDialog_prompt.js diff --git a/remote/test/browser/page/browser_lifecycleEvent.js b/remote/cdp/test/browser/page/browser_lifecycleEvent.js similarity index 98% rename from remote/test/browser/page/browser_lifecycleEvent.js rename to remote/cdp/test/browser/page/browser_lifecycleEvent.js index 42e80583b3ae..c6963c05b0e5 100644 --- a/remote/test/browser/page/browser_lifecycleEvent.js +++ b/remote/cdp/test/browser/page/browser_lifecycleEvent.js @@ -13,7 +13,7 @@ const DOC_IFRAME_NESTED = toDataURL(` `); const PAGE_URL = - "http://example.com/browser/remote/test/browser/page/doc_empty.html"; + "http://example.com/browser/remote/cdp/test/browser/page/doc_empty.html"; add_task(async function noEventsWhenPageDomainDisabled({ client }) { await runPageLifecycleTest(client, 0, async () => { diff --git a/remote/test/browser/page/browser_loadEventFired.js b/remote/cdp/test/browser/page/browser_loadEventFired.js similarity index 100% rename from remote/test/browser/page/browser_loadEventFired.js rename to remote/cdp/test/browser/page/browser_loadEventFired.js diff --git a/remote/test/browser/page/browser_navigate.js b/remote/cdp/test/browser/page/browser_navigate.js similarity index 98% rename from remote/test/browser/page/browser_navigate.js rename to remote/cdp/test/browser/page/browser_navigate.js index d377f353d5b4..4c6989ee61b2 100644 --- a/remote/test/browser/page/browser_navigate.js +++ b/remote/cdp/test/browser/page/browser_navigate.js @@ -4,7 +4,7 @@ "use strict"; const pageEmptyURL = - "http://example.com/browser/remote/test/browser/page/doc_empty.html"; + "http://example.com/browser/remote/cdp/test/browser/page/doc_empty.html"; add_task(async function testBasicNavigation({ client }) { const { Page, Network } = client; @@ -91,7 +91,7 @@ add_task(async function testTwoNavigations({ client }) { add_task(async function testRedirect({ client }) { const { Page, Network } = client; const sjsURL = - "http://example.com/browser/remote/test/browser/page/sjs_redirect.sjs"; + "http://example.com/browser/remote/cdp/test/browser/page/sjs_redirect.sjs"; const redirectURL = `${sjsURL}?${pageEmptyURL}`; await Page.enable(); await Network.enable(); diff --git a/remote/test/browser/page/browser_navigateToHistoryEntry.js b/remote/cdp/test/browser/page/browser_navigateToHistoryEntry.js similarity index 100% rename from remote/test/browser/page/browser_navigateToHistoryEntry.js rename to remote/cdp/test/browser/page/browser_navigateToHistoryEntry.js diff --git a/remote/test/browser/page/browser_navigationEvents.js b/remote/cdp/test/browser/page/browser_navigationEvents.js similarity index 100% rename from remote/test/browser/page/browser_navigationEvents.js rename to remote/cdp/test/browser/page/browser_navigationEvents.js diff --git a/remote/test/browser/page/browser_printToPDF.js b/remote/cdp/test/browser/page/browser_printToPDF.js similarity index 100% rename from remote/test/browser/page/browser_printToPDF.js rename to remote/cdp/test/browser/page/browser_printToPDF.js diff --git a/remote/test/browser/page/browser_reload.js b/remote/cdp/test/browser/page/browser_reload.js similarity index 100% rename from remote/test/browser/page/browser_reload.js rename to remote/cdp/test/browser/page/browser_reload.js diff --git a/remote/test/browser/page/browser_runtimeEvents.js b/remote/cdp/test/browser/page/browser_runtimeEvents.js similarity index 100% rename from remote/test/browser/page/browser_runtimeEvents.js rename to remote/cdp/test/browser/page/browser_runtimeEvents.js diff --git a/remote/test/browser/page/browser_scriptToEvaluateOnNewDocument.js b/remote/cdp/test/browser/page/browser_scriptToEvaluateOnNewDocument.js similarity index 100% rename from remote/test/browser/page/browser_scriptToEvaluateOnNewDocument.js rename to remote/cdp/test/browser/page/browser_scriptToEvaluateOnNewDocument.js diff --git a/remote/test/browser/page/doc_empty.html b/remote/cdp/test/browser/page/doc_empty.html similarity index 100% rename from remote/test/browser/page/doc_empty.html rename to remote/cdp/test/browser/page/doc_empty.html diff --git a/remote/test/browser/page/head.js b/remote/cdp/test/browser/page/head.js similarity index 97% rename from remote/test/browser/page/head.js rename to remote/cdp/test/browser/page/head.js index 861842760ec7..48053024faaa 100644 --- a/remote/test/browser/page/head.js +++ b/remote/cdp/test/browser/page/head.js @@ -6,7 +6,7 @@ /* import-globals-from ../head.js */ Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", this ); diff --git a/remote/test/browser/page/sjs_redirect.sjs b/remote/cdp/test/browser/page/sjs_redirect.sjs similarity index 100% rename from remote/test/browser/page/sjs_redirect.sjs rename to remote/cdp/test/browser/page/sjs_redirect.sjs diff --git a/remote/test/browser/runtime/browser.ini b/remote/cdp/test/browser/runtime/browser.ini similarity index 82% rename from remote/test/browser/runtime/browser.ini rename to remote/cdp/test/browser/runtime/browser.ini index 4e6f884ec482..9b981e8796ea 100644 --- a/remote/test/browser/runtime/browser.ini +++ b/remote/cdp/test/browser/runtime/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js doc_console_events.html head.js diff --git a/remote/test/browser/runtime/browser_callFunctionOn.js b/remote/cdp/test/browser/runtime/browser_callFunctionOn.js similarity index 100% rename from remote/test/browser/runtime/browser_callFunctionOn.js rename to remote/cdp/test/browser/runtime/browser_callFunctionOn.js diff --git a/remote/test/browser/runtime/browser_callFunctionOn_returnByValue.js b/remote/cdp/test/browser/runtime/browser_callFunctionOn_returnByValue.js similarity index 100% rename from remote/test/browser/runtime/browser_callFunctionOn_returnByValue.js rename to remote/cdp/test/browser/runtime/browser_callFunctionOn_returnByValue.js diff --git a/remote/test/browser/runtime/browser_consoleAPICalled.js b/remote/cdp/test/browser/runtime/browser_consoleAPICalled.js similarity index 98% rename from remote/test/browser/runtime/browser_consoleAPICalled.js rename to remote/cdp/test/browser/runtime/browser_consoleAPICalled.js index 2ac3bbdf4d79..2cac7826714c 100644 --- a/remote/test/browser/runtime/browser_consoleAPICalled.js +++ b/remote/cdp/test/browser/runtime/browser_consoleAPICalled.js @@ -4,7 +4,7 @@ "use strict"; const PAGE_CONSOLE_EVENTS = - "http://example.com/browser/remote/test/browser/runtime/doc_console_events.html"; + "http://example.com/browser/remote/cdp/test/browser/runtime/doc_console_events.html"; add_task(async function noEventsWhenRuntimeDomainDisabled({ client }) { await runConsoleTest(client, 0, async () => { diff --git a/remote/test/browser/runtime/browser_evaluate.js b/remote/cdp/test/browser/runtime/browser_evaluate.js similarity index 100% rename from remote/test/browser/runtime/browser_evaluate.js rename to remote/cdp/test/browser/runtime/browser_evaluate.js diff --git a/remote/test/browser/runtime/browser_exceptionThrown.js b/remote/cdp/test/browser/runtime/browser_exceptionThrown.js similarity index 97% rename from remote/test/browser/runtime/browser_exceptionThrown.js rename to remote/cdp/test/browser/runtime/browser_exceptionThrown.js index 8c911d0fde83..086dc829f5f7 100644 --- a/remote/test/browser/runtime/browser_exceptionThrown.js +++ b/remote/cdp/test/browser/runtime/browser_exceptionThrown.js @@ -4,7 +4,7 @@ "use strict"; const PAGE_CONSOLE_EVENTS = - "http://example.com/browser/remote/test/browser/runtime/doc_console_events.html"; + "http://example.com/browser/remote/cdp/test/browser/runtime/doc_console_events.html"; add_task(async function noEventsWhenRuntimeDomainDisabled({ client }) { await runExceptionThrownTest(client, 0, async () => { diff --git a/remote/test/browser/runtime/browser_executionContextEvents.js b/remote/cdp/test/browser/runtime/browser_executionContextEvents.js similarity index 100% rename from remote/test/browser/runtime/browser_executionContextEvents.js rename to remote/cdp/test/browser/runtime/browser_executionContextEvents.js diff --git a/remote/test/browser/runtime/browser_getProperties.js b/remote/cdp/test/browser/runtime/browser_getProperties.js similarity index 100% rename from remote/test/browser/runtime/browser_getProperties.js rename to remote/cdp/test/browser/runtime/browser_getProperties.js diff --git a/remote/test/browser/runtime/browser_remoteObjects.js b/remote/cdp/test/browser/runtime/browser_remoteObjects.js similarity index 100% rename from remote/test/browser/runtime/browser_remoteObjects.js rename to remote/cdp/test/browser/runtime/browser_remoteObjects.js diff --git a/remote/test/browser/runtime/doc_console_events.html b/remote/cdp/test/browser/runtime/doc_console_events.html similarity index 100% rename from remote/test/browser/runtime/doc_console_events.html rename to remote/cdp/test/browser/runtime/doc_console_events.html diff --git a/remote/test/browser/emulation/head.js b/remote/cdp/test/browser/runtime/head.js similarity index 74% rename from remote/test/browser/emulation/head.js rename to remote/cdp/test/browser/runtime/head.js index 7131e98b6f0c..226595800d23 100644 --- a/remote/test/browser/emulation/head.js +++ b/remote/cdp/test/browser/runtime/head.js @@ -6,6 +6,6 @@ /* import-globals-from ../head.js */ Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", this ); diff --git a/remote/test/browser/security/browser.ini b/remote/cdp/test/browser/security/browser.ini similarity index 60% rename from remote/test/browser/security/browser.ini rename to remote/cdp/test/browser/security/browser.ini index 5a8065e015ca..611984ce56c8 100644 --- a/remote/test/browser/security/browser.ini +++ b/remote/cdp/test/browser/security/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js [browser_setIgnoreCertificateErrors.js] diff --git a/remote/test/browser/security/browser_setIgnoreCertificateErrors.js b/remote/cdp/test/browser/security/browser_setIgnoreCertificateErrors.js similarity index 100% rename from remote/test/browser/security/browser_setIgnoreCertificateErrors.js rename to remote/cdp/test/browser/security/browser_setIgnoreCertificateErrors.js diff --git a/remote/cdp/test/browser/security/head.js b/remote/cdp/test/browser/security/head.js new file mode 100644 index 000000000000..226595800d23 --- /dev/null +++ b/remote/cdp/test/browser/security/head.js @@ -0,0 +1,11 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +/* import-globals-from ../head.js */ + +Services.scriptloader.loadSubScript( + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", + this +); diff --git a/remote/test/browser/target/browser.ini b/remote/cdp/test/browser/target/browser.ini similarity index 84% rename from remote/test/browser/target/browser.ini rename to remote/cdp/test/browser/target/browser.ini index d0f854decd41..e2d7e899c357 100644 --- a/remote/test/browser/target/browser.ini +++ b/remote/cdp/test/browser/target/browser.ini @@ -4,8 +4,8 @@ subsuite = remote prefs = remote.enabled=true support-files = - !/remote/test/browser/chrome-remote-interface.js - !/remote/test/browser/head.js + !/remote/cdp/test/browser/chrome-remote-interface.js + !/remote/cdp/test/browser/head.js head.js doc_test.html diff --git a/remote/test/browser/target/browser_activateTarget.js b/remote/cdp/test/browser/target/browser_activateTarget.js similarity index 100% rename from remote/test/browser/target/browser_activateTarget.js rename to remote/cdp/test/browser/target/browser_activateTarget.js diff --git a/remote/test/browser/target/browser_attachToTarget.js b/remote/cdp/test/browser/target/browser_attachToTarget.js similarity index 100% rename from remote/test/browser/target/browser_attachToTarget.js rename to remote/cdp/test/browser/target/browser_attachToTarget.js diff --git a/remote/test/browser/target/browser_attachedToTarget.js b/remote/cdp/test/browser/target/browser_attachedToTarget.js similarity index 94% rename from remote/test/browser/target/browser_attachedToTarget.js rename to remote/cdp/test/browser/target/browser_attachedToTarget.js index 27ffba30cfa1..86540a776f5a 100644 --- a/remote/test/browser/target/browser_attachedToTarget.js +++ b/remote/cdp/test/browser/target/browser_attachedToTarget.js @@ -4,7 +4,7 @@ "use strict"; const PAGE_TEST = - "http://example.com/browser/remote/test/browser/target/doc_test.html"; + "http://example.com/browser/remote/cdp/test/browser/target/doc_test.html"; add_task( async function attachedPageTarget({ client }) { diff --git a/remote/test/browser/target/browser_browserContext.js b/remote/cdp/test/browser/target/browser_browserContext.js similarity index 100% rename from remote/test/browser/target/browser_browserContext.js rename to remote/cdp/test/browser/target/browser_browserContext.js diff --git a/remote/test/browser/target/browser_closeTarget.js b/remote/cdp/test/browser/target/browser_closeTarget.js similarity index 100% rename from remote/test/browser/target/browser_closeTarget.js rename to remote/cdp/test/browser/target/browser_closeTarget.js diff --git a/remote/test/browser/target/browser_getTargets.js b/remote/cdp/test/browser/target/browser_getTargets.js similarity index 94% rename from remote/test/browser/target/browser_getTargets.js rename to remote/cdp/test/browser/target/browser_getTargets.js index a867a0d18de1..97df80cd109d 100644 --- a/remote/test/browser/target/browser_getTargets.js +++ b/remote/cdp/test/browser/target/browser_getTargets.js @@ -4,7 +4,7 @@ "use strict"; const PAGE_TEST = - "http://example.com/browser/remote/test/browser/target/doc_test.html"; + "http://example.com/browser/remote/cdp/test/browser/target/doc_test.html"; add_task( async function getTargetsDetails({ client }) { diff --git a/remote/test/browser/target/browser_sendMessageToTarget.js b/remote/cdp/test/browser/target/browser_sendMessageToTarget.js similarity index 100% rename from remote/test/browser/target/browser_sendMessageToTarget.js rename to remote/cdp/test/browser/target/browser_sendMessageToTarget.js diff --git a/remote/test/browser/target/browser_setDiscoverTargets.js b/remote/cdp/test/browser/target/browser_setDiscoverTargets.js similarity index 100% rename from remote/test/browser/target/browser_setDiscoverTargets.js rename to remote/cdp/test/browser/target/browser_setDiscoverTargets.js diff --git a/remote/test/browser/target/browser_targetCreated.js b/remote/cdp/test/browser/target/browser_targetCreated.js similarity index 100% rename from remote/test/browser/target/browser_targetCreated.js rename to remote/cdp/test/browser/target/browser_targetCreated.js diff --git a/remote/test/browser/target/browser_targetDestroyed.js b/remote/cdp/test/browser/target/browser_targetDestroyed.js similarity index 100% rename from remote/test/browser/target/browser_targetDestroyed.js rename to remote/cdp/test/browser/target/browser_targetDestroyed.js diff --git a/remote/test/browser/target/doc_test.html b/remote/cdp/test/browser/target/doc_test.html similarity index 100% rename from remote/test/browser/target/doc_test.html rename to remote/cdp/test/browser/target/doc_test.html diff --git a/remote/cdp/test/browser/target/head.js b/remote/cdp/test/browser/target/head.js new file mode 100644 index 000000000000..226595800d23 --- /dev/null +++ b/remote/cdp/test/browser/target/head.js @@ -0,0 +1,11 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +/* import-globals-from ../head.js */ + +Services.scriptloader.loadSubScript( + "chrome://mochitests/content/browser/remote/cdp/test/browser/head.js", + this +); diff --git a/remote/test/unit/test_Connection.js b/remote/cdp/test/xpcshell/test_Connection.js similarity index 100% rename from remote/test/unit/test_Connection.js rename to remote/cdp/test/xpcshell/test_Connection.js diff --git a/remote/test/unit/test_DomainCache.js b/remote/cdp/test/xpcshell/test_DomainCache.js similarity index 100% rename from remote/test/unit/test_DomainCache.js rename to remote/cdp/test/xpcshell/test_DomainCache.js diff --git a/remote/test/unit/test_Error.js b/remote/cdp/test/xpcshell/test_Error.js similarity index 100% rename from remote/test/unit/test_Error.js rename to remote/cdp/test/xpcshell/test_Error.js diff --git a/remote/test/unit/test_Session.js b/remote/cdp/test/xpcshell/test_Session.js similarity index 100% rename from remote/test/unit/test_Session.js rename to remote/cdp/test/xpcshell/test_Session.js diff --git a/remote/test/unit/test_StreamRegistry.js b/remote/cdp/test/xpcshell/test_StreamRegistry.js similarity index 100% rename from remote/test/unit/test_StreamRegistry.js rename to remote/cdp/test/xpcshell/test_StreamRegistry.js diff --git a/remote/test/unit/xpcshell.ini b/remote/cdp/test/xpcshell/xpcshell.ini similarity index 91% rename from remote/test/unit/xpcshell.ini rename to remote/cdp/test/xpcshell/xpcshell.ini index 8e004e8dd277..801f2e1caf70 100644 --- a/remote/test/unit/xpcshell.ini +++ b/remote/cdp/test/xpcshell/xpcshell.ini @@ -8,7 +8,5 @@ skip-if = appname == "thunderbird" [test_Connection.js] [test_DomainCache.js] [test_Error.js] -[test_Format.js] [test_Session.js] [test_StreamRegistry.js] -[test_Sync.js] diff --git a/remote/doc/Testing.md b/remote/doc/Testing.md index 358acb85d2d8..19bf002f5dc4 100644 --- a/remote/doc/Testing.md +++ b/remote/doc/Testing.md @@ -1,8 +1,10 @@ Testing ======= -The remote agent has unit- and functional tests located under -`remote/test/{unit,browser}`. +The remote agent has unit- and functional tests located under different folders: + + - Shared Modules: `remote/shared/test/xpcshell` + - CDP: `remote/cdp/test/{xpcshell,browser}`. You may run all the tests under a particular subfolder like this: @@ -15,7 +17,7 @@ Unit tests Because tests are run in parallel and [xpcshell] itself is quite chatty, it can sometimes be useful to run the tests in sequence: - % ./mach xpcshell-test --sequential remote/test/unit/test_DomainCache.js + % ./mach xpcshell-test --sequential remote/cdp/test/unit/test_DomainCache.js The unit tests will appear as part of the `X` (for _xpcshell_) jobs on Treeherder. @@ -26,10 +28,10 @@ on Treeherder. Browser chrome tests -------------------- -We also have a set of functional [browser chrome] tests located -under _remote/test/browser_: +We also have a set of functional [browser chrome] tests for CDP located +under _remote/cdp/test/browser_: - % ./mach mochitest remote/test/browser/browser_cdp.js + % ./mach mochitest remote/cdp/test/browser/browser_cdp.js The functional tests will appear under the `M` (for _mochitest_) category in the `remote` jobs on Treeherder. @@ -38,7 +40,7 @@ As the functional tests will sporadically pop up new Firefox application windows, a helpful tip is to run them in [headless mode]: - % ./mach mochitest --headless remote/test/browser + % ./mach mochitest --headless remote/cdp/test/browser The `--headless` flag is equivalent to setting the `MOZ_HEADLESS` environment variable. You can additionally use `MOZ_HEADLESS_WIDTH` diff --git a/remote/moz.build b/remote/moz.build index bf59bb7f6d6c..8be8441ab86e 100644 --- a/remote/moz.build +++ b/remote/moz.build @@ -3,8 +3,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ + "cdp", "components", - "test", + "shared", ] JAR_MANIFESTS += ["jar.mn"] diff --git a/remote/shared/moz.build b/remote/shared/moz.build new file mode 100644 index 000000000000..0d120f1e3ded --- /dev/null +++ b/remote/shared/moz.build @@ -0,0 +1,5 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.ini"] diff --git a/remote/test/unit/test_Format.js b/remote/shared/test/xpcshell/test_Format.js similarity index 100% rename from remote/test/unit/test_Format.js rename to remote/shared/test/xpcshell/test_Format.js diff --git a/remote/test/unit/test_Sync.js b/remote/shared/test/xpcshell/test_Sync.js similarity index 100% rename from remote/test/unit/test_Sync.js rename to remote/shared/test/xpcshell/test_Sync.js diff --git a/remote/shared/test/xpcshell/xpcshell.ini b/remote/shared/test/xpcshell/xpcshell.ini new file mode 100644 index 000000000000..2849a488f57d --- /dev/null +++ b/remote/shared/test/xpcshell/xpcshell.ini @@ -0,0 +1,9 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +[DEFAULT] +skip-if = appname == "thunderbird" + +[test_Format.js] +[test_Sync.js] diff --git a/remote/test/browser/security/head.js b/remote/test/browser/security/head.js deleted file mode 100644 index 7131e98b6f0c..000000000000 --- a/remote/test/browser/security/head.js +++ /dev/null @@ -1,11 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -/* import-globals-from ../head.js */ - -Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", - this -); diff --git a/remote/test/browser/target/head.js b/remote/test/browser/target/head.js deleted file mode 100644 index 7131e98b6f0c..000000000000 --- a/remote/test/browser/target/head.js +++ /dev/null @@ -1,11 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -/* import-globals-from ../head.js */ - -Services.scriptloader.loadSubScript( - "chrome://mochitests/content/browser/remote/test/browser/head.js", - this -); diff --git a/remote/test/moz.build b/remote/test/moz.build deleted file mode 100644 index 94bc3f985f80..000000000000 --- a/remote/test/moz.build +++ /dev/null @@ -1,18 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -XPCSHELL_TESTS_MANIFESTS += ["unit/xpcshell.ini"] -BROWSER_CHROME_MANIFESTS += [ - "browser/browser.ini", - "browser/dom/browser.ini", - "browser/emulation/browser.ini", - "browser/input/browser.ini", - "browser/io/browser.ini", - "browser/log/browser.ini", - "browser/network/browser.ini", - "browser/page/browser.ini", - "browser/runtime/browser.ini", - "browser/security/browser.ini", - "browser/target/browser.ini", -] diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt index d3a41129eeed..6e775fb5aa90 100644 --- a/tools/rewriting/ThirdPartyPaths.txt +++ b/tools/rewriting/ThirdPartyPaths.txt @@ -140,7 +140,7 @@ netwerk/srtp/src/ nsprpub/ other-licenses/ parser/expat/ -remote/test/browser/chrome-remote-interface.js +remote/cdp/test/browser/chrome-remote-interface.js remote/test/puppeteer/ security/nss/ security/sandbox/chromium/