Bug 988313 - Renaming devtools/styleinspector tests for consistency reasons; r=miker

--HG--
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js => browser/devtools/styleinspector/test/browser_computedview_browser-styles.js
rename : browser/devtools/styleinspector/test/browser_bug589375_keybindings.js => browser/devtools/styleinspector/test/browser_computedview_keybindings_01.js
rename : browser/devtools/styleinspector/test/browser_computedview_bug835808_keyboard_nav.js => browser/devtools/styleinspector/test/browser_computedview_keybindings_02.js
rename : browser/devtools/styleinspector/test/browser_bug913014_matched_expand.js => browser/devtools/styleinspector/test/browser_computedview_matched-selectors-toggle.js
rename : browser/devtools/styleinspector/test/browser_bug683672.js => browser/devtools/styleinspector/test/browser_computedview_matched-selectors_01.js
rename : browser/devtools/styleinspector/test/browser_bug_692400_element_style.js => browser/devtools/styleinspector/test/browser_computedview_matched-selectors_02.js
rename : browser/devtools/styleinspector/test/browser_bug722196_property_view_media_queries.js => browser/devtools/styleinspector/test/browser_computedview_media-queries.js
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js => browser/devtools/styleinspector/test/browser_computedview_no-results-placeholder.js
rename : browser/devtools/styleinspector/test/browser_computedview_original_source_link.js => browser/devtools/styleinspector/test/browser_computedview_original-source-link.js
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js => browser/devtools/styleinspector/test/browser_computedview_search-filter.js
rename : browser/devtools/styleinspector/test/browser_computedview_copy.js => browser/devtools/styleinspector/test/browser_computedview_select-and-copy-styles.js
rename : browser/devtools/styleinspector/test/browser_computedview_734259_style_editor_link.js => browser/devtools/styleinspector/test/browser_computedview_style-editor-link.js
rename : browser/devtools/styleinspector/test/browser_ruleview_add_property_01.js => browser/devtools/styleinspector/test/browser_ruleview_add-property-and-reselect.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor_changedvalues_01.js => browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_01.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor_changedvalues_03.js => browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_02.js
rename : browser/devtools/styleinspector/test/browser_ruleview_cancel.js => browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_03.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor_changedvalues_02.js => browser/devtools/styleinspector/test/browser_ruleview_add-property_01.js
rename : browser/devtools/styleinspector/test/browser_ruleview_add_property_02.js => browser/devtools/styleinspector/test/browser_ruleview_add-property_02.js
rename : browser/devtools/styleinspector/test/browser_bug940500_rule_view_pick_gradient_color.js => browser/devtools/styleinspector/test/browser_ruleview_colorpicker-edit-gradient.js
rename : browser/devtools/styleinspector/test/browser_bug893965_css_property_completion_existing_property.js => browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_01.js
rename : browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_existing_property_value_pair.js => browser/devtools/styleinspector/test/browser_ruleview_completion-existing-property_02.js
rename : browser/devtools/styleinspector/test/browser_bug893965_css_property_completion_new_property.js => browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_01.js
rename : browser/devtools/styleinspector/test/browser_bug894376_css_value_completion_new_property_value_pair.js => browser/devtools/styleinspector/test/browser_ruleview_completion-new-property_02.js
rename : browser/devtools/styleinspector/test/browser_ruleview_bug_902966_revert_value_on_ESC.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js
rename : browser/devtools/styleinspector/test/browser_bug722691_rule_view_increment.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property-increments.js
rename : browser/devtools/styleinspector/test/browser_ruleview_manipulation.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property-order.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor_changedvalues_04.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js
rename : browser/devtools/styleinspector/test/browser_ruleview_edit.js => browser/devtools/styleinspector/test/browser_ruleview_edit-property_02.js
rename : browser/devtools/styleinspector/test/browser_ruleview_focus.js => browser/devtools/styleinspector/test/browser_ruleview_keybindings.js
rename : browser/devtools/styleinspector/test/browser_bug970532_mathml_element.js => browser/devtools/styleinspector/test/browser_ruleview_mathml-element.js
rename : browser/devtools/styleinspector/test/browser_bug722196_rule_view_media_queries.js => browser/devtools/styleinspector/test/browser_ruleview_media-queries.js
rename : browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_02.js => browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js
rename : browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_03.js => browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-priority.js
rename : browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_04.js => browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_01.js
rename : browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_05.js => browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-unfinished_02.js
rename : browser/devtools/styleinspector/test/browser_ruleview_original_source_link.js => browser/devtools/styleinspector/test/browser_ruleview_original-source-link.js
rename : browser/devtools/styleinspector/test/browser_ruleview_pseudoelement.js => browser/devtools/styleinspector/test/browser_ruleview_pseudo-element.js
rename : browser/devtools/styleinspector/test/browser_ruleview_copy.js => browser/devtools/styleinspector/test/browser_ruleview_select-and-copy-styles.js
rename : browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.js => browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_677930_urls_clickable.js => browser/devtools/styleinspector/test/browser_ruleview_urls-clickable.js
rename : browser/devtools/styleinspector/test/browser_bug942297_user_property_reset.js => browser/devtools/styleinspector/test/browser_ruleview_user-property-reset.js
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet.js => browser/devtools/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js
rename : browser/devtools/styleinspector/test/browser_csslogic_inherited.js => browser/devtools/styleinspector/test/browser_styleinspector_csslogic-inherited-properties.js
rename : browser/devtools/styleinspector/test/browser_bug_592743_specificity.js => browser/devtools/styleinspector/test/browser_styleinspector_csslogic-specificity.js
rename : browser/devtools/styleinspector/test/browser_ruleview_editor.js => browser/devtools/styleinspector/test/browser_styleinspector_inplace-editor.js
rename : browser/devtools/styleinspector/test/browser_styleinspector_outputparser.js => browser/devtools/styleinspector/test/browser_styleinspector_output-parser.js
rename : browser/devtools/styleinspector/test/browser_bug765105_background_image_tooltip.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-background-image.js
rename : browser/devtools/styleinspector/test/browser_bug946331_close_tooltip_on_new_selection.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-closes-on-new-selection.js
rename : browser/devtools/styleinspector/test/browser_bug702577_fontfamily_tooltip_longhand.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-longhand-fontfamily.js
rename : browser/devtools/styleinspector/test/browser_bug702577_fontfamily_tooltip_shorthand.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-shorthand-fontfamily.js
rename : browser/devtools/styleinspector/test/browser_bug726427_csstransform_tooltip.js => browser/devtools/styleinspector/test/browser_styleinspector_tooltip-transform.js
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet.html => browser/devtools/styleinspector/test/doc_content_stylesheet.html
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet.xul => browser/devtools/styleinspector/test/doc_content_stylesheet.xul
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_imported.css => browser/devtools/styleinspector/test/doc_content_stylesheet_imported.css
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_imported2.css => browser/devtools/styleinspector/test/doc_content_stylesheet_imported2.css
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_linked.css => browser/devtools/styleinspector/test/doc_content_stylesheet_linked.css
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_script.css => browser/devtools/styleinspector/test/doc_content_stylesheet_script.css
rename : browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_xul.css => browser/devtools/styleinspector/test/doc_content_stylesheet_xul.css
rename : browser/devtools/styleinspector/test/browser_bug683672.html => browser/devtools/styleinspector/test/doc_matched_selectors.html
rename : browser/devtools/styleinspector/test/browser_bug722196_identify_media_queries.html => browser/devtools/styleinspector/test/doc_media_queries.html
rename : browser/devtools/styleinspector/test/browser_ruleview_pseudoelement.html => browser/devtools/styleinspector/test/doc_pseudoelement.html
rename : browser/devtools/styleinspector/test/sourcemaps.css => browser/devtools/styleinspector/test/doc_sourcemaps.css
rename : browser/devtools/styleinspector/test/sourcemaps.css.map => browser/devtools/styleinspector/test/doc_sourcemaps.css.map
rename : browser/devtools/styleinspector/test/sourcemaps.html => browser/devtools/styleinspector/test/doc_sourcemaps.html
rename : browser/devtools/styleinspector/test/sourcemaps.scss => browser/devtools/styleinspector/test/doc_sourcemaps.scss
rename : browser/devtools/styleinspector/test/browser_ruleview_734259_style_editor_link.css => browser/devtools/styleinspector/test/doc_style_editor_link.css
rename : browser/devtools/styleinspector/test/test-image.png => browser/devtools/styleinspector/test/doc_test_image.png
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_677930_urls_clickable/browser_styleinspector_bug_677930_urls_clickable.css => browser/devtools/styleinspector/test/doc_urls_clickable.css
rename : browser/devtools/styleinspector/test/browser_styleinspector_bug_677930_urls_clickable.html => browser/devtools/styleinspector/test/doc_urls_clickable.html

browser/devtools/styleinspector/test/browser.ini

@@ -1,90 +1,90 @@
 [DEFAULT]
 skip-if = e10s # Bug ?????? - devtools tests disabled with e10s
 support-files =
+  doc_content_stylesheet.html
+  doc_content_stylesheet.xul
+  doc_content_stylesheet_imported.css
+  doc_content_stylesheet_imported2.css
+  doc_content_stylesheet_linked.css
+  doc_content_stylesheet_script.css
+  doc_content_stylesheet_xul.css
+  doc_matched_selectors.html
+  doc_media_queries.html
+  doc_pseudoelement.html
+  doc_sourcemaps.css
+  doc_sourcemaps.css.map
+  doc_sourcemaps.html
+  doc_sourcemaps.scss
+  doc_style_editor_link.css
+  doc_test_image.png
+  doc_urls_clickable.css
+  doc_urls_clickable.html
   head.js
-  browser_bug722196_identify_media_queries.html
-  browser_styleinspector_bug_677930_urls_clickable/browser_styleinspector_bug_677930_urls_clickable.css
-  browser_bug683672.html
-  browser_bug705707_is_content_stylesheet.html
-  browser_bug705707_is_content_stylesheet_imported.css
-  browser_bug705707_is_content_stylesheet_imported2.css
-  browser_bug705707_is_content_stylesheet_linked.css
-  browser_bug705707_is_content_stylesheet_script.css
-  browser_bug705707_is_content_stylesheet.xul
-  browser_bug705707_is_content_stylesheet_xul.css
-  test-image.png
-  browser_styleinspector_bug_677930_urls_clickable.html
-  browser_ruleview_pseudoelement.html
-  sourcemaps.html
-  sourcemaps.css
-  sourcemaps.css.map
-  sourcemaps.scss
-  browser_ruleview_734259_style_editor_link.css
 
-[browser_bug683672.js]
-[browser_styleinspector_bug_672746_default_styles.js]
-[browser_styleinspector_bug_672744_search_filter.js]
-[browser_bug589375_keybindings.js]
-[browser_styleinspector_bug_689759_no_results_placeholder.js]
-[browser_bug_692400_element_style.js]
-[browser_csslogic_inherited.js]
-[browser_ruleview_734259_style_editor_link.js]
-[browser_ruleview_editor.js]
-[browser_ruleview_editor_changedvalues_01.js]
-[browser_ruleview_editor_changedvalues_02.js]
-[browser_ruleview_editor_changedvalues_03.js]
-[browser_ruleview_editor_changedvalues_04.js]
-[browser_ruleview_copy.js]
-[browser_ruleview_focus.js]
-[browser_ruleview_inherit.js]
-[browser_ruleview_manipulation.js]
-[browser_ruleview_multiple_properties_01.js]
-[browser_ruleview_multiple_properties_02.js]
-[browser_ruleview_multiple_properties_03.js]
-[browser_ruleview_multiple_properties_04.js]
-[browser_ruleview_multiple_properties_05.js]
-[browser_ruleview_multiple_properties_06.js]
-[browser_ruleview_override.js]
-[browser_ruleview_edit.js]
-[browser_ruleview_content.js]
-[browser_ruleview_cancel.js]
-[browser_ruleview_refresh-on-attribute-change_01.js]
-[browser_ruleview_refresh-on-attribute-change_02.js]
-[browser_ruleview_livepreview.js]
-[browser_bug705707_is_content_stylesheet.js]
-[browser_bug722196_property_view_media_queries.js]
-[browser_bug722196_rule_view_media_queries.js]
-[browser_bug_592743_specificity.js]
-[browser_bug722691_rule_view_increment.js]
-[browser_computedview_734259_style_editor_link.js]
-[browser_computedview_copy.js]
-[browser_styleinspector_bug_677930_urls_clickable.js]
-[browser_bug893965_css_property_completion_new_property.js]
-[browser_bug893965_css_property_completion_existing_property.js]
-[browser_bug894376_css_value_completion_new_property_value_pair.js]
-[browser_bug894376_css_value_completion_existing_property_value_pair.js]
-[browser_ruleview_bug_902966_revert_value_on_ESC.js]
-[browser_ruleview_pseudoelement.js]
-[browser_computedview_bug835808_keyboard_nav.js]
-[browser_bug913014_matched_expand.js]
-[browser_bug765105_background_image_tooltip.js]
-[browser_bug726427_csstransform_tooltip.js]
-[browser_bug702577_fontfamily_tooltip_shorthand.js]
-[browser_bug702577_fontfamily_tooltip_longhand.js]
-[browser_bug940500_rule_view_pick_gradient_color.js]
-[browser_ruleview_original_source_link.js]
-[browser_computedview_original_source_link.js]
-[browser_bug946331_close_tooltip_on_new_selection.js]
-[browser_bug942297_user_property_reset.js]
-[browser_styleinspector_outputparser.js]
-[browser_bug970532_mathml_element.js]
-[browser_ruleview_colorpicker-swatch-displayed.js]
-[browser_ruleview_colorpicker-appears-on-swatch-click.js]
-[browser_ruleview_colorpicker-hides-on-tooltip.js]
-[browser_ruleview_colorpicker-revert-on-ESC.js]
-[browser_ruleview_colorpicker-commit-on-ENTER.js]
+[browser_computedview_browser-styles.js]
+[browser_computedview_keybindings_01.js]
+[browser_computedview_keybindings_02.js]
+[browser_computedview_matched-selectors-toggle.js]
+[browser_computedview_matched-selectors_01.js]
+[browser_computedview_matched-selectors_02.js]
+[browser_computedview_media-queries.js]
+[browser_computedview_no-results-placeholder.js]
+[browser_computedview_original-source-link.js]
+[browser_computedview_search-filter.js]
+[browser_computedview_select-and-copy-styles.js]
+[browser_computedview_style-editor-link.js]
+[browser_ruleview_add-property-and-reselect.js]
+[browser_ruleview_add-property-cancel_01.js]
+[browser_ruleview_add-property-cancel_02.js]
+[browser_ruleview_add-property-cancel_03.js]
+[browser_ruleview_add-property_01.js]
+[browser_ruleview_add-property_02.js]
 [browser_ruleview_colorpicker-and-image-tooltip_01.js]
 [browser_ruleview_colorpicker-and-image-tooltip_02.js]
+[browser_ruleview_colorpicker-appears-on-swatch-click.js]
+[browser_ruleview_colorpicker-commit-on-ENTER.js]
+[browser_ruleview_colorpicker-edit-gradient.js]
+[browser_ruleview_colorpicker-hides-on-tooltip.js]
 [browser_ruleview_colorpicker-multiple-changes.js]
-[browser_ruleview_add_property_01.js]
-[browser_ruleview_add_property_02.js]
+[browser_ruleview_colorpicker-revert-on-ESC.js]
+[browser_ruleview_colorpicker-swatch-displayed.js]
+[browser_ruleview_completion-existing-property_01.js]
+[browser_ruleview_completion-existing-property_02.js]
+[browser_ruleview_completion-new-property_01.js]
+[browser_ruleview_completion-new-property_02.js]
+[browser_ruleview_content.js]
+[browser_ruleview_edit-property-commit.js]
+[browser_ruleview_edit-property-increments.js]
+[browser_ruleview_edit-property-order.js]
+[browser_ruleview_edit-property_01.js]
+[browser_ruleview_edit-property_02.js]
+[browser_ruleview_inherit.js]
+[browser_ruleview_keybindings.js]
+[browser_ruleview_livepreview.js]
+[browser_ruleview_mathml-element.js]
+[browser_ruleview_media-queries.js]
+[browser_ruleview_multiple-properties-duplicates.js]
+[browser_ruleview_multiple-properties-priority.js]
+[browser_ruleview_multiple-properties-unfinished_01.js]
+[browser_ruleview_multiple-properties-unfinished_02.js]
+[browser_ruleview_multiple_properties_01.js]
+[browser_ruleview_multiple_properties_02.js]
+[browser_ruleview_original-source-link.js]
+[browser_ruleview_override.js]
+[browser_ruleview_pseudo-element.js]
+[browser_ruleview_refresh-on-attribute-change_01.js]
+[browser_ruleview_refresh-on-attribute-change_02.js]
+[browser_ruleview_select-and-copy-styles.js]
+[browser_ruleview_style-editor-link.js]
+[browser_ruleview_urls-clickable.js]
+[browser_ruleview_user-property-reset.js]
+[browser_styleinspector_csslogic-content-stylesheets.js]
+[browser_styleinspector_csslogic-inherited-properties.js]
+[browser_styleinspector_csslogic-specificity.js]
+[browser_styleinspector_inplace-editor.js]
+[browser_styleinspector_output-parser.js]
+[browser_styleinspector_tooltip-background-image.js]
+[browser_styleinspector_tooltip-closes-on-new-selection.js]
+[browser_styleinspector_tooltip-longhand-fontfamily.js]
+[browser_styleinspector_tooltip-shorthand-fontfamily.js]
+[browser_styleinspector_tooltip-transform.js]

browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_imported.css

@@ -1,5 +0,0 @@
-@import url("./browser_bug705707_is_content_stylesheet_imported2.css");
-
-#target {
-  text-decoration: underline;
-}

browser/devtools/styleinspector/test/browser_bug705707_is_content_stylesheet_script.css

@@ -1,5 +0,0 @@
-@import url("./browser_bug705707_is_content_stylesheet_imported.css");
-
-table  {
-  opacity: 1;
-}

browser/devtools/styleinspector/test/browser_computedview_matched-selectors_01.js

@@ -7,7 +7,7 @@
 // Checking selector counts, matched rules and titles in the computed-view
 
 const {PropertyView} = devtools.require("devtools/styleinspector/computed-view");
-const TEST_URI = TEST_URL_ROOT + "browser_bug683672.html";
+const TEST_URI = TEST_URL_ROOT + "doc_matched_selectors.html";
 
 let test = asyncTest(function*() {
   yield addTab(TEST_URI);

browser/devtools/styleinspector/test/browser_computedview_media-queries.js

@@ -7,7 +7,7 @@
 // Tests that we correctly display appropriate media query titles in the
 // property view.
 
-const TEST_URI = TEST_URL_ROOT + "browser_bug722196_identify_media_queries.html";
+const TEST_URI = TEST_URL_ROOT + "doc_media_queries.html";
 
 let {PropertyView} = devtools.require("devtools/styleinspector/computed-view");
 let {CssLogic} = devtools.require("devtools/styleinspector/css-logic");

browser/devtools/styleinspector/test/browser_computedview_original-source-link.js

@@ -7,10 +7,10 @@
 // Test that the computed view shows the original source link when source maps
 // are enabled
 
-const TESTCASE_URI = TEST_URL_ROOT_SSL + "sourcemaps.html";
+const TESTCASE_URI = TEST_URL_ROOT_SSL + "doc_sourcemaps.html";
 const PREF = "devtools.styleeditor.source-maps-enabled";
-const SCSS_LOC = "sourcemaps.scss:4";
-const CSS_LOC = "sourcemaps.css:1";
+const SCSS_LOC = "doc_sourcemaps.scss:4";
+const CSS_LOC = "doc_sourcemaps.css:1";
 
 let test = asyncTest(function*() {
   info("Turning the pref " + PREF + " on");
@@ -45,7 +45,7 @@ let test = asyncTest(function*() {
 });
 
 function* testClickingLink(toolbox, view) {
-  let onEditor = waitForStyleEditor(toolbox, "sourcemaps.scss");
+  let onEditor = waitForStyleEditor(toolbox, "doc_sourcemaps.scss");
 
   info("Clicking the computedview stylesheet link");
   let link = getComputedViewLinkByIndex(view, 0);

browser/devtools/styleinspector/test/browser_ruleview_add-property-and-reselect.js

@@ -7,7 +7,7 @@
 // Tests that adding properties to rules work and reselecting the element still
 // show them
 
-const TEST_URI = TEST_URL_ROOT + "browser_bug705707_is_content_stylesheet.html";
+const TEST_URI = TEST_URL_ROOT + "doc_content_stylesheet.html";
 
 let test = asyncTest(function*() {
   yield addTab(TEST_URI);

browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_01.js

@@ -6,7 +6,7 @@
 
 // Testing various inplace-editor behaviors in the rule-view
 
-let TEST_URL = 'url("' + TEST_URL_ROOT + 'test-image.png")';
+let TEST_URL = 'url("' + TEST_URL_ROOT + 'doc_test_image.png")';
 let PAGE_CONTENT = [
   '<style type="text/css">',
   '  #testid {',

browser/devtools/styleinspector/test/browser_ruleview_add-property-cancel_02.js

@@ -8,7 +8,7 @@
 // FIXME: To be split in several test files, and some of the inplace-editor
 // focus/blur/commit/revert stuff should be factored out in head.js
 
-let TEST_URL = 'url("' + TEST_URL_ROOT + 'test-image.png")';
+let TEST_URL = 'url("' + TEST_URL_ROOT + 'doc_test_image.png")';
 let PAGE_CONTENT = [
   '<style type="text/css">',
   '  #testid {',

browser/devtools/styleinspector/test/browser_ruleview_add-property_01.js

@@ -8,7 +8,7 @@
 // FIXME: To be split in several test files, and some of the inplace-editor
 // focus/blur/commit/revert stuff should be factored out in head.js
 
-let TEST_URL = 'url("' + TEST_URL_ROOT + 'test-image.png")';
+let TEST_URL = 'url("' + TEST_URL_ROOT + 'doc_test_image.png")';
 let PAGE_CONTENT = [
   '<style type="text/css">',
   '  #testid {',

browser/devtools/styleinspector/test/browser_ruleview_edit-property_01.js

@@ -8,7 +8,7 @@
 // FIXME: To be split in several test files, and some of the inplace-editor
 // focus/blur/commit/revert stuff should be factored out in head.js
 
-let TEST_URL = 'url("' + TEST_URL_ROOT + 'test-image.png")';
+let TEST_URL = 'url("' + TEST_URL_ROOT + 'doc_test_image.png")';
 let PAGE_CONTENT = [
   '<style type="text/css">',
   '  #testid {',

browser/devtools/styleinspector/test/browser_ruleview_media-queries.js

@@ -7,7 +7,7 @@
 // Tests that we correctly display appropriate media query titles in the
 // rule view.
 
-const TEST_URI = TEST_URL_ROOT + "browser_bug722196_identify_media_queries.html";
+const TEST_URI = TEST_URL_ROOT + "doc_media_queries.html";
 
 let test = asyncTest(function*() {
   yield addTab(TEST_URI);

browser/devtools/styleinspector/test/browser_ruleview_multiple-properties-duplicates.js

@@ -0,0 +1,54 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test that the rule-view behaves correctly when entering mutliple and/or
+// unfinished properties/values in inplace-editors
+
+let test = asyncTest(function*() {
+  yield addTab("data:text/html,test rule view user changes");
+  content.document.body.innerHTML = "<h1>Testing Multiple Properties</h1>";
+  let {toolbox, inspector, view} = yield openRuleView();
+
+  info("Creating the test element");
+  let newElement = content.document.createElement("div");
+  newElement.textContent = "Test Element";
+  content.document.body.appendChild(newElement);
+  yield selectNode(newElement, inspector);
+  let ruleEditor = view.element.children[0]._ruleEditor;
+
+  yield testCreateNewMultiDuplicates(inspector, ruleEditor);
+});
+
+function* testCreateNewMultiDuplicates(inspector, ruleEditor) {
+  yield createNewRuleViewProperty(ruleEditor,
+    "color:red;color:orange;color:yellow;color:green;color:blue;color:indigo;color:violet;");
+
+  is(ruleEditor.rule.textProps.length, 7, "Should have created new text properties.");
+  is(ruleEditor.propertyList.children.length, 8, "Should have created new property editors.");
+
+  is(ruleEditor.rule.textProps[0].name, "color", "Should have correct property name");
+  is(ruleEditor.rule.textProps[0].value, "red", "Should have correct property value");
+
+  is(ruleEditor.rule.textProps[1].name, "color", "Should have correct property name");
+  is(ruleEditor.rule.textProps[1].value, "orange", "Should have correct property value");
+
+  is(ruleEditor.rule.textProps[2].name, "color", "Should have correct property name");
+  is(ruleEditor.rule.textProps[2].value, "yellow", "Should have correct property value");
+
+  is(ruleEditor.rule.textProps[3].name, "color", "Should have correct property name");
+  is(ruleEditor.rule.textProps[3].value, "green", "Should have correct property value");
+
+  is(ruleEditor.rule.textProps[4].name, "color", "Should have correct property name");
+  is(ruleEditor.rule.textProps[4].value, "blue", "Should have correct property value");
+
+  is(ruleEditor.rule.textProps[5].name, "color", "Should have correct property name");
+  is(ruleEditor.rule.textProps[5].value, "indigo", "Should have correct property value");
+
+  is(ruleEditor.rule.textProps[6].name, "color", "Should have correct property name");
+  is(ruleEditor.rule.textProps[6].value, "violet", "Should have correct property value");
+
+  yield inspector.once("inspector-updated");
+}

browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_02.js

@@ -19,36 +19,31 @@ let test = asyncTest(function*() {
   yield selectNode(newElement, inspector);
   let ruleEditor = view.element.children[0]._ruleEditor;
 
-  yield testCreateNewMultiDuplicates(inspector, ruleEditor);
+  yield testMultiValues(inspector, ruleEditor, view);
 });
 
-function* testCreateNewMultiDuplicates(inspector, ruleEditor) {
-  yield createNewRuleViewProperty(ruleEditor,
-    "color:red;color:orange;color:yellow;color:green;color:blue;color:indigo;color:violet;");
+function* testMultiValues(inspector, ruleEditor, view) {
+  yield createNewRuleViewProperty(ruleEditor, "width:");
 
-  is(ruleEditor.rule.textProps.length, 7, "Should have created new text properties.");
-  is(ruleEditor.propertyList.children.length, 8, "Should have created new property editors.");
+  is(ruleEditor.rule.textProps.length, 1, "Should have created a new text property.");
+  is(ruleEditor.propertyList.children.length, 1, "Should have created a property editor.");
 
-  is(ruleEditor.rule.textProps[0].name, "color", "Should have correct property name");
-  is(ruleEditor.rule.textProps[0].value, "red", "Should have correct property value");
+  // Value is focused, lets add multiple rules here and make sure they get added
+  let valueEditor = ruleEditor.propertyList.children[0].querySelector("input");
+  valueEditor.value = "height: 10px;color:blue"
+  EventUtils.synthesizeKey("VK_RETURN", {}, view.doc.defaultView);
+
+  is(ruleEditor.rule.textProps.length, 2, "Should have added the changed value.");
+  is(ruleEditor.propertyList.children.length, 3, "Should have added the changed value editor.");
+
+  EventUtils.synthesizeKey("VK_ESCAPE", {}, view.doc.defaultView);
+  is(ruleEditor.propertyList.children.length, 2, "Should have removed the value editor.");
+
+  is(ruleEditor.rule.textProps[0].name, "width", "Should have correct property name");
+  is(ruleEditor.rule.textProps[0].value, "height: 10px", "Should have correct property value");
 
   is(ruleEditor.rule.textProps[1].name, "color", "Should have correct property name");
-  is(ruleEditor.rule.textProps[1].value, "orange", "Should have correct property value");
-
-  is(ruleEditor.rule.textProps[2].name, "color", "Should have correct property name");
-  is(ruleEditor.rule.textProps[2].value, "yellow", "Should have correct property value");
-
-  is(ruleEditor.rule.textProps[3].name, "color", "Should have correct property name");
-  is(ruleEditor.rule.textProps[3].value, "green", "Should have correct property value");
-
-  is(ruleEditor.rule.textProps[4].name, "color", "Should have correct property name");
-  is(ruleEditor.rule.textProps[4].value, "blue", "Should have correct property value");
-
-  is(ruleEditor.rule.textProps[5].name, "color", "Should have correct property name");
-  is(ruleEditor.rule.textProps[5].value, "indigo", "Should have correct property value");
-
-  is(ruleEditor.rule.textProps[6].name, "color", "Should have correct property name");
-  is(ruleEditor.rule.textProps[6].value, "violet", "Should have correct property value");
+  is(ruleEditor.rule.textProps[1].value, "blue", "Should have correct property value");
 
   yield inspector.once("inspector-updated");
-}
+}

browser/devtools/styleinspector/test/browser_ruleview_multiple_properties_06.js

@@ -1,49 +0,0 @@
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Test that the rule-view behaves correctly when entering mutliple and/or
-// unfinished properties/values in inplace-editors
-
-let test = asyncTest(function*() {
-  yield addTab("data:text/html,test rule view user changes");
-  content.document.body.innerHTML = "<h1>Testing Multiple Properties</h1>";
-  let {toolbox, inspector, view} = yield openRuleView();
-
-  info("Creating the test element");
-  let newElement = content.document.createElement("div");
-  newElement.textContent = "Test Element";
-  content.document.body.appendChild(newElement);
-  yield selectNode(newElement, inspector);
-  let ruleEditor = view.element.children[0]._ruleEditor;
-
-  yield testMultiValues(inspector, ruleEditor, view);
-});
-
-function* testMultiValues(inspector, ruleEditor, view) {
-  yield createNewRuleViewProperty(ruleEditor, "width:");
-
-  is(ruleEditor.rule.textProps.length, 1, "Should have created a new text property.");
-  is(ruleEditor.propertyList.children.length, 1, "Should have created a property editor.");
-
-  // Value is focused, lets add multiple rules here and make sure they get added
-  let valueEditor = ruleEditor.propertyList.children[0].querySelector("input");
-  valueEditor.value = "height: 10px;color:blue"
-  EventUtils.synthesizeKey("VK_RETURN", {}, view.doc.defaultView);
-
-  is(ruleEditor.rule.textProps.length, 2, "Should have added the changed value.");
-  is(ruleEditor.propertyList.children.length, 3, "Should have added the changed value editor.");
-
-  EventUtils.synthesizeKey("VK_ESCAPE", {}, view.doc.defaultView);
-  is(ruleEditor.propertyList.children.length, 2, "Should have removed the value editor.");
-
-  is(ruleEditor.rule.textProps[0].name, "width", "Should have correct property name");
-  is(ruleEditor.rule.textProps[0].value, "height: 10px", "Should have correct property value");
-
-  is(ruleEditor.rule.textProps[1].name, "color", "Should have correct property name");
-  is(ruleEditor.rule.textProps[1].value, "blue", "Should have correct property value");
-
-  yield inspector.once("inspector-updated");
-}

browser/devtools/styleinspector/test/browser_ruleview_original-source-link.js

@@ -7,10 +7,10 @@
 // Test that the stylesheet links in the rule view are correct when source maps
 // are involved
 
-const TESTCASE_URI = TEST_URL_ROOT + "sourcemaps.html";
+const TESTCASE_URI = TEST_URL_ROOT + "doc_sourcemaps.html";
 const PREF = "devtools.styleeditor.source-maps-enabled";
-const SCSS_LOC = "sourcemaps.scss:4";
-const CSS_LOC = "sourcemaps.css:1";
+const SCSS_LOC = "doc_sourcemaps.scss:4";
+const CSS_LOC = "doc_sourcemaps.css:1";
 
 let test = asyncTest(function*() {
   info("Setting the " + PREF +  " pref to true");
@@ -68,7 +68,7 @@ function checkDisplayedStylesheet(toolbox) {
 
 function editorSelected(editor) {
   let href = editor.styleSheet.href;
-  ok(href.endsWith("sourcemaps.scss"), "selected stylesheet is correct one");
+  ok(href.endsWith("doc_sourcemaps.scss"), "selected stylesheet is correct one");
 
   let {line, col} = editor.sourceEditor.getCursor();
   is(line, 3, "cursor is at correct line number in original source");

browser/devtools/styleinspector/test/browser_ruleview_pseudo-element.js

@@ -6,7 +6,7 @@
 
 // Test that pseudoelements are displayed correctly in the rule view
 
-const TEST_URI = TEST_URL_ROOT + "browser_ruleview_pseudoelement.html";
+const TEST_URI = TEST_URL_ROOT + "doc_pseudoelement.html";
 
 let test = asyncTest(function*() {
   yield addTab(TEST_URI);

browser/devtools/styleinspector/test/browser_ruleview_style-editor-link.js

@@ -11,7 +11,7 @@ const STYLESHEET_URL = "data:text/css,"+encodeURIComponent(
    "color: blue",
    "}"].join("\n"));
 
-const EXTERNAL_STYLESHEET_FILE_NAME = "browser_ruleview_734259_style_editor_link.css"
+const EXTERNAL_STYLESHEET_FILE_NAME = "doc_style_editor_link.css";
 const EXTERNAL_STYLESHEET_URL = TEST_URL_ROOT + EXTERNAL_STYLESHEET_FILE_NAME;
 
 const DOCUMENT_URL = "data:text/html,"+encodeURIComponent(

browser/devtools/styleinspector/test/browser_ruleview_urls-clickable.js

@@ -6,9 +6,8 @@
 
 // Tests to make sure that URLs are clickable in the rule view
 
-const TEST_URI = TEST_URL_ROOT +
-                 "browser_styleinspector_bug_677930_urls_clickable.html";
-const TEST_IMAGE = TEST_URL_ROOT + "test-image.png";
+const TEST_URI = TEST_URL_ROOT + "doc_urls_clickable.html";
+const TEST_IMAGE = TEST_URL_ROOT + "doc_test_image.png";
 const BASE_64_URL = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==";
 
 let test = asyncTest(function*() {

browser/devtools/styleinspector/test/browser_styleinspector_csslogic-content-stylesheets.js

@@ -6,8 +6,8 @@
 
 // Check stylesheets on HMTL and XUL document
 
-const TEST_URI_HTML = TEST_URL_ROOT + "browser_bug705707_is_content_stylesheet.html";
-const TEST_URI_XUL = TEST_URL_ROOT + "browser_bug705707_is_content_stylesheet.xul";
+const TEST_URI_HTML = TEST_URL_ROOT + "doc_content_stylesheet.html";
+const TEST_URI_XUL = TEST_URL_ROOT + "doc_content_stylesheet.xul";
 const XUL_URI = Cc["@mozilla.org/network/io-service;1"]
                 .getService(Ci.nsIIOService)
                 .newURI(TEST_URI_XUL, null, null);
@@ -63,7 +63,7 @@ function checkSheets(target) {
     let isContentSheet = CssLogic.isContentStylesheet(sheet);
 
     if (!sheet.href ||
-        /browser_bug705707_is_content_stylesheet_/.test(sheet.href)) {
+        /doc_content_stylesheet_/.test(sheet.href)) {
       ok(isContentSheet, sheet.href + " identified as content stylesheet");
     } else {
       ok(!isContentSheet, sheet.href + " identified as non-content stylesheet");

browser/devtools/styleinspector/test/doc_content_stylesheet.html

@@ -2,7 +2,7 @@
 <head>
   <title>test</title>
 
-  <link href="./browser_bug705707_is_content_stylesheet_linked.css" rel="stylesheet" type="text/css">
+  <link href="./doc_content_stylesheet_linked.css" rel="stylesheet" type="text/css">
 
   <script>
     // Load script.css
@@ -10,7 +10,7 @@
       var link = document.createElement('link');
       link.rel = 'stylesheet';
       link.type = 'text/css';
-      link.href = "./browser_bug705707_is_content_stylesheet_script.css";
+      link.href = "./doc_content_stylesheet_script.css";
       document.getElementsByTagName('head')[0].appendChild(link);
     }
   </script>

browser/devtools/styleinspector/test/doc_content_stylesheet.xul

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
-<?xml-stylesheet href="./browser_bug705707_is_content_stylesheet_xul.css"
+<?xml-stylesheet href="./doc_content_stylesheet_xul.css"
                  type="text/css"?>
 <!DOCTYPE window>
 <window id="testwindow" xmlns:html="http://www.w3.org/1999/xhtml"

browser/devtools/styleinspector/test/doc_content_stylesheet_imported.css

@@ -0,0 +1,5 @@
+@import url("./doc_content_stylesheet_imported2.css");
+
+#target {
+  text-decoration: underline;
+}

browser/devtools/styleinspector/test/doc_content_stylesheet_script.css

@@ -0,0 +1,5 @@
+@import url("./doc_content_stylesheet_imported.css");
+
+table  {
+  opacity: 1;
+}

browser/devtools/styleinspector/test/doc_sourcemaps.css

@@ -4,4 +4,4 @@ div {
 span {
   background-color: #EEE; }
 
-/*# sourceMappingURL=sourcemaps.css.map */
+/*# sourceMappingURL=doc_sourcemaps.css.map */

browser/devtools/styleinspector/test/doc_sourcemaps.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
 "mappings": "AAGA,GAAI;EACF,KAAK,EAHU,OAAI;;AAMrB,IAAK;EACH,gBAAgB,EAAE,IAAI",
-"sources": ["sourcemaps.scss"],
+"sources": ["doc_sourcemaps.scss"],
 "names": [],
-"file": "sourcemaps.css"
+"file": "doc_sourcemaps.css"
 }

browser/devtools/styleinspector/test/doc_sourcemaps.html

@@ -3,7 +3,7 @@
 <head>
   <title>testcase for testing CSS source maps</title>
   <link rel="stylesheet" type="text/css" href="simple.css"/>
-  <link rel="stylesheet" type="text/css" href="sourcemaps.css"/>
+  <link rel="stylesheet" type="text/css" href="doc_sourcemaps.css"/>
 </head>
 <body>
 	<div>source maps <span>testcase</span></div>

browser/devtools/styleinspector/test/doc_urls_clickable.css

@@ -1,8 +1,8 @@
 .relative1 {
-    background-image: url(../test-image.png);
+    background-image: url(./doc_test_image.png);
 }
 .absolute {
-    background: url("http://example.com/browser/browser/devtools/styleinspector/test/test-image.png");
+    background: url("http://example.com/browser/browser/devtools/styleinspector/test/doc_test_image.png");
 }
 .base64 {
     background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==');

browser/devtools/styleinspector/test/doc_urls_clickable.html

@@ -3,11 +3,11 @@
 <html>
   <head>
 
-    <link href="./browser_styleinspector_bug_677930_urls_clickable/browser_styleinspector_bug_677930_urls_clickable.css" rel="stylesheet" type="text/css">
+    <link href="./doc_urls_clickable.css" rel="stylesheet" type="text/css">
 
     <style>
     .relative2 {
-        background-image: url(test-image.png);
+        background-image: url(doc_test_image.png);
     }
     </style>
   </head>
@@ -21,9 +21,9 @@
 
     <div class="base64">Background image with base64 url (loaded from external css)</div>
 
-    <div class="inline" style="background: url(test-image.png);">Background image with relative path (loaded from style attribute)</div>
+    <div class="inline" style="background: url(doc_test_image.png);">Background image with relative path (loaded from style attribute)</div>
 
-    <div class="inline-resolved" style="background-image: url(./test-image.png)">Background image with resolved relative path (loaded from style attribute)</div>
+    <div class="inline-resolved" style="background-image: url(./doc_test_image.png)">Background image with resolved relative path (loaded from style attribute)</div>
 
     <div class="noimage">No background image :(</div>
   </body>