From e1bd58ddb652bbac995add8e5cd3ba3a431f9208 Mon Sep 17 00:00:00 2001
From: Yoshi Huang <allstars.chh@mozilla.com>
Date: Mon, 10 Jul 2017 12:30:10 +0800
Subject: [PATCH] Bug 1377523 - Part 2: fix for browser_toolbox_*. r=pbro

fixed the tests in devtools/client/framework/test/ to not to use data:
URI.
---
 devtools/client/framework/test/browser.ini            |  3 +++
 .../client/framework/test/browser_toolbox_sidebar.js  |  9 +--------
 .../framework/test/browser_toolbox_sidebar_events.js  |  9 +--------
 .../framework/test/browser_toolbox_sidebar_events.xul |  6 ++++++
 .../test/browser_toolbox_sidebar_existing_tabs.js     | 11 +----------
 .../test/browser_toolbox_sidebar_existing_tabs.xul    |  8 ++++++++
 .../test/browser_toolbox_sidebar_toolURL.xul          |  7 +++++++
 7 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 devtools/client/framework/test/browser_toolbox_sidebar_events.xul
 create mode 100644 devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.xul
 create mode 100644 devtools/client/framework/test/browser_toolbox_sidebar_toolURL.xul

diff --git a/devtools/client/framework/test/browser.ini b/devtools/client/framework/test/browser.ini
index 0423e9d2d0d9..2cb1cce9dcdd 100644
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -5,7 +5,10 @@ support-files =
   browser_toolbox_options_disable_js.html
   browser_toolbox_options_disable_js_iframe.html
   browser_toolbox_options_disable_cache.sjs
+  browser_toolbox_sidebar_existing_tabs.xul
+  browser_toolbox_sidebar_events.xul
   browser_toolbox_sidebar_tool.xul
+  browser_toolbox_sidebar_toolURL.xul
   browser_toolbox_window_title_changes_page.html
   browser_toolbox_window_title_frame_select_page.html
   code_binary_search.coffee
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar.js b/devtools/client/framework/test/browser_toolbox_sidebar.js
index 7743362567bc..8f2bf12aa3b4 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar.js
@@ -7,13 +7,6 @@ function test() {
   const Cu = Components.utils;
   let {ToolSidebar} = require("devtools/client/framework/sidebar");
 
-  const toolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                  "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
-                  "<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>" +
-                  "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>" +
-                  "</hbox>" +
-                  "</window>";
-
   const tab1URL = "data:text/html;charset=utf8,<title>1</title><p>1</p>";
   const tab2URL = "data:text/html;charset=utf8,<title>2</title><p>2</p>";
   const tab3URL = "data:text/html;charset=utf8,<title>3</title><p>3</p>";
@@ -26,7 +19,7 @@ function test() {
   let toolDefinition = {
     id: "fakeTool4242",
     visibilityswitch: "devtools.fakeTool4242.enabled",
-    url: toolURL,
+    url: CHROME_URL_ROOT + "browser_toolbox_sidebar_toolURL.xul",
     label: "FAKE TOOL!!!",
     isTargetSupported: () => true,
     build: function (iframeWindow, toolbox) {
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_events.js b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
index 96ef99563051..7dcb680ab3c9 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_events.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_events.js
@@ -7,13 +7,6 @@ function test() {
   const Cu = Components.utils;
   const { ToolSidebar } = require("devtools/client/framework/sidebar");
 
-  const toolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                  "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
-                  "<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>" +
-                  "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>" +
-                  "</hbox>" +
-                  "</window>";
-
   const tab1URL = "data:text/html;charset=utf8,<title>1</title><p>1</p>";
 
   let collectedEvents = [];
@@ -21,7 +14,7 @@ function test() {
   let toolDefinition = {
     id: "testTool1072208",
     visibilityswitch: "devtools.testTool1072208.enabled",
-    url: toolURL,
+    url: CHROME_URL_ROOT + "browser_toolbox_sidebar_events.xul",
     label: "Test tool",
     isTargetSupported: () => true,
     build: function (iframeWindow, toolbox) {
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_events.xul b/devtools/client/framework/test/browser_toolbox_sidebar_events.xul
new file mode 100644
index 000000000000..32762a0ed3ae
--- /dev/null
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_events.xul
@@ -0,0 +1,6 @@
+<?xml version='1.0'?>
+<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>
+<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>
+<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>
+</hbox>
+</window>
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
index 339687e104dc..9ac3a126bae6 100644
--- a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.js
@@ -9,18 +9,9 @@
 
 const {ToolSidebar} = require("devtools/client/framework/sidebar");
 
-const testToolURL = "data:text/xml;charset=utf8,<?xml version='1.0'?>" +
-                "<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>" +
-                "<hbox flex='1'><description flex='1'>test tool</description>" +
-                "<splitter class='devtools-side-splitter'/>" +
-                "<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'>" +
-                "<tabs><tab id='tab1' label='tab 1'></tab><tab id='tab2' label='tab 2'></tab></tabs>" +
-                "<tabpanels flex='1'><tabpanel id='tabpanel1'>tab 1</tabpanel><tabpanel id='tabpanel2'>tab 2</tabpanel></tabpanels>" +
-                "</tabbox></hbox></window>";
-
 const testToolDefinition = {
   id: "testTool",
-  url: testToolURL,
+  url: CHROME_URL_ROOT + "browser_toolbox_sidebar_existing_tabs.xul",
   label: "Test Tool",
   isTargetSupported: () => true,
   build: (iframeWindow, toolbox) => {
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.xul b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.xul
new file mode 100644
index 000000000000..505786b19c7b
--- /dev/null
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_existing_tabs.xul
@@ -0,0 +1,8 @@
+<?xml version='1.0'?>
+<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>
+<hbox flex='1'><description flex='1'>test tool</description>
+<splitter class='devtools-side-splitter'/>
+<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'>
+<tabs><tab id='tab1' label='tab 1'></tab><tab id='tab2' label='tab 2'></tab></tabs>
+<tabpanels flex='1'><tabpanel id='tabpanel1'>tab 1</tabpanel><tabpanel id='tabpanel2'>tab 2</tabpanel></tabpanels>
+</tabbox></hbox></window>
diff --git a/devtools/client/framework/test/browser_toolbox_sidebar_toolURL.xul b/devtools/client/framework/test/browser_toolbox_sidebar_toolURL.xul
new file mode 100644
index 000000000000..4b88e4dd440c
--- /dev/null
+++ b/devtools/client/framework/test/browser_toolbox_sidebar_toolURL.xul
@@ -0,0 +1,7 @@
+<?xml version='1.0'?>
+<window xmlns='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'>
+<hbox flex='1'><description flex='1'>foo</description><splitter class='devtools-side-splitter'/>
+<tabbox flex='1' id='sidebar' class='devtools-sidebar-tabs'><tabs/><tabpanels flex='1'/></tabbox>
+</hbox>
+</window>
+