diff --git a/.eslintignore b/.eslintignore index 208eeea83616..db23650456c5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -124,14 +124,15 @@ devtools/client/inspector/markup/test/events_bundle.js devtools/client/netmonitor/test/xhr_bundle.js devtools/client/webconsole/test/browser/code_bundle_nosource.js devtools/client/webconsole/test/browser/code_bundle_invalidmap.js -devtools/server/tests/xpcshell/setBreakpoint* -devtools/server/tests/xpcshell/sourcemapped.js +devtools/server/tests/unit/babel_and_browserify_script_with_source_map.js +devtools/server/tests/unit/setBreakpoint* +devtools/server/tests/unit/sourcemapped.js # Testing syntax error devtools/client/webconsole/test/browser/test-syntaxerror-worklet.js # devtools specific format test file -devtools/server/tests/xpcshell/xpcshell_debugging_script.js +devtools/server/tests/unit/xpcshell_debugging_script.js # Third-party dom/canvas/test/webgl-conf/ diff --git a/devtools/client/aboutdebugging/documentation/TESTS.md b/devtools/client/aboutdebugging/documentation/TESTS.md index 637e0cd18e76..ef7163a319d8 100644 --- a/devtools/client/aboutdebugging/documentation/TESTS.md +++ b/devtools/client/aboutdebugging/documentation/TESTS.md @@ -2,7 +2,7 @@ ## Tests overview -Tests are located in `devtools/client/aboutdebugging/test`. There are two subfolders, `browser` and `xpcshell`. `browser` contains our [browser mochitests](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Mochitest). Most of our tests are browser mochitests. `xpcshell` contains our [xpc-shell unit tests](https://developer.mozilla.org/en-US/docs/Mozilla/QA/Writing_xpcshell-based_unit_tests). At the moment of writing we only have one. +Tests are located in `devtools/client/aboutdebugging/test`. There are two subfolders, `browser` and `unit`. `browser` contains our [browser mochitests](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Mochitest). Most of our tests are browser mochitests. `unit` contains our [xpc-shell unit tests](https://developer.mozilla.org/en-US/docs/Mozilla/QA/Writing_xpcshell-based_unit_tests). At the moment of writing we only have one. ## Test coverage @@ -121,4 +121,4 @@ Below is an example of pushing to try using the try syntax selector. As the docu Refer to the [try syntax documentation](https://firefox-source-docs.mozilla.org/tools/try/selectors/syntax.html) to learn what the various parameters mean. -Note that you need committer access level 1 in order to push to try. +Note that you need committer access level 1 in order to push to try. \ No newline at end of file diff --git a/devtools/client/aboutdebugging/moz.build b/devtools/client/aboutdebugging/moz.build index 72139fa5debe..d365a0f01394 100644 --- a/devtools/client/aboutdebugging/moz.build +++ b/devtools/client/aboutdebugging/moz.build @@ -12,7 +12,7 @@ DIRS += [ ] XPCSHELL_TESTS_MANIFESTS += [ - 'test/xpcshell/xpcshell.ini' + 'test/unit/xpcshell.ini' ] BROWSER_CHROME_MANIFESTS += [ diff --git a/devtools/client/aboutdebugging/test/xpcshell/.eslintrc.js b/devtools/client/aboutdebugging/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/aboutdebugging/test/xpcshell/.eslintrc.js rename to devtools/client/aboutdebugging/test/unit/.eslintrc.js diff --git a/devtools/client/aboutdebugging/test/xpcshell/test_extensions_path.js b/devtools/client/aboutdebugging/test/unit/test_extensions_path.js similarity index 100% rename from devtools/client/aboutdebugging/test/xpcshell/test_extensions_path.js rename to devtools/client/aboutdebugging/test/unit/test_extensions_path.js diff --git a/devtools/client/aboutdebugging/test/xpcshell/xpcshell-head.js b/devtools/client/aboutdebugging/test/unit/xpcshell-head.js similarity index 100% rename from devtools/client/aboutdebugging/test/xpcshell/xpcshell-head.js rename to devtools/client/aboutdebugging/test/unit/xpcshell-head.js diff --git a/devtools/client/aboutdebugging/test/xpcshell/xpcshell.ini b/devtools/client/aboutdebugging/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/aboutdebugging/test/xpcshell/xpcshell.ini rename to devtools/client/aboutdebugging/test/unit/xpcshell.ini diff --git a/devtools/client/application/README.md b/devtools/client/application/README.md index c5e478954b2c..a29d335b73ae 100644 --- a/devtools/client/application/README.md +++ b/devtools/client/application/README.md @@ -28,7 +28,7 @@ The application panel lives in the `devtools/client/application` directory. Insi └── test ├── browser -> mochitests (e2e/integration) ├── node -> Jest unit tests - └── xpcshell -> xpcshell unit tests + └── unit -> xpcshell unit tests ``` ### Panel registration @@ -159,7 +159,7 @@ Besides the usual DevTools test helpers, the Application panel adds some other h ### Unit tests with xpcshell -We are using xpcshell unit tests for the **Redux reducers** in `devtools/client/application/test/xpcshell`. +We are using xpcshell unit tests for the **Redux reducers** in `devtools/client/application/test/unit`. Other unit tests that don't need Enzyme or other npm modules should be added here too. @@ -335,4 +335,4 @@ If you have questions about the code, features, planning, etc. the current activ - Product management: Harald Kischner (`:digitarald`) - Engineering management: Patrick Brosset (`:pbro`) - Engineering: Belén Albeza (`:ladybenko`) -- Engineering: Ola Gasidlo (`:ola`) +- Engineering: Ola Gasidlo (`:ola`) \ No newline at end of file diff --git a/devtools/client/application/moz.build b/devtools/client/application/moz.build index 1cb34dc02d8d..298ef0b50108 100644 --- a/devtools/client/application/moz.build +++ b/devtools/client/application/moz.build @@ -17,5 +17,5 @@ BROWSER_CHROME_MANIFESTS += [ ] XPCSHELL_TESTS_MANIFESTS += [ - 'test/xpcshell/xpcshell.ini' + 'test/unit/xpcshell.ini' ] diff --git a/devtools/client/application/test/xpcshell/.eslintrc.js b/devtools/client/application/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/application/test/xpcshell/.eslintrc.js rename to devtools/client/application/test/unit/.eslintrc.js diff --git a/devtools/client/application/test/xpcshell/test_manifest_reducer.js b/devtools/client/application/test/unit/test_manifest_reducer.js similarity index 100% rename from devtools/client/application/test/xpcshell/test_manifest_reducer.js rename to devtools/client/application/test/unit/test_manifest_reducer.js diff --git a/devtools/client/application/test/xpcshell/test_page_reducer.js b/devtools/client/application/test/unit/test_page_reducer.js similarity index 100% rename from devtools/client/application/test/xpcshell/test_page_reducer.js rename to devtools/client/application/test/unit/test_page_reducer.js diff --git a/devtools/client/application/test/xpcshell/test_ui_reducer.js b/devtools/client/application/test/unit/test_ui_reducer.js similarity index 100% rename from devtools/client/application/test/xpcshell/test_ui_reducer.js rename to devtools/client/application/test/unit/test_ui_reducer.js diff --git a/devtools/client/application/test/xpcshell/test_workers_reducer.js b/devtools/client/application/test/unit/test_workers_reducer.js similarity index 100% rename from devtools/client/application/test/xpcshell/test_workers_reducer.js rename to devtools/client/application/test/unit/test_workers_reducer.js diff --git a/devtools/client/application/test/xpcshell/xpcshell-head.js b/devtools/client/application/test/unit/xpcshell-head.js similarity index 100% rename from devtools/client/application/test/xpcshell/xpcshell-head.js rename to devtools/client/application/test/unit/xpcshell-head.js diff --git a/devtools/client/application/test/xpcshell/xpcshell.ini b/devtools/client/application/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/application/test/xpcshell/xpcshell.ini rename to devtools/client/application/test/unit/xpcshell.ini diff --git a/devtools/client/framework/moz.build b/devtools/client/framework/moz.build index fc756390f024..6d5022f32b29 100644 --- a/devtools/client/framework/moz.build +++ b/devtools/client/framework/moz.build @@ -13,7 +13,7 @@ BROWSER_CHROME_MANIFESTS += [ 'test/metrics/browser_metrics_netmonitor.ini', 'test/metrics/browser_metrics_webconsole.ini', ] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] DIRS += [ 'actions', diff --git a/devtools/client/framework/test/xpcshell/.eslintrc.js b/devtools/client/framework/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/framework/test/xpcshell/.eslintrc.js rename to devtools/client/framework/test/unit/.eslintrc.js diff --git a/devtools/client/framework/test/xpcshell/test_tabs_absolute_order.js b/devtools/client/framework/test/unit/test_tabs_absolute_order.js similarity index 100% rename from devtools/client/framework/test/xpcshell/test_tabs_absolute_order.js rename to devtools/client/framework/test/unit/test_tabs_absolute_order.js diff --git a/devtools/client/framework/test/xpcshell/xpcshell.ini b/devtools/client/framework/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/framework/test/xpcshell/xpcshell.ini rename to devtools/client/framework/test/unit/xpcshell.ini diff --git a/devtools/client/inspector/changes/moz.build b/devtools/client/inspector/changes/moz.build index a1483df7646d..f8f04c4d275d 100644 --- a/devtools/client/inspector/changes/moz.build +++ b/devtools/client/inspector/changes/moz.build @@ -18,7 +18,7 @@ DevToolsModules( ) BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] with Files('**'): BUG_COMPONENT = ('DevTools', 'Inspector: Changes') diff --git a/devtools/client/inspector/changes/test/xpcshell/.eslintrc.js b/devtools/client/inspector/changes/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/inspector/changes/test/xpcshell/.eslintrc.js rename to devtools/client/inspector/changes/test/unit/.eslintrc.js diff --git a/devtools/client/inspector/changes/test/xpcshell/head.js b/devtools/client/inspector/changes/test/unit/head.js similarity index 100% rename from devtools/client/inspector/changes/test/xpcshell/head.js rename to devtools/client/inspector/changes/test/unit/head.js diff --git a/devtools/client/inspector/changes/test/xpcshell/mocks.js b/devtools/client/inspector/changes/test/unit/mocks.js similarity index 100% rename from devtools/client/inspector/changes/test/xpcshell/mocks.js rename to devtools/client/inspector/changes/test/unit/mocks.js diff --git a/devtools/client/inspector/changes/test/xpcshell/test_changes_stylesheet.js b/devtools/client/inspector/changes/test/unit/test_changes_stylesheet.js similarity index 100% rename from devtools/client/inspector/changes/test/xpcshell/test_changes_stylesheet.js rename to devtools/client/inspector/changes/test/unit/test_changes_stylesheet.js diff --git a/devtools/client/inspector/changes/test/xpcshell/xpcshell.ini b/devtools/client/inspector/changes/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/inspector/changes/test/xpcshell/xpcshell.ini rename to devtools/client/inspector/changes/test/unit/xpcshell.ini diff --git a/devtools/client/inspector/compatibility/moz.build b/devtools/client/inspector/compatibility/moz.build index 65defdab9947..4f810d0fdd98 100644 --- a/devtools/client/inspector/compatibility/moz.build +++ b/devtools/client/inspector/compatibility/moz.build @@ -13,7 +13,7 @@ DIRS += [ ] BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] DevToolsModules( 'CompatibilityView.js', diff --git a/devtools/client/inspector/compatibility/test/xpcshell/.eslintrc.js b/devtools/client/inspector/compatibility/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/inspector/compatibility/test/xpcshell/.eslintrc.js rename to devtools/client/inspector/compatibility/test/unit/.eslintrc.js diff --git a/devtools/client/inspector/compatibility/test/xpcshell/head.js b/devtools/client/inspector/compatibility/test/unit/head.js similarity index 100% rename from devtools/client/inspector/compatibility/test/xpcshell/head.js rename to devtools/client/inspector/compatibility/test/unit/head.js diff --git a/devtools/client/inspector/compatibility/test/xpcshell/test_mdn-compatibility.js b/devtools/client/inspector/compatibility/test/unit/test_mdn-compatibility.js similarity index 100% rename from devtools/client/inspector/compatibility/test/xpcshell/test_mdn-compatibility.js rename to devtools/client/inspector/compatibility/test/unit/test_mdn-compatibility.js diff --git a/devtools/client/inspector/compatibility/test/xpcshell/xpcshell.ini b/devtools/client/inspector/compatibility/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/inspector/compatibility/test/xpcshell/xpcshell.ini rename to devtools/client/inspector/compatibility/test/unit/xpcshell.ini diff --git a/devtools/client/inspector/grids/moz.build b/devtools/client/inspector/grids/moz.build index a788399edaf5..55d2d8c97f33 100644 --- a/devtools/client/inspector/grids/moz.build +++ b/devtools/client/inspector/grids/moz.build @@ -17,4 +17,4 @@ DevToolsModules( ) BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] diff --git a/devtools/client/inspector/grids/test/xpcshell/.eslintrc.js b/devtools/client/inspector/grids/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/inspector/grids/test/xpcshell/.eslintrc.js rename to devtools/client/inspector/grids/test/unit/.eslintrc.js diff --git a/devtools/client/inspector/grids/test/xpcshell/head.js b/devtools/client/inspector/grids/test/unit/head.js similarity index 100% rename from devtools/client/inspector/grids/test/xpcshell/head.js rename to devtools/client/inspector/grids/test/unit/head.js diff --git a/devtools/client/inspector/grids/test/xpcshell/test_compare_fragments_geometry.js b/devtools/client/inspector/grids/test/unit/test_compare_fragments_geometry.js similarity index 100% rename from devtools/client/inspector/grids/test/xpcshell/test_compare_fragments_geometry.js rename to devtools/client/inspector/grids/test/unit/test_compare_fragments_geometry.js diff --git a/devtools/client/inspector/grids/test/xpcshell/xpcshell.ini b/devtools/client/inspector/grids/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/inspector/grids/test/xpcshell/xpcshell.ini rename to devtools/client/inspector/grids/test/unit/xpcshell.ini diff --git a/devtools/client/memory/moz.build b/devtools/client/memory/moz.build index e53ca900ad6e..fb537c291d9b 100644 --- a/devtools/client/memory/moz.build +++ b/devtools/client/memory/moz.build @@ -25,5 +25,5 @@ DevToolsModules( ) BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] MOCHITEST_CHROME_MANIFESTS += ['test/chrome/chrome.ini'] diff --git a/devtools/client/memory/test/xpcshell/.eslintrc.js b/devtools/client/memory/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/memory/test/xpcshell/.eslintrc.js rename to devtools/client/memory/test/unit/.eslintrc.js diff --git a/devtools/client/memory/test/xpcshell/head.js b/devtools/client/memory/test/unit/head.js similarity index 100% rename from devtools/client/memory/test/xpcshell/head.js rename to devtools/client/memory/test/unit/head.js diff --git a/devtools/client/memory/test/xpcshell/test_action-clear-snapshots_01.js b/devtools/client/memory/test/unit/test_action-clear-snapshots_01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-clear-snapshots_01.js rename to devtools/client/memory/test/unit/test_action-clear-snapshots_01.js diff --git a/devtools/client/memory/test/xpcshell/test_action-clear-snapshots_02.js b/devtools/client/memory/test/unit/test_action-clear-snapshots_02.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-clear-snapshots_02.js rename to devtools/client/memory/test/unit/test_action-clear-snapshots_02.js diff --git a/devtools/client/memory/test/xpcshell/test_action-clear-snapshots_03.js b/devtools/client/memory/test/unit/test_action-clear-snapshots_03.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-clear-snapshots_03.js rename to devtools/client/memory/test/unit/test_action-clear-snapshots_03.js diff --git a/devtools/client/memory/test/xpcshell/test_action-clear-snapshots_04.js b/devtools/client/memory/test/unit/test_action-clear-snapshots_04.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-clear-snapshots_04.js rename to devtools/client/memory/test/unit/test_action-clear-snapshots_04.js diff --git a/devtools/client/memory/test/xpcshell/test_action-clear-snapshots_05.js b/devtools/client/memory/test/unit/test_action-clear-snapshots_05.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-clear-snapshots_05.js rename to devtools/client/memory/test/unit/test_action-clear-snapshots_05.js diff --git a/devtools/client/memory/test/xpcshell/test_action-clear-snapshots_06.js b/devtools/client/memory/test/unit/test_action-clear-snapshots_06.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-clear-snapshots_06.js rename to devtools/client/memory/test/unit/test_action-clear-snapshots_06.js diff --git a/devtools/client/memory/test/xpcshell/test_action-export-snapshot.js b/devtools/client/memory/test/unit/test_action-export-snapshot.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-export-snapshot.js rename to devtools/client/memory/test/unit/test_action-export-snapshot.js diff --git a/devtools/client/memory/test/xpcshell/test_action-filter-01.js b/devtools/client/memory/test/unit/test_action-filter-01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-filter-01.js rename to devtools/client/memory/test/unit/test_action-filter-01.js diff --git a/devtools/client/memory/test/xpcshell/test_action-filter-02.js b/devtools/client/memory/test/unit/test_action-filter-02.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-filter-02.js rename to devtools/client/memory/test/unit/test_action-filter-02.js diff --git a/devtools/client/memory/test/xpcshell/test_action-filter-03.js b/devtools/client/memory/test/unit/test_action-filter-03.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-filter-03.js rename to devtools/client/memory/test/unit/test_action-filter-03.js diff --git a/devtools/client/memory/test/xpcshell/test_action-import-snapshot-and-census.js b/devtools/client/memory/test/unit/test_action-import-snapshot-and-census.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-import-snapshot-and-census.js rename to devtools/client/memory/test/unit/test_action-import-snapshot-and-census.js diff --git a/devtools/client/memory/test/xpcshell/test_action-import-snapshot-dominator-tree.js b/devtools/client/memory/test/unit/test_action-import-snapshot-dominator-tree.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-import-snapshot-dominator-tree.js rename to devtools/client/memory/test/unit/test_action-import-snapshot-dominator-tree.js diff --git a/devtools/client/memory/test/xpcshell/test_action-select-snapshot.js b/devtools/client/memory/test/unit/test_action-select-snapshot.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-select-snapshot.js rename to devtools/client/memory/test/unit/test_action-select-snapshot.js diff --git a/devtools/client/memory/test/xpcshell/test_action-set-display-and-refresh-01.js b/devtools/client/memory/test/unit/test_action-set-display-and-refresh-01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-set-display-and-refresh-01.js rename to devtools/client/memory/test/unit/test_action-set-display-and-refresh-01.js diff --git a/devtools/client/memory/test/xpcshell/test_action-set-display-and-refresh-02.js b/devtools/client/memory/test/unit/test_action-set-display-and-refresh-02.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-set-display-and-refresh-02.js rename to devtools/client/memory/test/unit/test_action-set-display-and-refresh-02.js diff --git a/devtools/client/memory/test/xpcshell/test_action-set-display.js b/devtools/client/memory/test/unit/test_action-set-display.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-set-display.js rename to devtools/client/memory/test/unit/test_action-set-display.js diff --git a/devtools/client/memory/test/xpcshell/test_action-take-census.js b/devtools/client/memory/test/unit/test_action-take-census.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-take-census.js rename to devtools/client/memory/test/unit/test_action-take-census.js diff --git a/devtools/client/memory/test/xpcshell/test_action-take-snapshot-and-census.js b/devtools/client/memory/test/unit/test_action-take-snapshot-and-census.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-take-snapshot-and-census.js rename to devtools/client/memory/test/unit/test_action-take-snapshot-and-census.js diff --git a/devtools/client/memory/test/xpcshell/test_action-take-snapshot.js b/devtools/client/memory/test/unit/test_action-take-snapshot.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-take-snapshot.js rename to devtools/client/memory/test/unit/test_action-take-snapshot.js diff --git a/devtools/client/memory/test/xpcshell/test_action-toggle-inverted-and-refresh-01.js b/devtools/client/memory/test/unit/test_action-toggle-inverted-and-refresh-01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-toggle-inverted-and-refresh-01.js rename to devtools/client/memory/test/unit/test_action-toggle-inverted-and-refresh-01.js diff --git a/devtools/client/memory/test/xpcshell/test_action-toggle-inverted-and-refresh-02.js b/devtools/client/memory/test/unit/test_action-toggle-inverted-and-refresh-02.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-toggle-inverted-and-refresh-02.js rename to devtools/client/memory/test/unit/test_action-toggle-inverted-and-refresh-02.js diff --git a/devtools/client/memory/test/xpcshell/test_action-toggle-inverted.js b/devtools/client/memory/test/unit/test_action-toggle-inverted.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-toggle-inverted.js rename to devtools/client/memory/test/unit/test_action-toggle-inverted.js diff --git a/devtools/client/memory/test/xpcshell/test_action-toggle-recording-allocations.js b/devtools/client/memory/test/unit/test_action-toggle-recording-allocations.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action-toggle-recording-allocations.js rename to devtools/client/memory/test/unit/test_action-toggle-recording-allocations.js diff --git a/devtools/client/memory/test/xpcshell/test_action_diffing_01.js b/devtools/client/memory/test/unit/test_action_diffing_01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action_diffing_01.js rename to devtools/client/memory/test/unit/test_action_diffing_01.js diff --git a/devtools/client/memory/test/xpcshell/test_action_diffing_02.js b/devtools/client/memory/test/unit/test_action_diffing_02.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action_diffing_02.js rename to devtools/client/memory/test/unit/test_action_diffing_02.js diff --git a/devtools/client/memory/test/xpcshell/test_action_diffing_03.js b/devtools/client/memory/test/unit/test_action_diffing_03.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action_diffing_03.js rename to devtools/client/memory/test/unit/test_action_diffing_03.js diff --git a/devtools/client/memory/test/xpcshell/test_action_diffing_04.js b/devtools/client/memory/test/unit/test_action_diffing_04.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action_diffing_04.js rename to devtools/client/memory/test/unit/test_action_diffing_04.js diff --git a/devtools/client/memory/test/xpcshell/test_action_diffing_05.js b/devtools/client/memory/test/unit/test_action_diffing_05.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_action_diffing_05.js rename to devtools/client/memory/test/unit/test_action_diffing_05.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_01.js b/devtools/client/memory/test/unit/test_dominator_trees_01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_01.js rename to devtools/client/memory/test/unit/test_dominator_trees_01.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_02.js b/devtools/client/memory/test/unit/test_dominator_trees_02.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_02.js rename to devtools/client/memory/test/unit/test_dominator_trees_02.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_03.js b/devtools/client/memory/test/unit/test_dominator_trees_03.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_03.js rename to devtools/client/memory/test/unit/test_dominator_trees_03.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_04.js b/devtools/client/memory/test/unit/test_dominator_trees_04.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_04.js rename to devtools/client/memory/test/unit/test_dominator_trees_04.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_05.js b/devtools/client/memory/test/unit/test_dominator_trees_05.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_05.js rename to devtools/client/memory/test/unit/test_dominator_trees_05.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_06.js b/devtools/client/memory/test/unit/test_dominator_trees_06.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_06.js rename to devtools/client/memory/test/unit/test_dominator_trees_06.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_07.js b/devtools/client/memory/test/unit/test_dominator_trees_07.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_07.js rename to devtools/client/memory/test/unit/test_dominator_trees_07.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_08.js b/devtools/client/memory/test/unit/test_dominator_trees_08.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_08.js rename to devtools/client/memory/test/unit/test_dominator_trees_08.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_09.js b/devtools/client/memory/test/unit/test_dominator_trees_09.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_09.js rename to devtools/client/memory/test/unit/test_dominator_trees_09.js diff --git a/devtools/client/memory/test/xpcshell/test_dominator_trees_10.js b/devtools/client/memory/test/unit/test_dominator_trees_10.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_dominator_trees_10.js rename to devtools/client/memory/test/unit/test_dominator_trees_10.js diff --git a/devtools/client/memory/test/xpcshell/test_individuals_01.js b/devtools/client/memory/test/unit/test_individuals_01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_individuals_01.js rename to devtools/client/memory/test/unit/test_individuals_01.js diff --git a/devtools/client/memory/test/xpcshell/test_individuals_02.js b/devtools/client/memory/test/unit/test_individuals_02.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_individuals_02.js rename to devtools/client/memory/test/unit/test_individuals_02.js diff --git a/devtools/client/memory/test/xpcshell/test_individuals_03.js b/devtools/client/memory/test/unit/test_individuals_03.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_individuals_03.js rename to devtools/client/memory/test/unit/test_individuals_03.js diff --git a/devtools/client/memory/test/xpcshell/test_individuals_04.js b/devtools/client/memory/test/unit/test_individuals_04.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_individuals_04.js rename to devtools/client/memory/test/unit/test_individuals_04.js diff --git a/devtools/client/memory/test/xpcshell/test_individuals_05.js b/devtools/client/memory/test/unit/test_individuals_05.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_individuals_05.js rename to devtools/client/memory/test/unit/test_individuals_05.js diff --git a/devtools/client/memory/test/xpcshell/test_individuals_06.js b/devtools/client/memory/test/unit/test_individuals_06.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_individuals_06.js rename to devtools/client/memory/test/unit/test_individuals_06.js diff --git a/devtools/client/memory/test/xpcshell/test_pop_view_01.js b/devtools/client/memory/test/unit/test_pop_view_01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_pop_view_01.js rename to devtools/client/memory/test/unit/test_pop_view_01.js diff --git a/devtools/client/memory/test/xpcshell/test_tree-map-01.js b/devtools/client/memory/test/unit/test_tree-map-01.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_tree-map-01.js rename to devtools/client/memory/test/unit/test_tree-map-01.js diff --git a/devtools/client/memory/test/xpcshell/test_tree-map-02.js b/devtools/client/memory/test/unit/test_tree-map-02.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_tree-map-02.js rename to devtools/client/memory/test/unit/test_tree-map-02.js diff --git a/devtools/client/memory/test/xpcshell/test_utils-get-snapshot-totals.js b/devtools/client/memory/test/unit/test_utils-get-snapshot-totals.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_utils-get-snapshot-totals.js rename to devtools/client/memory/test/unit/test_utils-get-snapshot-totals.js diff --git a/devtools/client/memory/test/xpcshell/test_utils.js b/devtools/client/memory/test/unit/test_utils.js similarity index 100% rename from devtools/client/memory/test/xpcshell/test_utils.js rename to devtools/client/memory/test/unit/test_utils.js diff --git a/devtools/client/memory/test/xpcshell/xpcshell.ini b/devtools/client/memory/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/memory/test/xpcshell/xpcshell.ini rename to devtools/client/memory/test/unit/xpcshell.ini diff --git a/devtools/client/netmonitor/moz.build b/devtools/client/netmonitor/moz.build index c5fbdf014a00..995c5e7e2520 100644 --- a/devtools/client/netmonitor/moz.build +++ b/devtools/client/netmonitor/moz.build @@ -11,7 +11,7 @@ DevToolsModules( 'panel.js' ) -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] diff --git a/devtools/client/netmonitor/test/xpcshell/.eslintrc.js b/devtools/client/netmonitor/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/netmonitor/test/xpcshell/.eslintrc.js rename to devtools/client/netmonitor/test/unit/.eslintrc.js diff --git a/devtools/client/netmonitor/test/xpcshell/test_mdn-utils.js b/devtools/client/netmonitor/test/unit/test_mdn-utils.js similarity index 100% rename from devtools/client/netmonitor/test/xpcshell/test_mdn-utils.js rename to devtools/client/netmonitor/test/unit/test_mdn-utils.js diff --git a/devtools/client/netmonitor/test/xpcshell/test_request-utils-js-getFormattedProtocol.js b/devtools/client/netmonitor/test/unit/test_request-utils-js-getFormattedProtocol.js similarity index 100% rename from devtools/client/netmonitor/test/xpcshell/test_request-utils-js-getFormattedProtocol.js rename to devtools/client/netmonitor/test/unit/test_request-utils-js-getFormattedProtocol.js diff --git a/devtools/client/netmonitor/test/xpcshell/xpcshell.ini b/devtools/client/netmonitor/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/netmonitor/test/xpcshell/xpcshell.ini rename to devtools/client/netmonitor/test/unit/xpcshell.ini diff --git a/devtools/client/performance/moz.build b/devtools/client/performance/moz.build index 109e73d642ae..928f2ba7ea36 100644 --- a/devtools/client/performance/moz.build +++ b/devtools/client/performance/moz.build @@ -19,7 +19,7 @@ DevToolsModules( ) BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] with Files('**'): BUG_COMPONENT = ('DevTools', 'Performance Tools (Profiler/Timeline)') diff --git a/devtools/client/performance/test/xpcshell/.eslintrc.js b/devtools/client/performance/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/performance/test/xpcshell/.eslintrc.js rename to devtools/client/performance/test/unit/.eslintrc.js diff --git a/devtools/client/performance/test/xpcshell/head.js b/devtools/client/performance/test/unit/head.js similarity index 100% rename from devtools/client/performance/test/xpcshell/head.js rename to devtools/client/performance/test/unit/head.js diff --git a/devtools/client/performance/test/xpcshell/test_frame-utils-01.js b/devtools/client/performance/test/unit/test_frame-utils-01.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_frame-utils-01.js rename to devtools/client/performance/test/unit/test_frame-utils-01.js diff --git a/devtools/client/performance/test/xpcshell/test_frame-utils-02.js b/devtools/client/performance/test/unit/test_frame-utils-02.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_frame-utils-02.js rename to devtools/client/performance/test/unit/test_frame-utils-02.js diff --git a/devtools/client/performance/test/xpcshell/test_jit-graph-data.js b/devtools/client/performance/test/unit/test_jit-graph-data.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_jit-graph-data.js rename to devtools/client/performance/test/unit/test_jit-graph-data.js diff --git a/devtools/client/performance/test/xpcshell/test_jit-model-01.js b/devtools/client/performance/test/unit/test_jit-model-01.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_jit-model-01.js rename to devtools/client/performance/test/unit/test_jit-model-01.js diff --git a/devtools/client/performance/test/xpcshell/test_jit-model-02.js b/devtools/client/performance/test/unit/test_jit-model-02.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_jit-model-02.js rename to devtools/client/performance/test/unit/test_jit-model-02.js diff --git a/devtools/client/performance/test/xpcshell/test_marker-blueprint.js b/devtools/client/performance/test/unit/test_marker-blueprint.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_marker-blueprint.js rename to devtools/client/performance/test/unit/test_marker-blueprint.js diff --git a/devtools/client/performance/test/xpcshell/test_marker-utils.js b/devtools/client/performance/test/unit/test_marker-utils.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_marker-utils.js rename to devtools/client/performance/test/unit/test_marker-utils.js diff --git a/devtools/client/performance/test/xpcshell/test_perf-utils-allocations-to-samples.js b/devtools/client/performance/test/unit/test_perf-utils-allocations-to-samples.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_perf-utils-allocations-to-samples.js rename to devtools/client/performance/test/unit/test_perf-utils-allocations-to-samples.js diff --git a/devtools/client/performance/test/xpcshell/test_profiler-categories.js b/devtools/client/performance/test/unit/test_profiler-categories.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_profiler-categories.js rename to devtools/client/performance/test/unit/test_profiler-categories.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-01.js b/devtools/client/performance/test/unit/test_tree-model-01.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-01.js rename to devtools/client/performance/test/unit/test_tree-model-01.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-02.js b/devtools/client/performance/test/unit/test_tree-model-02.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-02.js rename to devtools/client/performance/test/unit/test_tree-model-02.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-03.js b/devtools/client/performance/test/unit/test_tree-model-03.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-03.js rename to devtools/client/performance/test/unit/test_tree-model-03.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-04.js b/devtools/client/performance/test/unit/test_tree-model-04.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-04.js rename to devtools/client/performance/test/unit/test_tree-model-04.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-05.js b/devtools/client/performance/test/unit/test_tree-model-05.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-05.js rename to devtools/client/performance/test/unit/test_tree-model-05.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-06.js b/devtools/client/performance/test/unit/test_tree-model-06.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-06.js rename to devtools/client/performance/test/unit/test_tree-model-06.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-07.js b/devtools/client/performance/test/unit/test_tree-model-07.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-07.js rename to devtools/client/performance/test/unit/test_tree-model-07.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-08.js b/devtools/client/performance/test/unit/test_tree-model-08.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-08.js rename to devtools/client/performance/test/unit/test_tree-model-08.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-09.js b/devtools/client/performance/test/unit/test_tree-model-09.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-09.js rename to devtools/client/performance/test/unit/test_tree-model-09.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-10.js b/devtools/client/performance/test/unit/test_tree-model-10.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-10.js rename to devtools/client/performance/test/unit/test_tree-model-10.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-11.js b/devtools/client/performance/test/unit/test_tree-model-11.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-11.js rename to devtools/client/performance/test/unit/test_tree-model-11.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-12.js b/devtools/client/performance/test/unit/test_tree-model-12.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-12.js rename to devtools/client/performance/test/unit/test_tree-model-12.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-13.js b/devtools/client/performance/test/unit/test_tree-model-13.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-13.js rename to devtools/client/performance/test/unit/test_tree-model-13.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-allocations-01.js b/devtools/client/performance/test/unit/test_tree-model-allocations-01.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-allocations-01.js rename to devtools/client/performance/test/unit/test_tree-model-allocations-01.js diff --git a/devtools/client/performance/test/xpcshell/test_tree-model-allocations-02.js b/devtools/client/performance/test/unit/test_tree-model-allocations-02.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_tree-model-allocations-02.js rename to devtools/client/performance/test/unit/test_tree-model-allocations-02.js diff --git a/devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-01.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-01.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-01.js rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-01.js diff --git a/devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-02.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-02.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-02.js rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-02.js diff --git a/devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-03.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-03.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-03.js rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-03.js diff --git a/devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-04.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-04.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-04.js rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-04.js diff --git a/devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-05.js b/devtools/client/performance/test/unit/test_waterfall-utils-collapse-05.js similarity index 100% rename from devtools/client/performance/test/xpcshell/test_waterfall-utils-collapse-05.js rename to devtools/client/performance/test/unit/test_waterfall-utils-collapse-05.js diff --git a/devtools/client/performance/test/xpcshell/xpcshell.ini b/devtools/client/performance/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/performance/test/xpcshell/xpcshell.ini rename to devtools/client/performance/test/unit/xpcshell.ini diff --git a/devtools/client/responsive/moz.build b/devtools/client/responsive/moz.build index 2ef23a95343d..4457e2b49939 100644 --- a/devtools/client/responsive/moz.build +++ b/devtools/client/responsive/moz.build @@ -25,7 +25,7 @@ DevToolsModules( 'ui.js', ) -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] with Files('**'): diff --git a/devtools/client/responsive/test/xpcshell/.eslintrc.js b/devtools/client/responsive/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/.eslintrc.js rename to devtools/client/responsive/test/unit/.eslintrc.js diff --git a/devtools/client/responsive/test/xpcshell/head.js b/devtools/client/responsive/test/unit/head.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/head.js rename to devtools/client/responsive/test/unit/head.js diff --git a/devtools/client/responsive/test/xpcshell/test_add_device.js b/devtools/client/responsive/test/unit/test_add_device.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_add_device.js rename to devtools/client/responsive/test/unit/test_add_device.js diff --git a/devtools/client/responsive/test/xpcshell/test_add_device_type.js b/devtools/client/responsive/test/unit/test_add_device_type.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_add_device_type.js rename to devtools/client/responsive/test/unit/test_add_device_type.js diff --git a/devtools/client/responsive/test/xpcshell/test_add_viewport.js b/devtools/client/responsive/test/unit/test_add_viewport.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_add_viewport.js rename to devtools/client/responsive/test/unit/test_add_viewport.js diff --git a/devtools/client/responsive/test/xpcshell/test_change_device.js b/devtools/client/responsive/test/unit/test_change_device.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_change_device.js rename to devtools/client/responsive/test/unit/test_change_device.js diff --git a/devtools/client/responsive/test/xpcshell/test_change_display_pixel_ratio.js b/devtools/client/responsive/test/unit/test_change_display_pixel_ratio.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_change_display_pixel_ratio.js rename to devtools/client/responsive/test/unit/test_change_display_pixel_ratio.js diff --git a/devtools/client/responsive/test/xpcshell/test_change_network_throttling.js b/devtools/client/responsive/test/unit/test_change_network_throttling.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_change_network_throttling.js rename to devtools/client/responsive/test/unit/test_change_network_throttling.js diff --git a/devtools/client/responsive/test/xpcshell/test_change_pixel_ratio.js b/devtools/client/responsive/test/unit/test_change_pixel_ratio.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_change_pixel_ratio.js rename to devtools/client/responsive/test/unit/test_change_pixel_ratio.js diff --git a/devtools/client/responsive/test/xpcshell/test_change_user_agent.js b/devtools/client/responsive/test/unit/test_change_user_agent.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_change_user_agent.js rename to devtools/client/responsive/test/unit/test_change_user_agent.js diff --git a/devtools/client/responsive/test/xpcshell/test_resize_viewport.js b/devtools/client/responsive/test/unit/test_resize_viewport.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_resize_viewport.js rename to devtools/client/responsive/test/unit/test_resize_viewport.js diff --git a/devtools/client/responsive/test/xpcshell/test_rotate_viewport.js b/devtools/client/responsive/test/unit/test_rotate_viewport.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_rotate_viewport.js rename to devtools/client/responsive/test/unit/test_rotate_viewport.js diff --git a/devtools/client/responsive/test/xpcshell/test_ua_parser.js b/devtools/client/responsive/test/unit/test_ua_parser.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_ua_parser.js rename to devtools/client/responsive/test/unit/test_ua_parser.js diff --git a/devtools/client/responsive/test/xpcshell/test_update_device_displayed.js b/devtools/client/responsive/test/unit/test_update_device_displayed.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_update_device_displayed.js rename to devtools/client/responsive/test/unit/test_update_device_displayed.js diff --git a/devtools/client/responsive/test/xpcshell/test_update_touch_simulation_enabled.js b/devtools/client/responsive/test/unit/test_update_touch_simulation_enabled.js similarity index 100% rename from devtools/client/responsive/test/xpcshell/test_update_touch_simulation_enabled.js rename to devtools/client/responsive/test/unit/test_update_touch_simulation_enabled.js diff --git a/devtools/client/responsive/test/xpcshell/xpcshell.ini b/devtools/client/responsive/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/responsive/test/xpcshell/xpcshell.ini rename to devtools/client/responsive/test/unit/xpcshell.ini diff --git a/devtools/client/shared/moz.build b/devtools/client/shared/moz.build index a75abfe05d40..0d30193d091b 100644 --- a/devtools/client/shared/moz.build +++ b/devtools/client/shared/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] TEST_HARNESS_FILES.xpcshell.devtools.client.shared.test += [ 'test/shared-redux-head.js', ] diff --git a/devtools/client/shared/redux/middleware/moz.build b/devtools/client/shared/redux/middleware/moz.build index 79a2aac477bd..4180e722020c 100644 --- a/devtools/client/shared/redux/middleware/moz.build +++ b/devtools/client/shared/redux/middleware/moz.build @@ -16,4 +16,4 @@ DevToolsModules( 'wait-service.js', ) -XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini'] diff --git a/devtools/client/shared/redux/middleware/xpcshell/.eslintrc.js b/devtools/client/shared/redux/middleware/test/.eslintrc.js similarity index 100% rename from devtools/client/shared/redux/middleware/xpcshell/.eslintrc.js rename to devtools/client/shared/redux/middleware/test/.eslintrc.js diff --git a/devtools/client/shared/redux/middleware/xpcshell/head.js b/devtools/client/shared/redux/middleware/test/head.js similarity index 100% rename from devtools/client/shared/redux/middleware/xpcshell/head.js rename to devtools/client/shared/redux/middleware/test/head.js diff --git a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-01.js b/devtools/client/shared/redux/middleware/test/test_middleware-task-01.js similarity index 100% rename from devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-01.js rename to devtools/client/shared/redux/middleware/test/test_middleware-task-01.js diff --git a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-02.js b/devtools/client/shared/redux/middleware/test/test_middleware-task-02.js similarity index 100% rename from devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-02.js rename to devtools/client/shared/redux/middleware/test/test_middleware-task-02.js diff --git a/devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-03.js b/devtools/client/shared/redux/middleware/test/test_middleware-task-03.js similarity index 100% rename from devtools/client/shared/redux/middleware/xpcshell/test_middleware-task-03.js rename to devtools/client/shared/redux/middleware/test/test_middleware-task-03.js diff --git a/devtools/client/shared/redux/middleware/xpcshell/xpcshell.ini b/devtools/client/shared/redux/middleware/test/xpcshell.ini similarity index 100% rename from devtools/client/shared/redux/middleware/xpcshell/xpcshell.ini rename to devtools/client/shared/redux/middleware/test/xpcshell.ini diff --git a/devtools/client/shared/remote-debugging/moz.build b/devtools/client/shared/remote-debugging/moz.build index 7be3138191f6..fd5caa1008dd 100644 --- a/devtools/client/shared/remote-debugging/moz.build +++ b/devtools/client/shared/remote-debugging/moz.build @@ -11,7 +11,7 @@ DevToolsModules( ) XPCSHELL_TESTS_MANIFESTS += [ - 'test/xpcshell/xpcshell.ini' + 'test/unit/xpcshell.ini' ] with Files('**'): diff --git a/devtools/client/shared/remote-debugging/test/xpcshell/.eslintrc.js b/devtools/client/shared/remote-debugging/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/shared/remote-debugging/test/xpcshell/.eslintrc.js rename to devtools/client/shared/remote-debugging/test/unit/.eslintrc.js diff --git a/devtools/client/shared/remote-debugging/test/xpcshell/test_remote_client_manager.js b/devtools/client/shared/remote-debugging/test/unit/test_remote_client_manager.js similarity index 100% rename from devtools/client/shared/remote-debugging/test/xpcshell/test_remote_client_manager.js rename to devtools/client/shared/remote-debugging/test/unit/test_remote_client_manager.js diff --git a/devtools/client/shared/remote-debugging/test/xpcshell/test_version_checker.js b/devtools/client/shared/remote-debugging/test/unit/test_version_checker.js similarity index 100% rename from devtools/client/shared/remote-debugging/test/xpcshell/test_version_checker.js rename to devtools/client/shared/remote-debugging/test/unit/test_version_checker.js diff --git a/devtools/client/shared/remote-debugging/test/xpcshell/xpcshell-head.js b/devtools/client/shared/remote-debugging/test/unit/xpcshell-head.js similarity index 100% rename from devtools/client/shared/remote-debugging/test/xpcshell/xpcshell-head.js rename to devtools/client/shared/remote-debugging/test/unit/xpcshell-head.js diff --git a/devtools/client/shared/remote-debugging/test/xpcshell/xpcshell.ini b/devtools/client/shared/remote-debugging/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/shared/remote-debugging/test/xpcshell/xpcshell.ini rename to devtools/client/shared/remote-debugging/test/unit/xpcshell.ini diff --git a/devtools/client/shared/test/xpcshell/.eslintrc.js b/devtools/client/shared/test/unit/.eslintrc.js similarity index 100% rename from devtools/client/shared/test/xpcshell/.eslintrc.js rename to devtools/client/shared/test/unit/.eslintrc.js diff --git a/devtools/client/shared/test/xpcshell/test_VariablesView_filtering-without-controller.js b/devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_VariablesView_filtering-without-controller.js rename to devtools/client/shared/test/unit/test_VariablesView_filtering-without-controller.js diff --git a/devtools/client/shared/test/xpcshell/test_VariablesView_getString_promise.js b/devtools/client/shared/test/unit/test_VariablesView_getString_promise.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_VariablesView_getString_promise.js rename to devtools/client/shared/test/unit/test_VariablesView_getString_promise.js diff --git a/devtools/client/shared/test/xpcshell/test_WeakMapMap.js b/devtools/client/shared/test/unit/test_WeakMapMap.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_WeakMapMap.js rename to devtools/client/shared/test/unit/test_WeakMapMap.js diff --git a/devtools/client/shared/test/xpcshell/test_advanceValidate.js b/devtools/client/shared/test/unit/test_advanceValidate.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_advanceValidate.js rename to devtools/client/shared/test/unit/test_advanceValidate.js diff --git a/devtools/client/shared/test/xpcshell/test_attribute-parsing-01.js b/devtools/client/shared/test/unit/test_attribute-parsing-01.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_attribute-parsing-01.js rename to devtools/client/shared/test/unit/test_attribute-parsing-01.js diff --git a/devtools/client/shared/test/xpcshell/test_attribute-parsing-02.js b/devtools/client/shared/test/unit/test_attribute-parsing-02.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_attribute-parsing-02.js rename to devtools/client/shared/test/unit/test_attribute-parsing-02.js diff --git a/devtools/client/shared/test/xpcshell/test_bezierCanvas.js b/devtools/client/shared/test/unit/test_bezierCanvas.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_bezierCanvas.js rename to devtools/client/shared/test/unit/test_bezierCanvas.js diff --git a/devtools/client/shared/test/xpcshell/test_cssAngle.js b/devtools/client/shared/test/unit/test_cssAngle.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_cssAngle.js rename to devtools/client/shared/test/unit/test_cssAngle.js diff --git a/devtools/client/shared/test/xpcshell/test_cssColor-01.js b/devtools/client/shared/test/unit/test_cssColor-01.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_cssColor-01.js rename to devtools/client/shared/test/unit/test_cssColor-01.js diff --git a/devtools/client/shared/test/xpcshell/test_cssColor-02.js b/devtools/client/shared/test/unit/test_cssColor-02.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_cssColor-02.js rename to devtools/client/shared/test/unit/test_cssColor-02.js diff --git a/devtools/client/shared/test/xpcshell/test_cssColor-03.js b/devtools/client/shared/test/unit/test_cssColor-03.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_cssColor-03.js rename to devtools/client/shared/test/unit/test_cssColor-03.js diff --git a/devtools/client/shared/test/xpcshell/test_cssColor-8-digit-hex.js b/devtools/client/shared/test/unit/test_cssColor-8-digit-hex.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_cssColor-8-digit-hex.js rename to devtools/client/shared/test/unit/test_cssColor-8-digit-hex.js diff --git a/devtools/client/shared/test/xpcshell/test_cssColorDatabase.js b/devtools/client/shared/test/unit/test_cssColorDatabase.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_cssColorDatabase.js rename to devtools/client/shared/test/unit/test_cssColorDatabase.js diff --git a/devtools/client/shared/test/xpcshell/test_cubicBezier.js b/devtools/client/shared/test/unit/test_cubicBezier.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_cubicBezier.js rename to devtools/client/shared/test/unit/test_cubicBezier.js diff --git a/devtools/client/shared/test/xpcshell/test_curl.js b/devtools/client/shared/test/unit/test_curl.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_curl.js rename to devtools/client/shared/test/unit/test_curl.js diff --git a/devtools/client/shared/test/xpcshell/test_escapeCSSComment.js b/devtools/client/shared/test/unit/test_escapeCSSComment.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_escapeCSSComment.js rename to devtools/client/shared/test/unit/test_escapeCSSComment.js diff --git a/devtools/client/shared/test/xpcshell/test_hasCSSVariable.js b/devtools/client/shared/test/unit/test_hasCSSVariable.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_hasCSSVariable.js rename to devtools/client/shared/test/unit/test_hasCSSVariable.js diff --git a/devtools/client/shared/test/xpcshell/test_parseDeclarations.js b/devtools/client/shared/test/unit/test_parseDeclarations.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_parseDeclarations.js rename to devtools/client/shared/test/unit/test_parseDeclarations.js diff --git a/devtools/client/shared/test/xpcshell/test_parsePseudoClassesAndAttributes.js b/devtools/client/shared/test/unit/test_parsePseudoClassesAndAttributes.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_parsePseudoClassesAndAttributes.js rename to devtools/client/shared/test/unit/test_parsePseudoClassesAndAttributes.js diff --git a/devtools/client/shared/test/xpcshell/test_parseSingleValue.js b/devtools/client/shared/test/unit/test_parseSingleValue.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_parseSingleValue.js rename to devtools/client/shared/test/unit/test_parseSingleValue.js diff --git a/devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js b/devtools/client/shared/test/unit/test_rewriteDeclarations.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_rewriteDeclarations.js rename to devtools/client/shared/test/unit/test_rewriteDeclarations.js diff --git a/devtools/client/shared/test/xpcshell/test_source-utils.js b/devtools/client/shared/test/unit/test_source-utils.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_source-utils.js rename to devtools/client/shared/test/unit/test_source-utils.js diff --git a/devtools/client/shared/test/xpcshell/test_suggestion-picker.js b/devtools/client/shared/test/unit/test_suggestion-picker.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_suggestion-picker.js rename to devtools/client/shared/test/unit/test_suggestion-picker.js diff --git a/devtools/client/shared/test/xpcshell/test_undoStack.js b/devtools/client/shared/test/unit/test_undoStack.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_undoStack.js rename to devtools/client/shared/test/unit/test_undoStack.js diff --git a/devtools/client/shared/test/xpcshell/test_unicode-url.js b/devtools/client/shared/test/unit/test_unicode-url.js similarity index 100% rename from devtools/client/shared/test/xpcshell/test_unicode-url.js rename to devtools/client/shared/test/unit/test_unicode-url.js diff --git a/devtools/client/shared/test/xpcshell/xpcshell.ini b/devtools/client/shared/test/unit/xpcshell.ini similarity index 100% rename from devtools/client/shared/test/xpcshell/xpcshell.ini rename to devtools/client/shared/test/unit/xpcshell.ini diff --git a/devtools/docs/tools/memory-panel.md b/devtools/docs/tools/memory-panel.md index 1c7833857e30..8c4749667b7a 100644 --- a/devtools/docs/tools/memory-panel.md +++ b/devtools/docs/tools/memory-panel.md @@ -218,7 +218,7 @@ are updated in the UI. Unit tests for React components are in `devtools/client/memory/test/chrome/*`. Unit tests for actions, reducers, and state changes are in -`devtools/client/memory/test/xpcshell/*`. +`devtools/client/memory/test/unit/*`. Holistic integration tests for the frontend and the whole memory tool are in `devtools/client/memory/test/browser/*`. diff --git a/devtools/platform/moz.build b/devtools/platform/moz.build index 8f54ec62b5ad..349f5554029c 100644 --- a/devtools/platform/moz.build +++ b/devtools/platform/moz.build @@ -4,7 +4,7 @@ # 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 += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] XPIDL_SOURCES += [ 'nsIJSInspector.idl', diff --git a/devtools/platform/tests/xpcshell/.eslintrc.js b/devtools/platform/tests/unit/.eslintrc.js similarity index 100% rename from devtools/platform/tests/xpcshell/.eslintrc.js rename to devtools/platform/tests/unit/.eslintrc.js diff --git a/devtools/platform/tests/xpcshell/test_nsjsinspector.js b/devtools/platform/tests/unit/test_nsjsinspector.js similarity index 100% rename from devtools/platform/tests/xpcshell/test_nsjsinspector.js rename to devtools/platform/tests/unit/test_nsjsinspector.js diff --git a/devtools/platform/tests/xpcshell/xpcshell.ini b/devtools/platform/tests/unit/xpcshell.ini similarity index 100% rename from devtools/platform/tests/xpcshell/xpcshell.ini rename to devtools/platform/tests/unit/xpcshell.ini diff --git a/devtools/server/moz.build b/devtools/server/moz.build index ba3a05599e5f..845d635ce5ac 100644 --- a/devtools/server/moz.build +++ b/devtools/server/moz.build @@ -18,7 +18,7 @@ if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini'] MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini'] -XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( 'debugger-server-connection.js', diff --git a/devtools/server/tests/xpcshell/.eslintrc.js b/devtools/server/tests/unit/.eslintrc.js similarity index 100% rename from devtools/server/tests/xpcshell/.eslintrc.js rename to devtools/server/tests/unit/.eslintrc.js diff --git a/devtools/server/tests/xpcshell/addons/web-extension-upgrade/manifest.json b/devtools/server/tests/unit/addons/web-extension-upgrade/manifest.json similarity index 100% rename from devtools/server/tests/xpcshell/addons/web-extension-upgrade/manifest.json rename to devtools/server/tests/unit/addons/web-extension-upgrade/manifest.json diff --git a/devtools/server/tests/xpcshell/addons/web-extension/manifest.json b/devtools/server/tests/unit/addons/web-extension/manifest.json similarity index 100% rename from devtools/server/tests/xpcshell/addons/web-extension/manifest.json rename to devtools/server/tests/unit/addons/web-extension/manifest.json diff --git a/devtools/server/tests/xpcshell/addons/web-extension2/manifest.json b/devtools/server/tests/unit/addons/web-extension2/manifest.json similarity index 100% rename from devtools/server/tests/xpcshell/addons/web-extension2/manifest.json rename to devtools/server/tests/unit/addons/web-extension2/manifest.json diff --git a/devtools/server/tests/xpcshell/completions.js b/devtools/server/tests/unit/completions.js similarity index 100% rename from devtools/server/tests/xpcshell/completions.js rename to devtools/server/tests/unit/completions.js diff --git a/devtools/server/tests/xpcshell/head_dbg.js b/devtools/server/tests/unit/head_dbg.js similarity index 100% rename from devtools/server/tests/xpcshell/head_dbg.js rename to devtools/server/tests/unit/head_dbg.js diff --git a/devtools/server/tests/xpcshell/hello-actor.js b/devtools/server/tests/unit/hello-actor.js similarity index 100% rename from devtools/server/tests/xpcshell/hello-actor.js rename to devtools/server/tests/unit/hello-actor.js diff --git a/devtools/server/tests/xpcshell/post_init_global_actors.js b/devtools/server/tests/unit/post_init_global_actors.js similarity index 100% rename from devtools/server/tests/xpcshell/post_init_global_actors.js rename to devtools/server/tests/unit/post_init_global_actors.js diff --git a/devtools/server/tests/xpcshell/post_init_target_scoped_actors.js b/devtools/server/tests/unit/post_init_target_scoped_actors.js similarity index 100% rename from devtools/server/tests/xpcshell/post_init_target_scoped_actors.js rename to devtools/server/tests/unit/post_init_target_scoped_actors.js diff --git a/devtools/server/tests/xpcshell/pre_init_global_actors.js b/devtools/server/tests/unit/pre_init_global_actors.js similarity index 100% rename from devtools/server/tests/xpcshell/pre_init_global_actors.js rename to devtools/server/tests/unit/pre_init_global_actors.js diff --git a/devtools/server/tests/xpcshell/pre_init_target_scoped_actors.js b/devtools/server/tests/unit/pre_init_target_scoped_actors.js similarity index 100% rename from devtools/server/tests/xpcshell/pre_init_target_scoped_actors.js rename to devtools/server/tests/unit/pre_init_target_scoped_actors.js diff --git a/devtools/server/tests/xpcshell/registertestactors-lazy.js b/devtools/server/tests/unit/registertestactors-lazy.js similarity index 100% rename from devtools/server/tests/xpcshell/registertestactors-lazy.js rename to devtools/server/tests/unit/registertestactors-lazy.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-column-in-gcd-script.js b/devtools/server/tests/unit/setBreakpoint-on-column-in-gcd-script.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-column-in-gcd-script.js rename to devtools/server/tests/unit/setBreakpoint-on-column-in-gcd-script.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-column-minified.js b/devtools/server/tests/unit/setBreakpoint-on-column-minified.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-column-minified.js rename to devtools/server/tests/unit/setBreakpoint-on-column-minified.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-column-with-no-offsets-in-gcd-script.js b/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-in-gcd-script.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-column-with-no-offsets-in-gcd-script.js rename to devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets-in-gcd-script.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-column-with-no-offsets.js b/devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-column-with-no-offsets.js rename to devtools/server/tests/unit/setBreakpoint-on-column-with-no-offsets.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-column.js b/devtools/server/tests/unit/setBreakpoint-on-column.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-column.js rename to devtools/server/tests/unit/setBreakpoint-on-column.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-line-in-gcd-script.js b/devtools/server/tests/unit/setBreakpoint-on-line-in-gcd-script.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-line-in-gcd-script.js rename to devtools/server/tests/unit/setBreakpoint-on-line-in-gcd-script.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-line-with-multiple-offsets.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-offsets.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-line-with-multiple-offsets.js rename to devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-offsets.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-line-with-multiple-statements.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-statements.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-line-with-multiple-statements.js rename to devtools/server/tests/unit/setBreakpoint-on-line-with-multiple-statements.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-line-with-no-offsets-in-gcd-script.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-in-gcd-script.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-line-with-no-offsets-in-gcd-script.js rename to devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets-in-gcd-script.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-line-with-no-offsets.js b/devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-line-with-no-offsets.js rename to devtools/server/tests/unit/setBreakpoint-on-line-with-no-offsets.js diff --git a/devtools/server/tests/xpcshell/setBreakpoint-on-line.js b/devtools/server/tests/unit/setBreakpoint-on-line.js similarity index 100% rename from devtools/server/tests/xpcshell/setBreakpoint-on-line.js rename to devtools/server/tests/unit/setBreakpoint-on-line.js diff --git a/devtools/server/tests/xpcshell/source-03.js b/devtools/server/tests/unit/source-03.js similarity index 100% rename from devtools/server/tests/xpcshell/source-03.js rename to devtools/server/tests/unit/source-03.js diff --git a/devtools/server/tests/xpcshell/source-map-data/sourcemapped.coffee b/devtools/server/tests/unit/source-map-data/sourcemapped.coffee similarity index 100% rename from devtools/server/tests/xpcshell/source-map-data/sourcemapped.coffee rename to devtools/server/tests/unit/source-map-data/sourcemapped.coffee diff --git a/devtools/server/tests/xpcshell/source-map-data/sourcemapped.map b/devtools/server/tests/unit/source-map-data/sourcemapped.map similarity index 100% rename from devtools/server/tests/xpcshell/source-map-data/sourcemapped.map rename to devtools/server/tests/unit/source-map-data/sourcemapped.map diff --git a/devtools/server/tests/xpcshell/sourcemapped.js b/devtools/server/tests/unit/sourcemapped.js similarity index 100% rename from devtools/server/tests/xpcshell/sourcemapped.js rename to devtools/server/tests/unit/sourcemapped.js diff --git a/devtools/server/tests/xpcshell/stepping.js b/devtools/server/tests/unit/stepping.js similarity index 100% rename from devtools/server/tests/xpcshell/stepping.js rename to devtools/server/tests/unit/stepping.js diff --git a/devtools/server/tests/xpcshell/test_MemoryActor_saveHeapSnapshot_01.js b/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_MemoryActor_saveHeapSnapshot_01.js rename to devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_01.js diff --git a/devtools/server/tests/xpcshell/test_MemoryActor_saveHeapSnapshot_02.js b/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_MemoryActor_saveHeapSnapshot_02.js rename to devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_02.js diff --git a/devtools/server/tests/xpcshell/test_MemoryActor_saveHeapSnapshot_03.js b/devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_MemoryActor_saveHeapSnapshot_03.js rename to devtools/server/tests/unit/test_MemoryActor_saveHeapSnapshot_03.js diff --git a/devtools/server/tests/xpcshell/test_actor-registry-actor.js b/devtools/server/tests/unit/test_actor-registry-actor.js similarity index 100% rename from devtools/server/tests/xpcshell/test_actor-registry-actor.js rename to devtools/server/tests/unit/test_actor-registry-actor.js diff --git a/devtools/server/tests/xpcshell/test_add_actors.js b/devtools/server/tests/unit/test_add_actors.js similarity index 100% rename from devtools/server/tests/xpcshell/test_add_actors.js rename to devtools/server/tests/unit/test_add_actors.js diff --git a/devtools/server/tests/xpcshell/test_addon_events.js b/devtools/server/tests/unit/test_addon_events.js similarity index 100% rename from devtools/server/tests/xpcshell/test_addon_events.js rename to devtools/server/tests/unit/test_addon_events.js diff --git a/devtools/server/tests/xpcshell/test_addon_reload.js b/devtools/server/tests/unit/test_addon_reload.js similarity index 100% rename from devtools/server/tests/xpcshell/test_addon_reload.js rename to devtools/server/tests/unit/test_addon_reload.js diff --git a/devtools/server/tests/xpcshell/test_addons_actor.js b/devtools/server/tests/unit/test_addons_actor.js similarity index 100% rename from devtools/server/tests/xpcshell/test_addons_actor.js rename to devtools/server/tests/unit/test_addons_actor.js diff --git a/devtools/server/tests/xpcshell/test_animation_name.js b/devtools/server/tests/unit/test_animation_name.js similarity index 100% rename from devtools/server/tests/xpcshell/test_animation_name.js rename to devtools/server/tests/unit/test_animation_name.js diff --git a/devtools/server/tests/xpcshell/test_animation_type.js b/devtools/server/tests/unit/test_animation_type.js similarity index 100% rename from devtools/server/tests/xpcshell/test_animation_type.js rename to devtools/server/tests/unit/test_animation_type.js diff --git a/devtools/server/tests/xpcshell/test_attach.js b/devtools/server/tests/unit/test_attach.js similarity index 100% rename from devtools/server/tests/xpcshell/test_attach.js rename to devtools/server/tests/unit/test_attach.js diff --git a/devtools/server/tests/xpcshell/test_blackboxing-01.js b/devtools/server/tests/unit/test_blackboxing-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_blackboxing-01.js rename to devtools/server/tests/unit/test_blackboxing-01.js diff --git a/devtools/server/tests/xpcshell/test_blackboxing-02.js b/devtools/server/tests/unit/test_blackboxing-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_blackboxing-02.js rename to devtools/server/tests/unit/test_blackboxing-02.js diff --git a/devtools/server/tests/xpcshell/test_blackboxing-03.js b/devtools/server/tests/unit/test_blackboxing-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_blackboxing-03.js rename to devtools/server/tests/unit/test_blackboxing-03.js diff --git a/devtools/server/tests/xpcshell/test_blackboxing-04.js b/devtools/server/tests/unit/test_blackboxing-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_blackboxing-04.js rename to devtools/server/tests/unit/test_blackboxing-04.js diff --git a/devtools/server/tests/xpcshell/test_blackboxing-05.js b/devtools/server/tests/unit/test_blackboxing-05.js similarity index 100% rename from devtools/server/tests/xpcshell/test_blackboxing-05.js rename to devtools/server/tests/unit/test_blackboxing-05.js diff --git a/devtools/server/tests/xpcshell/test_blackboxing-07.js b/devtools/server/tests/unit/test_blackboxing-07.js similarity index 100% rename from devtools/server/tests/xpcshell/test_blackboxing-07.js rename to devtools/server/tests/unit/test_blackboxing-07.js diff --git a/devtools/server/tests/xpcshell/test_blackboxing-08.js b/devtools/server/tests/unit/test_blackboxing-08.js similarity index 100% rename from devtools/server/tests/xpcshell/test_blackboxing-08.js rename to devtools/server/tests/unit/test_blackboxing-08.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-01.js b/devtools/server/tests/unit/test_breakpoint-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-01.js rename to devtools/server/tests/unit/test_breakpoint-01.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-02.js b/devtools/server/tests/unit/test_breakpoint-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-02.js rename to devtools/server/tests/unit/test_breakpoint-02.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-03.js b/devtools/server/tests/unit/test_breakpoint-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-03.js rename to devtools/server/tests/unit/test_breakpoint-03.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-04.js b/devtools/server/tests/unit/test_breakpoint-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-04.js rename to devtools/server/tests/unit/test_breakpoint-04.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-05.js b/devtools/server/tests/unit/test_breakpoint-05.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-05.js rename to devtools/server/tests/unit/test_breakpoint-05.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-06.js b/devtools/server/tests/unit/test_breakpoint-06.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-06.js rename to devtools/server/tests/unit/test_breakpoint-06.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-07.js b/devtools/server/tests/unit/test_breakpoint-07.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-07.js rename to devtools/server/tests/unit/test_breakpoint-07.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-08.js b/devtools/server/tests/unit/test_breakpoint-08.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-08.js rename to devtools/server/tests/unit/test_breakpoint-08.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-09.js b/devtools/server/tests/unit/test_breakpoint-09.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-09.js rename to devtools/server/tests/unit/test_breakpoint-09.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-10.js b/devtools/server/tests/unit/test_breakpoint-10.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-10.js rename to devtools/server/tests/unit/test_breakpoint-10.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-11.js b/devtools/server/tests/unit/test_breakpoint-11.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-11.js rename to devtools/server/tests/unit/test_breakpoint-11.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-12.js b/devtools/server/tests/unit/test_breakpoint-12.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-12.js rename to devtools/server/tests/unit/test_breakpoint-12.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-13.js b/devtools/server/tests/unit/test_breakpoint-13.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-13.js rename to devtools/server/tests/unit/test_breakpoint-13.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-14.js b/devtools/server/tests/unit/test_breakpoint-14.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-14.js rename to devtools/server/tests/unit/test_breakpoint-14.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-16.js b/devtools/server/tests/unit/test_breakpoint-16.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-16.js rename to devtools/server/tests/unit/test_breakpoint-16.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-17.js b/devtools/server/tests/unit/test_breakpoint-17.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-17.js rename to devtools/server/tests/unit/test_breakpoint-17.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-18.js b/devtools/server/tests/unit/test_breakpoint-18.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-18.js rename to devtools/server/tests/unit/test_breakpoint-18.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-19.js b/devtools/server/tests/unit/test_breakpoint-19.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-19.js rename to devtools/server/tests/unit/test_breakpoint-19.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-20.js b/devtools/server/tests/unit/test_breakpoint-20.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-20.js rename to devtools/server/tests/unit/test_breakpoint-20.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-21.js b/devtools/server/tests/unit/test_breakpoint-21.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-21.js rename to devtools/server/tests/unit/test_breakpoint-21.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-22.js b/devtools/server/tests/unit/test_breakpoint-22.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-22.js rename to devtools/server/tests/unit/test_breakpoint-22.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-23.js b/devtools/server/tests/unit/test_breakpoint-23.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-23.js rename to devtools/server/tests/unit/test_breakpoint-23.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-24.js b/devtools/server/tests/unit/test_breakpoint-24.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-24.js rename to devtools/server/tests/unit/test_breakpoint-24.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-25.js b/devtools/server/tests/unit/test_breakpoint-25.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-25.js rename to devtools/server/tests/unit/test_breakpoint-25.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-26.js b/devtools/server/tests/unit/test_breakpoint-26.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-26.js rename to devtools/server/tests/unit/test_breakpoint-26.js diff --git a/devtools/server/tests/xpcshell/test_breakpoint-actor-map.js b/devtools/server/tests/unit/test_breakpoint-actor-map.js similarity index 100% rename from devtools/server/tests/xpcshell/test_breakpoint-actor-map.js rename to devtools/server/tests/unit/test_breakpoint-actor-map.js diff --git a/devtools/server/tests/xpcshell/test_client_request.js b/devtools/server/tests/unit/test_client_request.js similarity index 100% rename from devtools/server/tests/xpcshell/test_client_request.js rename to devtools/server/tests/unit/test_client_request.js diff --git a/devtools/server/tests/xpcshell/test_conditional_breakpoint-01.js b/devtools/server/tests/unit/test_conditional_breakpoint-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_conditional_breakpoint-01.js rename to devtools/server/tests/unit/test_conditional_breakpoint-01.js diff --git a/devtools/server/tests/xpcshell/test_conditional_breakpoint-02.js b/devtools/server/tests/unit/test_conditional_breakpoint-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_conditional_breakpoint-02.js rename to devtools/server/tests/unit/test_conditional_breakpoint-02.js diff --git a/devtools/server/tests/xpcshell/test_conditional_breakpoint-03.js b/devtools/server/tests/unit/test_conditional_breakpoint-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_conditional_breakpoint-03.js rename to devtools/server/tests/unit/test_conditional_breakpoint-03.js diff --git a/devtools/server/tests/xpcshell/test_conditional_breakpoint-04.js b/devtools/server/tests/unit/test_conditional_breakpoint-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_conditional_breakpoint-04.js rename to devtools/server/tests/unit/test_conditional_breakpoint-04.js diff --git a/devtools/server/tests/xpcshell/test_dbgactor.js b/devtools/server/tests/unit/test_dbgactor.js similarity index 100% rename from devtools/server/tests/xpcshell/test_dbgactor.js rename to devtools/server/tests/unit/test_dbgactor.js diff --git a/devtools/server/tests/xpcshell/test_dbgclient_debuggerstatement.js b/devtools/server/tests/unit/test_dbgclient_debuggerstatement.js similarity index 100% rename from devtools/server/tests/xpcshell/test_dbgclient_debuggerstatement.js rename to devtools/server/tests/unit/test_dbgclient_debuggerstatement.js diff --git a/devtools/server/tests/xpcshell/test_dbgglobal.js b/devtools/server/tests/unit/test_dbgglobal.js similarity index 100% rename from devtools/server/tests/xpcshell/test_dbgglobal.js rename to devtools/server/tests/unit/test_dbgglobal.js diff --git a/devtools/server/tests/xpcshell/test_extension_storage_actor.js b/devtools/server/tests/unit/test_extension_storage_actor.js similarity index 100% rename from devtools/server/tests/xpcshell/test_extension_storage_actor.js rename to devtools/server/tests/unit/test_extension_storage_actor.js diff --git a/devtools/server/tests/xpcshell/test_format_command.js b/devtools/server/tests/unit/test_format_command.js similarity index 100% rename from devtools/server/tests/xpcshell/test_format_command.js rename to devtools/server/tests/unit/test_format_command.js diff --git a/devtools/server/tests/xpcshell/test_forwardingprefix.js b/devtools/server/tests/unit/test_forwardingprefix.js similarity index 100% rename from devtools/server/tests/xpcshell/test_forwardingprefix.js rename to devtools/server/tests/unit/test_forwardingprefix.js diff --git a/devtools/server/tests/xpcshell/test_frameactor-01.js b/devtools/server/tests/unit/test_frameactor-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_frameactor-01.js rename to devtools/server/tests/unit/test_frameactor-01.js diff --git a/devtools/server/tests/xpcshell/test_frameactor-02.js b/devtools/server/tests/unit/test_frameactor-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_frameactor-02.js rename to devtools/server/tests/unit/test_frameactor-02.js diff --git a/devtools/server/tests/xpcshell/test_frameactor-03.js b/devtools/server/tests/unit/test_frameactor-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_frameactor-03.js rename to devtools/server/tests/unit/test_frameactor-03.js diff --git a/devtools/server/tests/xpcshell/test_frameactor-04.js b/devtools/server/tests/unit/test_frameactor-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_frameactor-04.js rename to devtools/server/tests/unit/test_frameactor-04.js diff --git a/devtools/server/tests/xpcshell/test_frameactor-05.js b/devtools/server/tests/unit/test_frameactor-05.js similarity index 100% rename from devtools/server/tests/xpcshell/test_frameactor-05.js rename to devtools/server/tests/unit/test_frameactor-05.js diff --git a/devtools/server/tests/xpcshell/test_frameactor_wasm-01.js b/devtools/server/tests/unit/test_frameactor_wasm-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_frameactor_wasm-01.js rename to devtools/server/tests/unit/test_frameactor_wasm-01.js diff --git a/devtools/server/tests/xpcshell/test_framearguments-01.js b/devtools/server/tests/unit/test_framearguments-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_framearguments-01.js rename to devtools/server/tests/unit/test_framearguments-01.js diff --git a/devtools/server/tests/xpcshell/test_framebindings-01.js b/devtools/server/tests/unit/test_framebindings-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_framebindings-01.js rename to devtools/server/tests/unit/test_framebindings-01.js diff --git a/devtools/server/tests/xpcshell/test_framebindings-02.js b/devtools/server/tests/unit/test_framebindings-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_framebindings-02.js rename to devtools/server/tests/unit/test_framebindings-02.js diff --git a/devtools/server/tests/xpcshell/test_framebindings-03.js b/devtools/server/tests/unit/test_framebindings-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_framebindings-03.js rename to devtools/server/tests/unit/test_framebindings-03.js diff --git a/devtools/server/tests/xpcshell/test_framebindings-04.js b/devtools/server/tests/unit/test_framebindings-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_framebindings-04.js rename to devtools/server/tests/unit/test_framebindings-04.js diff --git a/devtools/server/tests/xpcshell/test_framebindings-05.js b/devtools/server/tests/unit/test_framebindings-05.js similarity index 100% rename from devtools/server/tests/xpcshell/test_framebindings-05.js rename to devtools/server/tests/unit/test_framebindings-05.js diff --git a/devtools/server/tests/xpcshell/test_framebindings-06.js b/devtools/server/tests/unit/test_framebindings-06.js similarity index 100% rename from devtools/server/tests/xpcshell/test_framebindings-06.js rename to devtools/server/tests/unit/test_framebindings-06.js diff --git a/devtools/server/tests/xpcshell/test_framebindings-07.js b/devtools/server/tests/unit/test_framebindings-07.js similarity index 100% rename from devtools/server/tests/xpcshell/test_framebindings-07.js rename to devtools/server/tests/unit/test_framebindings-07.js diff --git a/devtools/server/tests/xpcshell/test_front_destroy.js b/devtools/server/tests/unit/test_front_destroy.js similarity index 100% rename from devtools/server/tests/xpcshell/test_front_destroy.js rename to devtools/server/tests/unit/test_front_destroy.js diff --git a/devtools/server/tests/xpcshell/test_functiongrips-01.js b/devtools/server/tests/unit/test_functiongrips-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_functiongrips-01.js rename to devtools/server/tests/unit/test_functiongrips-01.js diff --git a/devtools/server/tests/xpcshell/test_getRuleText.js b/devtools/server/tests/unit/test_getRuleText.js similarity index 100% rename from devtools/server/tests/xpcshell/test_getRuleText.js rename to devtools/server/tests/unit/test_getRuleText.js diff --git a/devtools/server/tests/xpcshell/test_getTextAtLineColumn.js b/devtools/server/tests/unit/test_getTextAtLineColumn.js similarity index 100% rename from devtools/server/tests/xpcshell/test_getTextAtLineColumn.js rename to devtools/server/tests/unit/test_getTextAtLineColumn.js diff --git a/devtools/server/tests/xpcshell/test_getyoungestframe.js b/devtools/server/tests/unit/test_getyoungestframe.js similarity index 100% rename from devtools/server/tests/xpcshell/test_getyoungestframe.js rename to devtools/server/tests/unit/test_getyoungestframe.js diff --git a/devtools/server/tests/xpcshell/test_ignore_caught_exceptions.js b/devtools/server/tests/unit/test_ignore_caught_exceptions.js similarity index 100% rename from devtools/server/tests/xpcshell/test_ignore_caught_exceptions.js rename to devtools/server/tests/unit/test_ignore_caught_exceptions.js diff --git a/devtools/server/tests/xpcshell/test_ignore_no_interface_exceptions.js b/devtools/server/tests/unit/test_ignore_no_interface_exceptions.js similarity index 100% rename from devtools/server/tests/xpcshell/test_ignore_no_interface_exceptions.js rename to devtools/server/tests/unit/test_ignore_no_interface_exceptions.js diff --git a/devtools/server/tests/xpcshell/test_interrupt.js b/devtools/server/tests/unit/test_interrupt.js similarity index 100% rename from devtools/server/tests/xpcshell/test_interrupt.js rename to devtools/server/tests/unit/test_interrupt.js diff --git a/devtools/server/tests/xpcshell/test_layout-reflows-observer.js b/devtools/server/tests/unit/test_layout-reflows-observer.js similarity index 100% rename from devtools/server/tests/xpcshell/test_layout-reflows-observer.js rename to devtools/server/tests/unit/test_layout-reflows-observer.js diff --git a/devtools/server/tests/xpcshell/test_listsources-01.js b/devtools/server/tests/unit/test_listsources-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_listsources-01.js rename to devtools/server/tests/unit/test_listsources-01.js diff --git a/devtools/server/tests/xpcshell/test_listsources-02.js b/devtools/server/tests/unit/test_listsources-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_listsources-02.js rename to devtools/server/tests/unit/test_listsources-02.js diff --git a/devtools/server/tests/xpcshell/test_listsources-03.js b/devtools/server/tests/unit/test_listsources-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_listsources-03.js rename to devtools/server/tests/unit/test_listsources-03.js diff --git a/devtools/server/tests/xpcshell/test_logpoint-01.js b/devtools/server/tests/unit/test_logpoint-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_logpoint-01.js rename to devtools/server/tests/unit/test_logpoint-01.js diff --git a/devtools/server/tests/xpcshell/test_logpoint-02.js b/devtools/server/tests/unit/test_logpoint-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_logpoint-02.js rename to devtools/server/tests/unit/test_logpoint-02.js diff --git a/devtools/server/tests/xpcshell/test_logpoint-03.js b/devtools/server/tests/unit/test_logpoint-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_logpoint-03.js rename to devtools/server/tests/unit/test_logpoint-03.js diff --git a/devtools/server/tests/xpcshell/test_longstringgrips-01.js b/devtools/server/tests/unit/test_longstringgrips-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_longstringgrips-01.js rename to devtools/server/tests/unit/test_longstringgrips-01.js diff --git a/devtools/server/tests/xpcshell/test_nativewrappers.js b/devtools/server/tests/unit/test_nativewrappers.js similarity index 100% rename from devtools/server/tests/xpcshell/test_nativewrappers.js rename to devtools/server/tests/unit/test_nativewrappers.js diff --git a/devtools/server/tests/xpcshell/test_nesting-01.js b/devtools/server/tests/unit/test_nesting-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_nesting-01.js rename to devtools/server/tests/unit/test_nesting-01.js diff --git a/devtools/server/tests/xpcshell/test_nesting-02.js b/devtools/server/tests/unit/test_nesting-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_nesting-02.js rename to devtools/server/tests/unit/test_nesting-02.js diff --git a/devtools/server/tests/xpcshell/test_nesting-03.js b/devtools/server/tests/unit/test_nesting-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_nesting-03.js rename to devtools/server/tests/unit/test_nesting-03.js diff --git a/devtools/server/tests/xpcshell/test_new_source-01.js b/devtools/server/tests/unit/test_new_source-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_new_source-01.js rename to devtools/server/tests/unit/test_new_source-01.js diff --git a/devtools/server/tests/xpcshell/test_new_source-02.js b/devtools/server/tests/unit/test_new_source-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_new_source-02.js rename to devtools/server/tests/unit/test_new_source-02.js diff --git a/devtools/server/tests/xpcshell/test_nodelistactor.js b/devtools/server/tests/unit/test_nodelistactor.js similarity index 100% rename from devtools/server/tests/xpcshell/test_nodelistactor.js rename to devtools/server/tests/unit/test_nodelistactor.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-01.js b/devtools/server/tests/unit/test_objectgrips-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-01.js rename to devtools/server/tests/unit/test_objectgrips-01.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-02.js b/devtools/server/tests/unit/test_objectgrips-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-02.js rename to devtools/server/tests/unit/test_objectgrips-02.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-03.js b/devtools/server/tests/unit/test_objectgrips-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-03.js rename to devtools/server/tests/unit/test_objectgrips-03.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-04.js b/devtools/server/tests/unit/test_objectgrips-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-04.js rename to devtools/server/tests/unit/test_objectgrips-04.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-05.js b/devtools/server/tests/unit/test_objectgrips-05.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-05.js rename to devtools/server/tests/unit/test_objectgrips-05.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-06.js b/devtools/server/tests/unit/test_objectgrips-06.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-06.js rename to devtools/server/tests/unit/test_objectgrips-06.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-07.js b/devtools/server/tests/unit/test_objectgrips-07.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-07.js rename to devtools/server/tests/unit/test_objectgrips-07.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-08.js b/devtools/server/tests/unit/test_objectgrips-08.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-08.js rename to devtools/server/tests/unit/test_objectgrips-08.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-10.js b/devtools/server/tests/unit/test_objectgrips-10.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-10.js rename to devtools/server/tests/unit/test_objectgrips-10.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-11.js b/devtools/server/tests/unit/test_objectgrips-11.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-11.js rename to devtools/server/tests/unit/test_objectgrips-11.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-12.js b/devtools/server/tests/unit/test_objectgrips-12.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-12.js rename to devtools/server/tests/unit/test_objectgrips-12.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-13.js b/devtools/server/tests/unit/test_objectgrips-13.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-13.js rename to devtools/server/tests/unit/test_objectgrips-13.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-14.js b/devtools/server/tests/unit/test_objectgrips-14.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-14.js rename to devtools/server/tests/unit/test_objectgrips-14.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-15.js b/devtools/server/tests/unit/test_objectgrips-15.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-15.js rename to devtools/server/tests/unit/test_objectgrips-15.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-16.js b/devtools/server/tests/unit/test_objectgrips-16.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-16.js rename to devtools/server/tests/unit/test_objectgrips-16.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-17.js b/devtools/server/tests/unit/test_objectgrips-17.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-17.js rename to devtools/server/tests/unit/test_objectgrips-17.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-18.js b/devtools/server/tests/unit/test_objectgrips-18.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-18.js rename to devtools/server/tests/unit/test_objectgrips-18.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-19.js b/devtools/server/tests/unit/test_objectgrips-19.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-19.js rename to devtools/server/tests/unit/test_objectgrips-19.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-20.js b/devtools/server/tests/unit/test_objectgrips-20.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-20.js rename to devtools/server/tests/unit/test_objectgrips-20.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-21.js b/devtools/server/tests/unit/test_objectgrips-21.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-21.js rename to devtools/server/tests/unit/test_objectgrips-21.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-22.js b/devtools/server/tests/unit/test_objectgrips-22.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-22.js rename to devtools/server/tests/unit/test_objectgrips-22.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-23.js b/devtools/server/tests/unit/test_objectgrips-23.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-23.js rename to devtools/server/tests/unit/test_objectgrips-23.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-24.js b/devtools/server/tests/unit/test_objectgrips-24.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-24.js rename to devtools/server/tests/unit/test_objectgrips-24.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-array-like-object.js b/devtools/server/tests/unit/test_objectgrips-array-like-object.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-array-like-object.js rename to devtools/server/tests/unit/test_objectgrips-array-like-object.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-fn-apply-01.js b/devtools/server/tests/unit/test_objectgrips-fn-apply-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-fn-apply-01.js rename to devtools/server/tests/unit/test_objectgrips-fn-apply-01.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-fn-apply-02.js b/devtools/server/tests/unit/test_objectgrips-fn-apply-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-fn-apply-02.js rename to devtools/server/tests/unit/test_objectgrips-fn-apply-02.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-fn-apply-03.js b/devtools/server/tests/unit/test_objectgrips-fn-apply-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-fn-apply-03.js rename to devtools/server/tests/unit/test_objectgrips-fn-apply-03.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-nested-proxy.js b/devtools/server/tests/unit/test_objectgrips-nested-proxy.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-nested-proxy.js rename to devtools/server/tests/unit/test_objectgrips-nested-proxy.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-property-value-01.js b/devtools/server/tests/unit/test_objectgrips-property-value-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-property-value-01.js rename to devtools/server/tests/unit/test_objectgrips-property-value-01.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-property-value-02.js b/devtools/server/tests/unit/test_objectgrips-property-value-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-property-value-02.js rename to devtools/server/tests/unit/test_objectgrips-property-value-02.js diff --git a/devtools/server/tests/xpcshell/test_objectgrips-property-value-03.js b/devtools/server/tests/unit/test_objectgrips-property-value-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_objectgrips-property-value-03.js rename to devtools/server/tests/unit/test_objectgrips-property-value-03.js diff --git a/devtools/server/tests/xpcshell/test_pause_exceptions-01.js b/devtools/server/tests/unit/test_pause_exceptions-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_pause_exceptions-01.js rename to devtools/server/tests/unit/test_pause_exceptions-01.js diff --git a/devtools/server/tests/xpcshell/test_pause_exceptions-02.js b/devtools/server/tests/unit/test_pause_exceptions-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_pause_exceptions-02.js rename to devtools/server/tests/unit/test_pause_exceptions-02.js diff --git a/devtools/server/tests/xpcshell/test_pause_exceptions-03.js b/devtools/server/tests/unit/test_pause_exceptions-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_pause_exceptions-03.js rename to devtools/server/tests/unit/test_pause_exceptions-03.js diff --git a/devtools/server/tests/xpcshell/test_pause_exceptions-04.js b/devtools/server/tests/unit/test_pause_exceptions-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_pause_exceptions-04.js rename to devtools/server/tests/unit/test_pause_exceptions-04.js diff --git a/devtools/server/tests/xpcshell/test_pauselifetime-01.js b/devtools/server/tests/unit/test_pauselifetime-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_pauselifetime-01.js rename to devtools/server/tests/unit/test_pauselifetime-01.js diff --git a/devtools/server/tests/xpcshell/test_pauselifetime-02.js b/devtools/server/tests/unit/test_pauselifetime-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_pauselifetime-02.js rename to devtools/server/tests/unit/test_pauselifetime-02.js diff --git a/devtools/server/tests/xpcshell/test_pauselifetime-03.js b/devtools/server/tests/unit/test_pauselifetime-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_pauselifetime-03.js rename to devtools/server/tests/unit/test_pauselifetime-03.js diff --git a/devtools/server/tests/xpcshell/test_pauselifetime-04.js b/devtools/server/tests/unit/test_pauselifetime-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_pauselifetime-04.js rename to devtools/server/tests/unit/test_pauselifetime-04.js diff --git a/devtools/server/tests/xpcshell/test_promise_state-01.js b/devtools/server/tests/unit/test_promise_state-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_promise_state-01.js rename to devtools/server/tests/unit/test_promise_state-01.js diff --git a/devtools/server/tests/xpcshell/test_promise_state-02.js b/devtools/server/tests/unit/test_promise_state-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_promise_state-02.js rename to devtools/server/tests/unit/test_promise_state-02.js diff --git a/devtools/server/tests/xpcshell/test_promise_state-03.js b/devtools/server/tests/unit/test_promise_state-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_promise_state-03.js rename to devtools/server/tests/unit/test_promise_state-03.js diff --git a/devtools/server/tests/xpcshell/test_promises_run_to_completion.js b/devtools/server/tests/unit/test_promises_run_to_completion.js similarity index 100% rename from devtools/server/tests/xpcshell/test_promises_run_to_completion.js rename to devtools/server/tests/unit/test_promises_run_to_completion.js diff --git a/devtools/server/tests/xpcshell/test_protocolSpec.js b/devtools/server/tests/unit/test_protocolSpec.js similarity index 100% rename from devtools/server/tests/xpcshell/test_protocolSpec.js rename to devtools/server/tests/unit/test_protocolSpec.js diff --git a/devtools/server/tests/xpcshell/test_reattach-thread.js b/devtools/server/tests/unit/test_reattach-thread.js similarity index 100% rename from devtools/server/tests/xpcshell/test_reattach-thread.js rename to devtools/server/tests/unit/test_reattach-thread.js diff --git a/devtools/server/tests/xpcshell/test_register_actor.js b/devtools/server/tests/unit/test_register_actor.js similarity index 100% rename from devtools/server/tests/xpcshell/test_register_actor.js rename to devtools/server/tests/unit/test_register_actor.js diff --git a/devtools/server/tests/xpcshell/test_requestTypes.js b/devtools/server/tests/unit/test_requestTypes.js similarity index 100% rename from devtools/server/tests/xpcshell/test_requestTypes.js rename to devtools/server/tests/unit/test_requestTypes.js diff --git a/devtools/server/tests/xpcshell/test_safe-getter.js b/devtools/server/tests/unit/test_safe-getter.js similarity index 100% rename from devtools/server/tests/xpcshell/test_safe-getter.js rename to devtools/server/tests/unit/test_safe-getter.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-at-the-beginning-of-a-minified-fn.js b/devtools/server/tests/unit/test_setBreakpoint-at-the-beginning-of-a-minified-fn.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-at-the-beginning-of-a-minified-fn.js rename to devtools/server/tests/unit/test_setBreakpoint-at-the-beginning-of-a-minified-fn.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-at-the-end-of-a-minified-fn.js b/devtools/server/tests/unit/test_setBreakpoint-at-the-end-of-a-minified-fn.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-at-the-end-of-a-minified-fn.js rename to devtools/server/tests/unit/test_setBreakpoint-at-the-end-of-a-minified-fn.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-on-column-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-on-column-in-gcd-script.js rename to devtools/server/tests/unit/test_setBreakpoint-on-column-in-gcd-script.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-on-column.js b/devtools/server/tests/unit/test_setBreakpoint-on-column.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-on-column.js rename to devtools/server/tests/unit/test_setBreakpoint-on-column.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-on-line-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-on-line-in-gcd-script.js rename to devtools/server/tests/unit/test_setBreakpoint-on-line-in-gcd-script.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-on-line-with-multiple-offsets.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-on-line-with-multiple-offsets.js rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-offsets.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-on-line-with-multiple-statements.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-on-line-with-multiple-statements.js rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-multiple-statements.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets-in-gcd-script.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-on-line-with-no-offsets.js b/devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-on-line-with-no-offsets.js rename to devtools/server/tests/unit/test_setBreakpoint-on-line-with-no-offsets.js diff --git a/devtools/server/tests/xpcshell/test_setBreakpoint-on-line.js b/devtools/server/tests/unit/test_setBreakpoint-on-line.js similarity index 100% rename from devtools/server/tests/xpcshell/test_setBreakpoint-on-line.js rename to devtools/server/tests/unit/test_setBreakpoint-on-line.js diff --git a/devtools/server/tests/xpcshell/test_shapes_highlighter_helpers.js b/devtools/server/tests/unit/test_shapes_highlighter_helpers.js similarity index 100% rename from devtools/server/tests/xpcshell/test_shapes_highlighter_helpers.js rename to devtools/server/tests/unit/test_shapes_highlighter_helpers.js diff --git a/devtools/server/tests/xpcshell/test_source-01.js b/devtools/server/tests/unit/test_source-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_source-01.js rename to devtools/server/tests/unit/test_source-01.js diff --git a/devtools/server/tests/xpcshell/test_source-02.js b/devtools/server/tests/unit/test_source-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_source-02.js rename to devtools/server/tests/unit/test_source-02.js diff --git a/devtools/server/tests/xpcshell/test_source-03.js b/devtools/server/tests/unit/test_source-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_source-03.js rename to devtools/server/tests/unit/test_source-03.js diff --git a/devtools/server/tests/xpcshell/test_source-04.js b/devtools/server/tests/unit/test_source-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_source-04.js rename to devtools/server/tests/unit/test_source-04.js diff --git a/devtools/server/tests/xpcshell/test_stepping-01.js b/devtools/server/tests/unit/test_stepping-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-01.js rename to devtools/server/tests/unit/test_stepping-01.js diff --git a/devtools/server/tests/xpcshell/test_stepping-02.js b/devtools/server/tests/unit/test_stepping-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-02.js rename to devtools/server/tests/unit/test_stepping-02.js diff --git a/devtools/server/tests/xpcshell/test_stepping-03.js b/devtools/server/tests/unit/test_stepping-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-03.js rename to devtools/server/tests/unit/test_stepping-03.js diff --git a/devtools/server/tests/xpcshell/test_stepping-04.js b/devtools/server/tests/unit/test_stepping-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-04.js rename to devtools/server/tests/unit/test_stepping-04.js diff --git a/devtools/server/tests/xpcshell/test_stepping-05.js b/devtools/server/tests/unit/test_stepping-05.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-05.js rename to devtools/server/tests/unit/test_stepping-05.js diff --git a/devtools/server/tests/xpcshell/test_stepping-06.js b/devtools/server/tests/unit/test_stepping-06.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-06.js rename to devtools/server/tests/unit/test_stepping-06.js diff --git a/devtools/server/tests/xpcshell/test_stepping-07.js b/devtools/server/tests/unit/test_stepping-07.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-07.js rename to devtools/server/tests/unit/test_stepping-07.js diff --git a/devtools/server/tests/xpcshell/test_stepping-08.js b/devtools/server/tests/unit/test_stepping-08.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-08.js rename to devtools/server/tests/unit/test_stepping-08.js diff --git a/devtools/server/tests/xpcshell/test_stepping-09.js b/devtools/server/tests/unit/test_stepping-09.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-09.js rename to devtools/server/tests/unit/test_stepping-09.js diff --git a/devtools/server/tests/xpcshell/test_stepping-10.js b/devtools/server/tests/unit/test_stepping-10.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-10.js rename to devtools/server/tests/unit/test_stepping-10.js diff --git a/devtools/server/tests/xpcshell/test_stepping-11.js b/devtools/server/tests/unit/test_stepping-11.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-11.js rename to devtools/server/tests/unit/test_stepping-11.js diff --git a/devtools/server/tests/xpcshell/test_stepping-12.js b/devtools/server/tests/unit/test_stepping-12.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-12.js rename to devtools/server/tests/unit/test_stepping-12.js diff --git a/devtools/server/tests/xpcshell/test_stepping-13.js b/devtools/server/tests/unit/test_stepping-13.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-13.js rename to devtools/server/tests/unit/test_stepping-13.js diff --git a/devtools/server/tests/xpcshell/test_stepping-14.js b/devtools/server/tests/unit/test_stepping-14.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-14.js rename to devtools/server/tests/unit/test_stepping-14.js diff --git a/devtools/server/tests/xpcshell/test_stepping-15.js b/devtools/server/tests/unit/test_stepping-15.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-15.js rename to devtools/server/tests/unit/test_stepping-15.js diff --git a/devtools/server/tests/xpcshell/test_stepping-16.js b/devtools/server/tests/unit/test_stepping-16.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-16.js rename to devtools/server/tests/unit/test_stepping-16.js diff --git a/devtools/server/tests/xpcshell/test_stepping-with-skip-breakpoints.js b/devtools/server/tests/unit/test_stepping-with-skip-breakpoints.js similarity index 100% rename from devtools/server/tests/xpcshell/test_stepping-with-skip-breakpoints.js rename to devtools/server/tests/unit/test_stepping-with-skip-breakpoints.js diff --git a/devtools/server/tests/xpcshell/test_symbolactor.js b/devtools/server/tests/unit/test_symbolactor.js similarity index 100% rename from devtools/server/tests/xpcshell/test_symbolactor.js rename to devtools/server/tests/unit/test_symbolactor.js diff --git a/devtools/server/tests/xpcshell/test_symbols-01.js b/devtools/server/tests/unit/test_symbols-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_symbols-01.js rename to devtools/server/tests/unit/test_symbols-01.js diff --git a/devtools/server/tests/xpcshell/test_symbols-02.js b/devtools/server/tests/unit/test_symbols-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_symbols-02.js rename to devtools/server/tests/unit/test_symbols-02.js diff --git a/devtools/server/tests/xpcshell/test_threadlifetime-01.js b/devtools/server/tests/unit/test_threadlifetime-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_threadlifetime-01.js rename to devtools/server/tests/unit/test_threadlifetime-01.js diff --git a/devtools/server/tests/xpcshell/test_threadlifetime-02.js b/devtools/server/tests/unit/test_threadlifetime-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_threadlifetime-02.js rename to devtools/server/tests/unit/test_threadlifetime-02.js diff --git a/devtools/server/tests/xpcshell/test_threadlifetime-04.js b/devtools/server/tests/unit/test_threadlifetime-04.js similarity index 100% rename from devtools/server/tests/xpcshell/test_threadlifetime-04.js rename to devtools/server/tests/unit/test_threadlifetime-04.js diff --git a/devtools/server/tests/xpcshell/test_unsafeDereference.js b/devtools/server/tests/unit/test_unsafeDereference.js similarity index 100% rename from devtools/server/tests/xpcshell/test_unsafeDereference.js rename to devtools/server/tests/unit/test_unsafeDereference.js diff --git a/devtools/server/tests/xpcshell/test_wasm_source-01.js b/devtools/server/tests/unit/test_wasm_source-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_wasm_source-01.js rename to devtools/server/tests/unit/test_wasm_source-01.js diff --git a/devtools/server/tests/xpcshell/test_watchpoint-01.js b/devtools/server/tests/unit/test_watchpoint-01.js similarity index 100% rename from devtools/server/tests/xpcshell/test_watchpoint-01.js rename to devtools/server/tests/unit/test_watchpoint-01.js diff --git a/devtools/server/tests/xpcshell/test_watchpoint-02.js b/devtools/server/tests/unit/test_watchpoint-02.js similarity index 100% rename from devtools/server/tests/xpcshell/test_watchpoint-02.js rename to devtools/server/tests/unit/test_watchpoint-02.js diff --git a/devtools/server/tests/xpcshell/test_watchpoint-03.js b/devtools/server/tests/unit/test_watchpoint-03.js similarity index 100% rename from devtools/server/tests/xpcshell/test_watchpoint-03.js rename to devtools/server/tests/unit/test_watchpoint-03.js diff --git a/devtools/server/tests/xpcshell/test_xpcshell_debugging.js b/devtools/server/tests/unit/test_xpcshell_debugging.js similarity index 100% rename from devtools/server/tests/xpcshell/test_xpcshell_debugging.js rename to devtools/server/tests/unit/test_xpcshell_debugging.js diff --git a/devtools/server/tests/xpcshell/testactors.js b/devtools/server/tests/unit/testactors.js similarity index 100% rename from devtools/server/tests/xpcshell/testactors.js rename to devtools/server/tests/unit/testactors.js diff --git a/devtools/server/tests/xpcshell/xpcshell.ini b/devtools/server/tests/unit/xpcshell.ini similarity index 100% rename from devtools/server/tests/xpcshell/xpcshell.ini rename to devtools/server/tests/unit/xpcshell.ini diff --git a/devtools/server/tests/xpcshell/xpcshell_debugging_script.js b/devtools/server/tests/unit/xpcshell_debugging_script.js similarity index 100% rename from devtools/server/tests/xpcshell/xpcshell_debugging_script.js rename to devtools/server/tests/unit/xpcshell_debugging_script.js diff --git a/devtools/shared/acorn/moz.build b/devtools/shared/acorn/moz.build index b6d36a6492b6..8fd5375ef7ac 100644 --- a/devtools/shared/acorn/moz.build +++ b/devtools/shared/acorn/moz.build @@ -4,7 +4,7 @@ # 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 += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( 'acorn.js', diff --git a/devtools/shared/acorn/tests/xpcshell/head_acorn.js b/devtools/shared/acorn/tests/unit/head_acorn.js similarity index 100% rename from devtools/shared/acorn/tests/xpcshell/head_acorn.js rename to devtools/shared/acorn/tests/unit/head_acorn.js diff --git a/devtools/shared/acorn/tests/xpcshell/test_import_acorn.js b/devtools/shared/acorn/tests/unit/test_import_acorn.js similarity index 100% rename from devtools/shared/acorn/tests/xpcshell/test_import_acorn.js rename to devtools/shared/acorn/tests/unit/test_import_acorn.js diff --git a/devtools/shared/acorn/tests/xpcshell/test_lenient_parser.js b/devtools/shared/acorn/tests/unit/test_lenient_parser.js similarity index 100% rename from devtools/shared/acorn/tests/xpcshell/test_lenient_parser.js rename to devtools/shared/acorn/tests/unit/test_lenient_parser.js diff --git a/devtools/shared/acorn/tests/xpcshell/test_same_ast.js b/devtools/shared/acorn/tests/unit/test_same_ast.js similarity index 100% rename from devtools/shared/acorn/tests/xpcshell/test_same_ast.js rename to devtools/shared/acorn/tests/unit/test_same_ast.js diff --git a/devtools/shared/acorn/tests/xpcshell/xpcshell.ini b/devtools/shared/acorn/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/acorn/tests/xpcshell/xpcshell.ini rename to devtools/shared/acorn/tests/unit/xpcshell.ini diff --git a/devtools/shared/adb/moz.build b/devtools/shared/adb/moz.build index b8ac4ed3aba9..06ad8f99bc0b 100644 --- a/devtools/shared/adb/moz.build +++ b/devtools/shared/adb/moz.build @@ -21,4 +21,4 @@ DevToolsModules( with Files('**'): BUG_COMPONENT = ('DevTools', 'about:debugging') -XPCSHELL_TESTS_MANIFESTS += ['xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini'] diff --git a/devtools/shared/adb/xpcshell/.eslintrc.js b/devtools/shared/adb/test/.eslintrc.js similarity index 100% rename from devtools/shared/adb/xpcshell/.eslintrc.js rename to devtools/shared/adb/test/.eslintrc.js diff --git a/devtools/shared/adb/xpcshell/adb.py b/devtools/shared/adb/test/adb.py similarity index 100% rename from devtools/shared/adb/xpcshell/adb.py rename to devtools/shared/adb/test/adb.py diff --git a/devtools/shared/adb/xpcshell/test_adb.js b/devtools/shared/adb/test/test_adb.js similarity index 100% rename from devtools/shared/adb/xpcshell/test_adb.js rename to devtools/shared/adb/test/test_adb.js diff --git a/devtools/shared/adb/xpcshell/xpcshell-head.js b/devtools/shared/adb/test/xpcshell-head.js similarity index 100% rename from devtools/shared/adb/xpcshell/xpcshell-head.js rename to devtools/shared/adb/test/xpcshell-head.js diff --git a/devtools/shared/adb/xpcshell/xpcshell.ini b/devtools/shared/adb/test/xpcshell.ini similarity index 100% rename from devtools/shared/adb/xpcshell/xpcshell.ini rename to devtools/shared/adb/test/xpcshell.ini diff --git a/devtools/shared/discovery/moz.build b/devtools/shared/discovery/moz.build index 34fb592cc8bb..9aeaba45e641 100644 --- a/devtools/shared/discovery/moz.build +++ b/devtools/shared/discovery/moz.build @@ -4,7 +4,7 @@ # 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 += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( 'discovery.js', diff --git a/devtools/shared/discovery/tests/xpcshell/.eslintrc.js b/devtools/shared/discovery/tests/unit/.eslintrc.js similarity index 100% rename from devtools/shared/discovery/tests/xpcshell/.eslintrc.js rename to devtools/shared/discovery/tests/unit/.eslintrc.js diff --git a/devtools/shared/discovery/tests/xpcshell/test_discovery.js b/devtools/shared/discovery/tests/unit/test_discovery.js similarity index 100% rename from devtools/shared/discovery/tests/xpcshell/test_discovery.js rename to devtools/shared/discovery/tests/unit/test_discovery.js diff --git a/devtools/shared/discovery/tests/xpcshell/xpcshell.ini b/devtools/shared/discovery/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/discovery/tests/xpcshell/xpcshell.ini rename to devtools/shared/discovery/tests/unit/xpcshell.ini diff --git a/devtools/shared/fronts/targets/browsing-context.js b/devtools/shared/fronts/targets/browsing-context.js index 1730690f837a..c5f5b19fe11f 100644 --- a/devtools/shared/fronts/targets/browsing-context.js +++ b/devtools/shared/fronts/targets/browsing-context.js @@ -109,7 +109,7 @@ class BrowsingContextTargetFront extends TargetMixin( this.configureOptions.javascriptEnabled = response.javascriptEnabled; this.traits = response.traits || {}; - // xpcshell tests from devtools/server/tests/xpcshell/ are implementing + // xpcshell tests from devtools/server/tests/unit/ are implementing // fake BrowsingContextTargetActor which do not expose any console actor. if (this.targetForm.consoleActor) { await this.attachConsole(); diff --git a/devtools/shared/heapsnapshot/moz.build b/devtools/shared/heapsnapshot/moz.build index 59fd1cc502d1..29c44ab51749 100644 --- a/devtools/shared/heapsnapshot/moz.build +++ b/devtools/shared/heapsnapshot/moz.build @@ -10,7 +10,7 @@ with Files('**'): if CONFIG['ENABLE_TESTS']: DIRS += ['tests/gtest'] -XPCSHELL_TESTS_MANIFESTS += [ 'tests/xpcshell/xpcshell.ini' ] +XPCSHELL_TESTS_MANIFESTS += [ 'tests/unit/xpcshell.ini' ] MOCHITEST_MANIFESTS += [ 'tests/mochitest/mochitest.ini' ] MOCHITEST_CHROME_MANIFESTS += [ 'tests/mochitest/chrome.ini' ] diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/.eslintrc.js b/devtools/shared/heapsnapshot/tests/unit/.eslintrc.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/.eslintrc.js rename to devtools/shared/heapsnapshot/tests/unit/.eslintrc.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/Census.jsm b/devtools/shared/heapsnapshot/tests/unit/Census.jsm similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/Census.jsm rename to devtools/shared/heapsnapshot/tests/unit/Census.jsm diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/Match.jsm b/devtools/shared/heapsnapshot/tests/unit/Match.jsm similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/Match.jsm rename to devtools/shared/heapsnapshot/tests/unit/Match.jsm diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/dominator-tree-worker.js b/devtools/shared/heapsnapshot/tests/unit/dominator-tree-worker.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/dominator-tree-worker.js rename to devtools/shared/heapsnapshot/tests/unit/dominator-tree-worker.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/head_heapsnapshot.js b/devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/head_heapsnapshot.js rename to devtools/shared/heapsnapshot/tests/unit/head_heapsnapshot.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/heap-snapshot-worker.js b/devtools/shared/heapsnapshot/tests/unit/heap-snapshot-worker.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/heap-snapshot-worker.js rename to devtools/shared/heapsnapshot/tests/unit/heap-snapshot-worker.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_LabelAndShallowSize_01.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_LabelAndShallowSize_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_LabelAndShallowSize_02.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_LabelAndShallowSize_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_LabelAndShallowSize_03.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_LabelAndShallowSize_03.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_LabelAndShallowSize_04.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_LabelAndShallowSize_04.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_LabelAndShallowSize_04.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_attachShortestPaths_01.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_attachShortestPaths_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_attachShortestPaths_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_attachShortestPaths_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_getNodeByIdAlongPath_01.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_getNodeByIdAlongPath_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_getNodeByIdAlongPath_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_getNodeByIdAlongPath_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_insert_01.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_insert_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_insert_02.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_insert_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_insert_03.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_insert_03.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_insert_03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_partialTraversal_01.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTreeNode_partialTraversal_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTreeNode_partialTraversal_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_01.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_02.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_03.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_03.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_04.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_04.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_04.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_04.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_05.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_05.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_05.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_05.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_06.js b/devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_06.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_DominatorTree_06.js rename to devtools/shared/heapsnapshot/tests/unit/test_DominatorTree_06.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_computeDominatorTree_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_computeDominatorTree_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_computeDominatorTree_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_computeDominatorTree_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_computeDominatorTree_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_deleteHeapSnapshot_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_deleteHeapSnapshot_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_deleteHeapSnapshot_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_deleteHeapSnapshot_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_deleteHeapSnapshot_03.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_deleteHeapSnapshot_03.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_deleteHeapSnapshot_03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getCensusIndividuals_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getCensusIndividuals_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCensusIndividuals_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getCreationTime_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCreationTime_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getCreationTime_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getCreationTime_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getDominatorTree_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getDominatorTree_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getDominatorTree_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getDominatorTree_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getDominatorTree_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getImmediatelyDominated_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_getImmediatelyDominated_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_getImmediatelyDominated_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_readHeapSnapshot_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_readHeapSnapshot_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_readHeapSnapshot_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensusDiff_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensusDiff_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensusDiff_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensusDiff_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensusDiff_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_03.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_03.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_04.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_04.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_04.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_04.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_05.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_05.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_05.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_05.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_06.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_06.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_06.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_06.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_07.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapAnalyses_takeCensus_07.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapAnalyses_takeCensus_07.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_computeShortestPaths_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_computeShortestPaths_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_computeShortestPaths_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_computeShortestPaths_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_computeShortestPaths_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_creationTime_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_creationTime_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_creationTime_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_creationTime_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_deepStack_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_deepStack_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_deepStack_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_deepStack_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_describeNode_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_describeNode_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_describeNode_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_getObjectNodeId_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_getObjectNodeId_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_getObjectNodeId_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_getObjectNodeId_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_01.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_02.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_03.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_03.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_04.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_04.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_04.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_05.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_05.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_05.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_06.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_06.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_06.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_07.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_07.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_07.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_08.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_08.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_08.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_09.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_09.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_09.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_10.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_10.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_10.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_11.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_11.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_11.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_12.js b/devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_12.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_HeapSnapshot_takeCensus_12.js rename to devtools/shared/heapsnapshot/tests/unit/test_HeapSnapshot_takeCensus_12.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot.js b/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot.js rename to devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot_with_allocations.js b/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot_with_allocations.js rename to devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_with_allocations.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot_worker.js b/devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot_worker.js rename to devtools/shared/heapsnapshot/tests/unit/test_ReadHeapSnapshot_worker.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_SaveHeapSnapshot.js b/devtools/shared/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_SaveHeapSnapshot.js rename to devtools/shared/heapsnapshot/tests/unit/test_SaveHeapSnapshot.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-01.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-01.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-02.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-02.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-03.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-03.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-04.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-04.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-04.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-04.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-05.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-05.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-05.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-05.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-06.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-06.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-06.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-06.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-07.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-07.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-07.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-07.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-08.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-08.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-08.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-08.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-09.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-09.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-09.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-09.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-10.js b/devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-10.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census-tree-node-10.js rename to devtools/shared/heapsnapshot/tests/unit/test_census-tree-node-10.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_01.js b/devtools/shared/heapsnapshot/tests/unit/test_census_diff_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_diff_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_02.js b/devtools/shared/heapsnapshot/tests/unit/test_census_diff_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_diff_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_03.js b/devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_03.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_diff_03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_04.js b/devtools/shared/heapsnapshot/tests/unit/test_census_diff_04.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_04.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_diff_04.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_05.js b/devtools/shared/heapsnapshot/tests/unit/test_census_diff_05.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_05.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_diff_05.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_06.js b/devtools/shared/heapsnapshot/tests/unit/test_census_diff_06.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_diff_06.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_diff_06.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_01.js b/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_filtering_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_02.js b/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_02.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_02.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_filtering_02.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_03.js b/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_03.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_03.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_filtering_03.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_04.js b/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_04.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_04.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_filtering_04.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_05.js b/devtools/shared/heapsnapshot/tests/unit/test_census_filtering_05.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_census_filtering_05.js rename to devtools/shared/heapsnapshot/tests/unit/test_census_filtering_05.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_countToBucketBreakdown_01.js b/devtools/shared/heapsnapshot/tests/unit/test_countToBucketBreakdown_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_countToBucketBreakdown_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_countToBucketBreakdown_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_deduplicatePaths_01.js b/devtools/shared/heapsnapshot/tests/unit/test_deduplicatePaths_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_deduplicatePaths_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_deduplicatePaths_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_getCensusIndividuals_01.js b/devtools/shared/heapsnapshot/tests/unit/test_getCensusIndividuals_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_getCensusIndividuals_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_getCensusIndividuals_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_getReportLeaves_01.js b/devtools/shared/heapsnapshot/tests/unit/test_getReportLeaves_01.js similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_getReportLeaves_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_getReportLeaves_01.js diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/test_saveHeapSnapshot_e10s_01.js b/devtools/shared/heapsnapshot/tests/unit/test_saveHeapSnapshot_e10s_01.js similarity index 79% rename from devtools/shared/heapsnapshot/tests/xpcshell/test_saveHeapSnapshot_e10s_01.js rename to devtools/shared/heapsnapshot/tests/unit/test_saveHeapSnapshot_e10s_01.js index 0a466180035f..1cb323720b2e 100644 --- a/devtools/shared/heapsnapshot/tests/xpcshell/test_saveHeapSnapshot_e10s_01.js +++ b/devtools/shared/heapsnapshot/tests/unit/test_saveHeapSnapshot_e10s_01.js @@ -5,5 +5,5 @@ // Test saving a heap snapshot in the sandboxed e10s child process. function run_test() { - run_test_in_child("test_SaveHeapSnapshot.js"); + run_test_in_child("../unit/test_SaveHeapSnapshot.js"); } diff --git a/devtools/shared/heapsnapshot/tests/xpcshell/xpcshell.ini b/devtools/shared/heapsnapshot/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/heapsnapshot/tests/xpcshell/xpcshell.ini rename to devtools/shared/heapsnapshot/tests/unit/xpcshell.ini diff --git a/devtools/shared/jsbeautify/moz.build b/devtools/shared/jsbeautify/moz.build index 375a95230773..939ca8943cc7 100644 --- a/devtools/shared/jsbeautify/moz.build +++ b/devtools/shared/jsbeautify/moz.build @@ -9,7 +9,7 @@ DIRS += [ 'src', ] -XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( 'beautify.js', diff --git a/devtools/shared/jsbeautify/tests/xpcshell/head_jsbeautify.js b/devtools/shared/jsbeautify/tests/unit/head_jsbeautify.js similarity index 100% rename from devtools/shared/jsbeautify/tests/xpcshell/head_jsbeautify.js rename to devtools/shared/jsbeautify/tests/unit/head_jsbeautify.js diff --git a/devtools/shared/jsbeautify/tests/xpcshell/test.js b/devtools/shared/jsbeautify/tests/unit/test.js similarity index 100% rename from devtools/shared/jsbeautify/tests/xpcshell/test.js rename to devtools/shared/jsbeautify/tests/unit/test.js diff --git a/devtools/shared/jsbeautify/tests/xpcshell/xpcshell.ini b/devtools/shared/jsbeautify/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/jsbeautify/tests/xpcshell/xpcshell.ini rename to devtools/shared/jsbeautify/tests/unit/xpcshell.ini diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build index 8ecb98a18343..928a78f35547 100644 --- a/devtools/shared/moz.build +++ b/devtools/shared/moz.build @@ -41,7 +41,7 @@ if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': BROWSER_CHROME_MANIFESTS += ['test-helpers/browser.ini'] MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini'] -XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] JAR_MANIFESTS += ['jar.mn'] diff --git a/devtools/shared/performance/moz.build b/devtools/shared/performance/moz.build index 96bbbeafb6df..202aac27828d 100644 --- a/devtools/shared/performance/moz.build +++ b/devtools/shared/performance/moz.build @@ -4,7 +4,7 @@ # 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 += ['xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini'] DevToolsModules( 'recording-common.js', diff --git a/devtools/shared/performance/xpcshell/.eslintrc.js b/devtools/shared/performance/test/.eslintrc.js similarity index 100% rename from devtools/shared/performance/xpcshell/.eslintrc.js rename to devtools/shared/performance/test/.eslintrc.js diff --git a/devtools/shared/performance/xpcshell/head.js b/devtools/shared/performance/test/head.js similarity index 100% rename from devtools/shared/performance/xpcshell/head.js rename to devtools/shared/performance/test/head.js diff --git a/devtools/shared/performance/xpcshell/test_perf-utils-allocations-to-samples.js b/devtools/shared/performance/test/test_perf-utils-allocations-to-samples.js similarity index 100% rename from devtools/shared/performance/xpcshell/test_perf-utils-allocations-to-samples.js rename to devtools/shared/performance/test/test_perf-utils-allocations-to-samples.js diff --git a/devtools/shared/performance/xpcshell/xpcshell.ini b/devtools/shared/performance/test/xpcshell.ini similarity index 100% rename from devtools/shared/performance/xpcshell/xpcshell.ini rename to devtools/shared/performance/test/xpcshell.ini diff --git a/devtools/shared/protocol/Pool.js b/devtools/shared/protocol/Pool.js index fdff37543a95..eac6d8eec9c7 100644 --- a/devtools/shared/protocol/Pool.js +++ b/devtools/shared/protocol/Pool.js @@ -72,7 +72,7 @@ class Pool extends EventEmitter { } else { // If the actor is already registerd in a pool, remove it without destroying it. // This happens for example when an addon is reloaded. To see this behavior, take a - // look at devtools/server/tests/xpcshell/test_addon_reload.js + // look at devtools/server/tests/unit/test_addon_reload.js // TODO: not all actors have been moved to protocol.js, so they do not all have // a parent field. Remove the check for the parent once the conversion is finished diff --git a/devtools/shared/qrcode/moz.build b/devtools/shared/qrcode/moz.build index f8a509e6fa49..68a093b1c1bf 100644 --- a/devtools/shared/qrcode/moz.build +++ b/devtools/shared/qrcode/moz.build @@ -18,5 +18,5 @@ DevToolsModules( 'index.js', ) -XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini'] diff --git a/devtools/shared/qrcode/tests/xpcshell/.eslintrc.js b/devtools/shared/qrcode/tests/unit/.eslintrc.js similarity index 100% rename from devtools/shared/qrcode/tests/xpcshell/.eslintrc.js rename to devtools/shared/qrcode/tests/unit/.eslintrc.js diff --git a/devtools/shared/qrcode/tests/xpcshell/test_encode.js b/devtools/shared/qrcode/tests/unit/test_encode.js similarity index 100% rename from devtools/shared/qrcode/tests/xpcshell/test_encode.js rename to devtools/shared/qrcode/tests/unit/test_encode.js diff --git a/devtools/shared/qrcode/tests/xpcshell/xpcshell.ini b/devtools/shared/qrcode/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/qrcode/tests/xpcshell/xpcshell.ini rename to devtools/shared/qrcode/tests/unit/xpcshell.ini diff --git a/devtools/shared/security/moz.build b/devtools/shared/security/moz.build index 9e20d1fe8335..f4fd1ca1af5c 100644 --- a/devtools/shared/security/moz.build +++ b/devtools/shared/security/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini'] -XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( 'auth.js', diff --git a/devtools/shared/security/tests/xpcshell/.eslintrc.js b/devtools/shared/security/tests/unit/.eslintrc.js similarity index 100% rename from devtools/shared/security/tests/xpcshell/.eslintrc.js rename to devtools/shared/security/tests/unit/.eslintrc.js diff --git a/devtools/shared/security/tests/xpcshell/head_dbg.js b/devtools/shared/security/tests/unit/head_dbg.js similarity index 100% rename from devtools/shared/security/tests/xpcshell/head_dbg.js rename to devtools/shared/security/tests/unit/head_dbg.js diff --git a/devtools/shared/security/tests/xpcshell/test_encryption.js b/devtools/shared/security/tests/unit/test_encryption.js similarity index 100% rename from devtools/shared/security/tests/xpcshell/test_encryption.js rename to devtools/shared/security/tests/unit/test_encryption.js diff --git a/devtools/shared/security/tests/xpcshell/test_oob_cert_auth.js b/devtools/shared/security/tests/unit/test_oob_cert_auth.js similarity index 100% rename from devtools/shared/security/tests/xpcshell/test_oob_cert_auth.js rename to devtools/shared/security/tests/unit/test_oob_cert_auth.js diff --git a/devtools/shared/security/tests/xpcshell/testactors.js b/devtools/shared/security/tests/unit/testactors.js similarity index 100% rename from devtools/shared/security/tests/xpcshell/testactors.js rename to devtools/shared/security/tests/unit/testactors.js diff --git a/devtools/shared/security/tests/xpcshell/xpcshell.ini b/devtools/shared/security/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/security/tests/xpcshell/xpcshell.ini rename to devtools/shared/security/tests/unit/xpcshell.ini diff --git a/devtools/shared/storage/vendor/stringvalidator/moz.build b/devtools/shared/storage/vendor/stringvalidator/moz.build index 4b2899ebef17..f7309283bf35 100644 --- a/devtools/shared/storage/vendor/stringvalidator/moz.build +++ b/devtools/shared/storage/vendor/stringvalidator/moz.build @@ -8,7 +8,7 @@ DIRS += [ 'util' ] -XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( 'validator.js', diff --git a/devtools/shared/storage/vendor/stringvalidator/tests/xpcshell/head_stringvalidator.js b/devtools/shared/storage/vendor/stringvalidator/tests/unit/head_stringvalidator.js similarity index 100% rename from devtools/shared/storage/vendor/stringvalidator/tests/xpcshell/head_stringvalidator.js rename to devtools/shared/storage/vendor/stringvalidator/tests/unit/head_stringvalidator.js diff --git a/devtools/shared/storage/vendor/stringvalidator/tests/xpcshell/test_sanitizers.js b/devtools/shared/storage/vendor/stringvalidator/tests/unit/test_sanitizers.js similarity index 100% rename from devtools/shared/storage/vendor/stringvalidator/tests/xpcshell/test_sanitizers.js rename to devtools/shared/storage/vendor/stringvalidator/tests/unit/test_sanitizers.js diff --git a/devtools/shared/storage/vendor/stringvalidator/tests/xpcshell/test_validators.js b/devtools/shared/storage/vendor/stringvalidator/tests/unit/test_validators.js similarity index 100% rename from devtools/shared/storage/vendor/stringvalidator/tests/xpcshell/test_validators.js rename to devtools/shared/storage/vendor/stringvalidator/tests/unit/test_validators.js diff --git a/devtools/shared/storage/vendor/stringvalidator/tests/xpcshell/xpcshell.ini b/devtools/shared/storage/vendor/stringvalidator/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/storage/vendor/stringvalidator/tests/xpcshell/xpcshell.ini rename to devtools/shared/storage/vendor/stringvalidator/tests/unit/xpcshell.ini diff --git a/devtools/shared/tests/xpcshell/.eslintrc.js b/devtools/shared/tests/unit/.eslintrc.js similarity index 100% rename from devtools/shared/tests/xpcshell/.eslintrc.js rename to devtools/shared/tests/unit/.eslintrc.js diff --git a/devtools/shared/tests/xpcshell/exposeLoader.js b/devtools/shared/tests/unit/exposeLoader.js similarity index 100% rename from devtools/shared/tests/xpcshell/exposeLoader.js rename to devtools/shared/tests/unit/exposeLoader.js diff --git a/devtools/shared/tests/xpcshell/head_devtools.js b/devtools/shared/tests/unit/head_devtools.js similarity index 100% rename from devtools/shared/tests/xpcshell/head_devtools.js rename to devtools/shared/tests/unit/head_devtools.js diff --git a/devtools/shared/tests/xpcshell/test_assert.js b/devtools/shared/tests/unit/test_assert.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_assert.js rename to devtools/shared/tests/unit/test_assert.js diff --git a/devtools/shared/tests/xpcshell/test_console_filtering.js b/devtools/shared/tests/unit/test_console_filtering.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_console_filtering.js rename to devtools/shared/tests/unit/test_console_filtering.js diff --git a/devtools/shared/tests/xpcshell/test_css-properties-db.js b/devtools/shared/tests/unit/test_css-properties-db.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_css-properties-db.js rename to devtools/shared/tests/unit/test_css-properties-db.js diff --git a/devtools/shared/tests/xpcshell/test_csslexer.js b/devtools/shared/tests/unit/test_csslexer.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_csslexer.js rename to devtools/shared/tests/unit/test_csslexer.js diff --git a/devtools/shared/tests/xpcshell/test_debugger_client.js b/devtools/shared/tests/unit/test_debugger_client.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_debugger_client.js rename to devtools/shared/tests/unit/test_debugger_client.js diff --git a/devtools/shared/tests/xpcshell/test_defer.js b/devtools/shared/tests/unit/test_defer.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_defer.js rename to devtools/shared/tests/unit/test_defer.js diff --git a/devtools/shared/tests/xpcshell/test_defineLazyPrototypeGetter.js b/devtools/shared/tests/unit/test_defineLazyPrototypeGetter.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_defineLazyPrototypeGetter.js rename to devtools/shared/tests/unit/test_defineLazyPrototypeGetter.js diff --git a/devtools/shared/tests/xpcshell/test_eventemitter_basic.js b/devtools/shared/tests/unit/test_eventemitter_basic.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_eventemitter_basic.js rename to devtools/shared/tests/unit/test_eventemitter_basic.js diff --git a/devtools/shared/tests/xpcshell/test_eventemitter_static.js b/devtools/shared/tests/unit/test_eventemitter_static.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_eventemitter_static.js rename to devtools/shared/tests/unit/test_eventemitter_static.js diff --git a/devtools/shared/tests/xpcshell/test_executeSoon.js b/devtools/shared/tests/unit/test_executeSoon.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_executeSoon.js rename to devtools/shared/tests/unit/test_executeSoon.js diff --git a/devtools/shared/tests/xpcshell/test_fetch-bom.js b/devtools/shared/tests/unit/test_fetch-bom.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_fetch-bom.js rename to devtools/shared/tests/unit/test_fetch-bom.js diff --git a/devtools/shared/tests/xpcshell/test_fetch-chrome.js b/devtools/shared/tests/unit/test_fetch-chrome.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_fetch-chrome.js rename to devtools/shared/tests/unit/test_fetch-chrome.js diff --git a/devtools/shared/tests/xpcshell/test_fetch-file.js b/devtools/shared/tests/unit/test_fetch-file.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_fetch-file.js rename to devtools/shared/tests/unit/test_fetch-file.js diff --git a/devtools/shared/tests/xpcshell/test_fetch-http.js b/devtools/shared/tests/unit/test_fetch-http.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_fetch-http.js rename to devtools/shared/tests/unit/test_fetch-http.js diff --git a/devtools/shared/tests/xpcshell/test_fetch-resource.js b/devtools/shared/tests/unit/test_fetch-resource.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_fetch-resource.js rename to devtools/shared/tests/unit/test_fetch-resource.js diff --git a/devtools/shared/tests/xpcshell/test_flatten.js b/devtools/shared/tests/unit/test_flatten.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_flatten.js rename to devtools/shared/tests/unit/test_flatten.js diff --git a/devtools/shared/tests/xpcshell/test_indentation.js b/devtools/shared/tests/unit/test_indentation.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_indentation.js rename to devtools/shared/tests/unit/test_indentation.js diff --git a/devtools/shared/tests/xpcshell/test_independent_loaders.js b/devtools/shared/tests/unit/test_independent_loaders.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_independent_loaders.js rename to devtools/shared/tests/unit/test_independent_loaders.js diff --git a/devtools/shared/tests/xpcshell/test_invisible_loader.js b/devtools/shared/tests/unit/test_invisible_loader.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_invisible_loader.js rename to devtools/shared/tests/unit/test_invisible_loader.js diff --git a/devtools/shared/tests/xpcshell/test_isSet.js b/devtools/shared/tests/unit/test_isSet.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_isSet.js rename to devtools/shared/tests/unit/test_isSet.js diff --git a/devtools/shared/tests/xpcshell/test_pluralForm-english.js b/devtools/shared/tests/unit/test_pluralForm-english.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_pluralForm-english.js rename to devtools/shared/tests/unit/test_pluralForm-english.js diff --git a/devtools/shared/tests/xpcshell/test_pluralForm-makeGetter.js b/devtools/shared/tests/unit/test_pluralForm-makeGetter.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_pluralForm-makeGetter.js rename to devtools/shared/tests/unit/test_pluralForm-makeGetter.js diff --git a/devtools/shared/tests/xpcshell/test_prettifyCSS.js b/devtools/shared/tests/unit/test_prettifyCSS.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_prettifyCSS.js rename to devtools/shared/tests/unit/test_prettifyCSS.js diff --git a/devtools/shared/tests/xpcshell/test_require.js b/devtools/shared/tests/unit/test_require.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_require.js rename to devtools/shared/tests/unit/test_require.js diff --git a/devtools/shared/tests/xpcshell/test_require_lazy.js b/devtools/shared/tests/unit/test_require_lazy.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_require_lazy.js rename to devtools/shared/tests/unit/test_require_lazy.js diff --git a/devtools/shared/tests/xpcshell/test_require_raw.js b/devtools/shared/tests/unit/test_require_raw.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_require_raw.js rename to devtools/shared/tests/unit/test_require_raw.js diff --git a/devtools/shared/tests/xpcshell/test_safeErrorString.js b/devtools/shared/tests/unit/test_safeErrorString.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_safeErrorString.js rename to devtools/shared/tests/unit/test_safeErrorString.js diff --git a/devtools/shared/tests/xpcshell/test_sprintfjs.js b/devtools/shared/tests/unit/test_sprintfjs.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_sprintfjs.js rename to devtools/shared/tests/unit/test_sprintfjs.js diff --git a/devtools/shared/tests/xpcshell/test_stack.js b/devtools/shared/tests/unit/test_stack.js similarity index 100% rename from devtools/shared/tests/xpcshell/test_stack.js rename to devtools/shared/tests/unit/test_stack.js diff --git a/devtools/shared/tests/xpcshell/throwing-module-1.js b/devtools/shared/tests/unit/throwing-module-1.js similarity index 100% rename from devtools/shared/tests/xpcshell/throwing-module-1.js rename to devtools/shared/tests/unit/throwing-module-1.js diff --git a/devtools/shared/tests/xpcshell/throwing-module-2.js b/devtools/shared/tests/unit/throwing-module-2.js similarity index 100% rename from devtools/shared/tests/xpcshell/throwing-module-2.js rename to devtools/shared/tests/unit/throwing-module-2.js diff --git a/devtools/shared/tests/xpcshell/xpcshell.ini b/devtools/shared/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/tests/xpcshell/xpcshell.ini rename to devtools/shared/tests/unit/xpcshell.ini diff --git a/devtools/shared/transport/moz.build b/devtools/shared/transport/moz.build index 0d4cdef127e3..184a9420ecf2 100644 --- a/devtools/shared/transport/moz.build +++ b/devtools/shared/transport/moz.build @@ -4,7 +4,7 @@ # 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 += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] DevToolsModules( 'child-transport.js', diff --git a/devtools/shared/transport/tests/xpcshell/.eslintrc.js b/devtools/shared/transport/tests/unit/.eslintrc.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/.eslintrc.js rename to devtools/shared/transport/tests/unit/.eslintrc.js diff --git a/devtools/shared/transport/tests/xpcshell/head_dbg.js b/devtools/shared/transport/tests/unit/head_dbg.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/head_dbg.js rename to devtools/shared/transport/tests/unit/head_dbg.js diff --git a/devtools/shared/transport/tests/xpcshell/test_bulk_error.js b/devtools/shared/transport/tests/unit/test_bulk_error.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_bulk_error.js rename to devtools/shared/transport/tests/unit/test_bulk_error.js diff --git a/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js b/devtools/shared/transport/tests/unit/test_client_server_bulk.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js rename to devtools/shared/transport/tests/unit/test_client_server_bulk.js diff --git a/devtools/shared/transport/tests/xpcshell/test_dbgsocket.js b/devtools/shared/transport/tests/unit/test_dbgsocket.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_dbgsocket.js rename to devtools/shared/transport/tests/unit/test_dbgsocket.js diff --git a/devtools/shared/transport/tests/xpcshell/test_dbgsocket_connection_drop.js b/devtools/shared/transport/tests/unit/test_dbgsocket_connection_drop.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_dbgsocket_connection_drop.js rename to devtools/shared/transport/tests/unit/test_dbgsocket_connection_drop.js diff --git a/devtools/shared/transport/tests/xpcshell/test_delimited_read.js b/devtools/shared/transport/tests/unit/test_delimited_read.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_delimited_read.js rename to devtools/shared/transport/tests/unit/test_delimited_read.js diff --git a/devtools/shared/transport/tests/xpcshell/test_no_bulk.js b/devtools/shared/transport/tests/unit/test_no_bulk.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_no_bulk.js rename to devtools/shared/transport/tests/unit/test_no_bulk.js diff --git a/devtools/shared/transport/tests/xpcshell/test_packet.js b/devtools/shared/transport/tests/unit/test_packet.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_packet.js rename to devtools/shared/transport/tests/unit/test_packet.js diff --git a/devtools/shared/transport/tests/xpcshell/test_queue.js b/devtools/shared/transport/tests/unit/test_queue.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_queue.js rename to devtools/shared/transport/tests/unit/test_queue.js diff --git a/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js b/devtools/shared/transport/tests/unit/test_transport_bulk.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/test_transport_bulk.js rename to devtools/shared/transport/tests/unit/test_transport_bulk.js diff --git a/devtools/shared/transport/tests/xpcshell/testactors-no-bulk.js b/devtools/shared/transport/tests/unit/testactors-no-bulk.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/testactors-no-bulk.js rename to devtools/shared/transport/tests/unit/testactors-no-bulk.js diff --git a/devtools/shared/transport/tests/xpcshell/testactors.js b/devtools/shared/transport/tests/unit/testactors.js similarity index 100% rename from devtools/shared/transport/tests/xpcshell/testactors.js rename to devtools/shared/transport/tests/unit/testactors.js diff --git a/devtools/shared/transport/tests/xpcshell/xpcshell.ini b/devtools/shared/transport/tests/unit/xpcshell.ini similarity index 100% rename from devtools/shared/transport/tests/xpcshell/xpcshell.ini rename to devtools/shared/transport/tests/unit/xpcshell.ini diff --git a/devtools/shared/webconsole/moz.build b/devtools/shared/webconsole/moz.build index 4c4edcd12a8b..fb267e305dc3 100644 --- a/devtools/shared/webconsole/moz.build +++ b/devtools/shared/webconsole/moz.build @@ -6,7 +6,7 @@ if CONFIG['OS_TARGET'] != 'Android': MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini'] - XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] + XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] # Compute where to put transpiled files into omni.ja package diff --git a/devtools/shared/webconsole/test/xpcshell/.eslintrc.js b/devtools/shared/webconsole/test/unit/.eslintrc.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/.eslintrc.js rename to devtools/shared/webconsole/test/unit/.eslintrc.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_js_property_provider.js b/devtools/shared/webconsole/test/unit/test_js_property_provider.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_js_property_provider.js rename to devtools/shared/webconsole/test/unit/test_js_property_provider.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_network_helper.js b/devtools/shared/webconsole/test/unit/test_network_helper.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_network_helper.js rename to devtools/shared/webconsole/test/unit/test_network_helper.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_security-info-certificate.js b/devtools/shared/webconsole/test/unit/test_security-info-certificate.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_security-info-certificate.js rename to devtools/shared/webconsole/test/unit/test_security-info-certificate.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_security-info-parser.js b/devtools/shared/webconsole/test/unit/test_security-info-parser.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_security-info-parser.js rename to devtools/shared/webconsole/test/unit/test_security-info-parser.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_security-info-protocol-version.js b/devtools/shared/webconsole/test/unit/test_security-info-protocol-version.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_security-info-protocol-version.js rename to devtools/shared/webconsole/test/unit/test_security-info-protocol-version.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_security-info-state.js b/devtools/shared/webconsole/test/unit/test_security-info-state.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_security-info-state.js rename to devtools/shared/webconsole/test/unit/test_security-info-state.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_security-info-static-hpkp.js b/devtools/shared/webconsole/test/unit/test_security-info-static-hpkp.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_security-info-static-hpkp.js rename to devtools/shared/webconsole/test/unit/test_security-info-static-hpkp.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_security-info-weakness-reasons.js b/devtools/shared/webconsole/test/unit/test_security-info-weakness-reasons.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_security-info-weakness-reasons.js rename to devtools/shared/webconsole/test/unit/test_security-info-weakness-reasons.js diff --git a/devtools/shared/webconsole/test/xpcshell/test_throttle.js b/devtools/shared/webconsole/test/unit/test_throttle.js similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/test_throttle.js rename to devtools/shared/webconsole/test/unit/test_throttle.js diff --git a/devtools/shared/webconsole/test/xpcshell/xpcshell.ini b/devtools/shared/webconsole/test/unit/xpcshell.ini similarity index 100% rename from devtools/shared/webconsole/test/xpcshell/xpcshell.ini rename to devtools/shared/webconsole/test/unit/xpcshell.ini diff --git a/devtools/startup/moz.build b/devtools/startup/moz.build index 9eb7821eb276..d578972cdf14 100644 --- a/devtools/startup/moz.build +++ b/devtools/startup/moz.build @@ -23,7 +23,7 @@ XPCOM_MANIFESTS += [ 'components.conf', ] -XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini'] +XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini'] diff --git a/devtools/startup/tests/xpcshell/.eslintrc.js b/devtools/startup/tests/unit/.eslintrc.js similarity index 100% rename from devtools/startup/tests/xpcshell/.eslintrc.js rename to devtools/startup/tests/unit/.eslintrc.js diff --git a/devtools/startup/tests/xpcshell/test_devtools_shim.js b/devtools/startup/tests/unit/test_devtools_shim.js similarity index 100% rename from devtools/startup/tests/xpcshell/test_devtools_shim.js rename to devtools/startup/tests/unit/test_devtools_shim.js diff --git a/devtools/startup/tests/xpcshell/xpcshell.ini b/devtools/startup/tests/unit/xpcshell.ini similarity index 100% rename from devtools/startup/tests/xpcshell/xpcshell.ini rename to devtools/startup/tests/unit/xpcshell.ini