Changeset 189500 in webkit


Ignore:
Timestamp:
Sep 8, 2015, 11:47:45 AM (10 years ago)
Author:
Joseph Pecoraro
Message:

Web Inspector: Move PrettyPrinting tests into LayoutTests
​https://bugs.webkit.org/show_bug.cgi?id=148698

Reviewed by Timothy Hatcher.

Source/WebInspectorUI:

  • Tools/PrettyPrinting/index.html:

Modify the relative path to the tests which are now in LayoutTests.

  • UserInterface/Test.html:

Load CodeMirror and related resources for Formatting.

LayoutTests:

  • inspector/codemirror/resources/prettyprinting/css-rule-tests/*: Renamed from Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/*.
  • inspector/codemirror/resources/prettyprinting/css-tests/*: Renamed from Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/*.
  • inspector/codemirror/resources/prettyprinting/javascript-tests/*: Renamed from Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/*.

Move tests from PrettyPrinting tools into LayoutTests.

  • inspector/codemirror/prettyprinting-css-expected.txt: Added.
  • inspector/codemirror/prettyprinting-css-rules-expected.txt: Added.
  • inspector/codemirror/prettyprinting-css-rules.html: Added.
  • inspector/codemirror/prettyprinting-css.html: Added.
  • inspector/codemirror/prettyprinting-javascript-expected.txt: Added.
  • inspector/codemirror/prettyprinting-javascript.html: Added.

Add tests per CodeMirror mode.

  • inspector/codemirror/resources/prettyprinting/utilities.js: Added.

(TestPage.registerInitializer):
Shared code between the pretty printing tests.

Location:
trunk
Files:
13 added
3 deleted
4 edited
76 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r189495 r189500  
     12015-09-08  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: Move PrettyPrinting tests into LayoutTests
     4        https://bugs.webkit.org/show_bug.cgi?id=148698
     5
     6        Reviewed by Timothy Hatcher.
     7
     8        * inspector/codemirror/resources/prettyprinting/css-rule-tests/*: Renamed from Source/WebInspectorUI/Tools/PrettyPrinting/css-rule-tests/*.
     9        * inspector/codemirror/resources/prettyprinting/css-tests/*: Renamed from Source/WebInspectorUI/Tools/PrettyPrinting/css-tests/*.
     10        * inspector/codemirror/resources/prettyprinting/javascript-tests/*: Renamed from Source/WebInspectorUI/Tools/PrettyPrinting/js-tests/*.
     11        Move tests from PrettyPrinting tools into LayoutTests.
     12
     13        * inspector/codemirror/prettyprinting-css-expected.txt: Added.
     14        * inspector/codemirror/prettyprinting-css-rules-expected.txt: Added.
     15        * inspector/codemirror/prettyprinting-css-rules.html: Added.
     16        * inspector/codemirror/prettyprinting-css.html: Added.
     17        * inspector/codemirror/prettyprinting-javascript-expected.txt: Added.
     18        * inspector/codemirror/prettyprinting-javascript.html: Added.
     19        Add tests per CodeMirror mode.
     20
     21        * inspector/codemirror/resources/prettyprinting/utilities.js: Added.
     22        (TestPage.registerInitializer):
     23        Shared code between the pretty printing tests.
     24
    1252015-09-08  Daniel Bates  <dabates@apple.com>
    226

  • trunk/Source/WebInspectorUI/ChangeLog

    r189462 r189500  
     12015-09-08  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: Move PrettyPrinting tests into LayoutTests
     4        https://bugs.webkit.org/show_bug.cgi?id=148698
     5
     6        Reviewed by Timothy Hatcher.
     7
     8        * Tools/PrettyPrinting/index.html:
     9        Modify the relative path to the tests which are now in LayoutTests.
     10
     11        * UserInterface/Test.html:
     12        Load CodeMirror and related resources for Formatting.
     13
    1142015-09-06  Andy Estes  <aestes@apple.com>
    215

  • trunk/Source/WebInspectorUI/Tools/PrettyPrinting/index.html

    r189249 r189500  
    246246    function runJavaScriptTests(callback) {
    247247        _runTests(callback, [
    248             "js-tests/block-comment.js",
    249             "js-tests/single-statement-blocks.js",
    250             "js-tests/switch-case-default.js",
     248            "javascript-tests/block-comment.js",
     249            "javascript-tests/single-statement-blocks.js",
     250            "javascript-tests/switch-case-default.js",
    251251        ]);
    252252    }
    … …  
    313313            // Load test and expected results.
    314314            var test = manifest[index];
    315             var expected = test.replace(/\.([^\.]+)$/, "-expected.$1");
     315            var testURL = "../../../../LayoutTests/inspector/codemirror/resources/prettyprinting/" + test;
     316            var expectedURL = testURL.replace(/\.([^\.]+)$/, "-expected.$1");
    316317            var xhr1 = new XMLHttpRequest;
    317             xhr1.open("GET", test, false);
     318            xhr1.open("GET", testURL, false);
    318319            xhr1.send();
     320            var xhr2 = new XMLHttpRequest;
     321            xhr2.open("GET", expectedURL, false);
     322            xhr2.send();
    319323            var testData = xhr1.responseText;
    320             var xhr2 = new XMLHttpRequest;
    321             xhr2.open("GET", expected, false);
    322             xhr2.send();
    323324            var expectedData = xhr2.responseText;
    324325

  • trunk/Source/WebInspectorUI/UserInterface/Test.html

    r189249 r189500  
    4545    <script src="Base/Utilities.js"></script>
    4646
     47    <script src="External/CodeMirror/codemirror.js"></script>
     48    <script src="External/CodeMirror/css.js"></script>
     49    <script src="External/CodeMirror/htmlmixed.js"></script>
     50    <script src="External/CodeMirror/javascript.js"></script>
    4751    <script src="External/Esprima/esprima.js"></script>
    4852
    … …  
    145149    <script src="Controllers/TimelineManager.js"></script>
    146150
     151    <script src="Controllers/Formatter.js"></script>
     152    <script src="Controllers/FormatterContentBuilder.js"></script>
     153    <script src="Views/CodeMirrorAdditions.js"></script>
     154    <script src="Views/CodeMirrorFormatters.js"></script>
     155
    147156    <script type="text/javascript">
    148157        WebInspector.loaded();
Note: See TracChangeset for help on using the changeset viewer.