Changeset 90557 in webkit


Ignore:
Timestamp:
Jul 7, 2011 6:12:26 AM (13 years ago)
Author:
vsevik@chromium.org
Message:

2011-07-07 Vsevolod Vlasov <​vsevik@chromium.org>

Web Inspector: Move resetting NetworkResourcesData out of tests unrelated to replacement testing.
​https://bugs.webkit.org/show_bug.cgi?id=64078

Reviewed by Pavel Feldman.

  • http/tests/inspector/network-test.js: (initialize_NetworkTest.InspectorTest.resetInspectorResourcesData.nextStep): (initialize_NetworkTest.InspectorTest.resetInspectorResourcesData): (resetInspectorResourcesData):
  • http/tests/inspector/network/network-clear-cache-expected.txt:
  • http/tests/inspector/network/network-clear-cache.html-disabled:
  • http/tests/inspector/network/network-clear-cookies-expected.txt:
  • http/tests/inspector/network/network-clear-cookies.html-disabled:
  • http/tests/inspector/network/network-embed-expected.txt:
  • http/tests/inspector/network/network-embed.html:
  • http/tests/inspector/network/network-xhr-async-expected.txt:
  • http/tests/inspector/network/network-xhr-async.html:
  • http/tests/inspector/network/network-xhr-sync-expected.txt:
  • http/tests/inspector/network/network-xhr-sync.html:
Location:
trunk/LayoutTests
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r90555 r90557  
     12011-07-07  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Web Inspector: Move resetting NetworkResourcesData out of tests unrelated to replacement testing.
     4        https://bugs.webkit.org/show_bug.cgi?id=64078
     5
     6        Reviewed by Pavel Feldman.
     7
     8        * http/tests/inspector/network-test.js:
     9        (initialize_NetworkTest.InspectorTest.resetInspectorResourcesData.nextStep):
     10        (initialize_NetworkTest.InspectorTest.resetInspectorResourcesData):
     11        (resetInspectorResourcesData):
     12        * http/tests/inspector/network/network-clear-cache-expected.txt:
     13        * http/tests/inspector/network/network-clear-cache.html-disabled:
     14        * http/tests/inspector/network/network-clear-cookies-expected.txt:
     15        * http/tests/inspector/network/network-clear-cookies.html-disabled:
     16        * http/tests/inspector/network/network-embed-expected.txt:
     17        * http/tests/inspector/network/network-embed.html:
     18        * http/tests/inspector/network/network-xhr-async-expected.txt:
     19        * http/tests/inspector/network/network-xhr-async.html:
     20        * http/tests/inspector/network/network-xhr-sync-expected.txt:
     21        * http/tests/inspector/network/network-xhr-sync.html:
     22
    1232011-07-07  Vsevolod Vlasov  <vsevik@chromium.org>
    224

  • trunk/LayoutTests/http/tests/inspector/network-test.js

    r88480 r90557  
    2424}
    2525
     26InspectorTest.resetInspectorResourcesData = function(callback)
     27{
     28    InspectorTest.evaluateInPage("resetInspectorResourcesData()", nextStep);
     29
     30    function nextStep(result)
     31    {
     32        if (!result) {
     33            InspectorTest.addResult("This test can not be run as window.internals is not available.");
     34            Inspector.completeTest();
     35        } else
     36            callback();
     37    }
     38}
     39
    2640};
    2741
    … …  
    4054}
    4155
     56function resetInspectorResourcesData()
     57{
     58    if (!window.internals)
     59        return false;
     60
     61    internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
     62    return true;
     63}
     64

  • trunk/LayoutTests/http/tests/inspector/network/network-clear-cache-expected.txt

    r90553 r90557  
    1 CONSOLE MESSAGE: line 21: First XHR loaded.
    2 CONSOLE MESSAGE: line 36: Done.
     1CONSOLE MESSAGE: line 13: First XHR loaded.
     2CONSOLE MESSAGE: line 28: Done.
    33Tests clearing browser cache from inspector.
    44

  • trunk/LayoutTests/http/tests/inspector/network/network-clear-cache.html-disabled

    r90553 r90557  
    66function loadData()
    77{
    8     if (!window.internals) {
    9         console.log("This test can not be run as window.internals is not available.");
    10         return;
    11     }
    12     // Since this test could be run together with other inspector backend cache
    13     // tests, we need to reset size limits to default ones.
    14     internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
    15 
    168    doXHR("GET", "resources/random-cached.php", true, xhrLoaded1);
    179}
    … …  
    3931function test()
    4032{
    41     InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step1);
    42     InspectorTest.evaluateInPage("loadData()");
     33    // Since this test could be run together with other inspector backend cache
     34    // tests, we need to reset size limits to default ones.
     35    InspectorTest.resetInspectorResourcesData(step1);
    4336
    44     function step1(msg)
     37    function step1()
    4538    {
    46         if (typeof(NetworkAgent.clearBrowserCache) === 'function')
    47             NetworkAgent.clearBrowserCache(step2);
    48         else
    49             step2();
     39        InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
     40        InspectorTest.evaluateInPage("loadData()");
    5041    }
    5142
    5243    function step2(msg)
    5344    {
    54         InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step3);
     45        if (typeof(NetworkAgent.clearBrowserCache) === 'function')
     46            NetworkAgent.clearBrowserCache(step3);
     47        else
     48            step3();
     49    }
     50
     51    function step3(msg)
     52    {
     53        InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step4);
    5554        InspectorTest.evaluateInPage("cacheCleared()");
    5655    }
    5756
    58     function step3(msg)
     57    function step4(msg)
    5958    {
    6059        // inspector-test.js appears in network panel occasionally in Safari on

  • trunk/LayoutTests/http/tests/inspector/network/network-clear-cookies-expected.txt

    r90553 r90557  
    1 CONSOLE MESSAGE: line 21: First XHR loaded.
    2 CONSOLE MESSAGE: line 36: Done.
     1CONSOLE MESSAGE: line 13: First XHR loaded.
     2CONSOLE MESSAGE: line 28: Done.
    33Tests clearing browser cookies from inspector.
    44

  • trunk/LayoutTests/http/tests/inspector/network/network-clear-cookies.html-disabled

    r90553 r90557  
    66function loadData()
    77{
    8     if (!window.internals) {
    9         console.log("This test can not be run as window.internals is not available.");
    10         return;
    11     }
    12     // Since this test could be run together with other inspector backend cache
    13     // tests, we need to reset size limits to default ones.
    14     internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
    15 
    168    doXHR("GET", "resources/set-cookie.php", true, xhrLoaded1);
    179}
    … …  
    3931function test()
    4032{
    41     InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step1);
    42     InspectorTest.evaluateInPage("loadData()");
     33    // Since this test could be run together with other inspector backend cache
     34    // tests, we need to reset size limits to default ones.
     35    InspectorTest.resetInspectorResourcesData(step1);
    4336
    44     function step1(msg)
     37    function step1()
    4538    {
    46         if (typeof(NetworkAgent.clearBrowserCookies) === 'function')
    47             NetworkAgent.clearBrowserCookies(step2);
    48         else
    49             step2();
     39        InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
     40        InspectorTest.evaluateInPage("loadData()");
    5041    }
    5142
    5243    function step2(msg)
    5344    {
    54         InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step3);
     45        if (typeof(NetworkAgent.clearBrowserCookies) === 'function')
     46            NetworkAgent.clearBrowserCookies(step3);
     47        else
     48            step3();
     49    }
     50
     51    function step3(msg)
     52    {
     53        InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step4);
    5554        InspectorTest.evaluateInPage("cookiesCleared()");
    5655    }
    5756
    58     function step3(msg)
     57    function step4(msg)
    5958    {
    6059        // inspector-test.js appears in network panel occasionally in Safari on

  • trunk/LayoutTests/http/tests/inspector/network/network-embed-expected.txt

    r90389 r90557  
    1 CONSOLE MESSAGE: line 66: Done.
     1CONSOLE MESSAGE: line 57: Done.
    22Tests that network panel shows content for embed objects.
    33

  • trunk/LayoutTests/http/tests/inspector/network/network-embed.html

    r90389 r90557  
    33<script src="../inspector-test.js"></script>
    44<script>
    5 
    65var loadedFirstURL = false;
    76function streamLoaded()
    … …  
    2524    if (!snifferInstalled || !loadedFirstURL)
    2625        return;
    27 
    28     if (!window.internals) {
    29         console.log("This test can not be run as window.internals is not available.");
    30         return;
    31     }
    32     // Since this test could be run together with other inspector backend cache
    33     // tests, we need to reset size limits to default ones.
    34     internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
    3526
    3627    // Binary content should not be available.
    … …  
    6960function test()
    7061{
    71     InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step1);
    72     InspectorTest.evaluateInPage("onSnifferInstalled()");
     62    // Since this test could be run together with other inspector backend cache
     63    // tests, we need to reset size limits to default ones.
     64    InspectorTest.resetInspectorResourcesData(step1);
     65
     66    function step1()
     67    {
     68        InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
     69        InspectorTest.evaluateInPage("onSnifferInstalled()");
     70    }
    7371
    7472    function dumpResource(resource, callback)
    … …  
    8987    }
    9088
    91     function step1()
     89    function step2()
    9290    {
    9391        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 5];
    94         dumpResource(resource, step2);
    95     }
    96 
    97     function step2()
    98     {
    99         var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 4];
    10092        dumpResource(resource, step3);
    10193    }
    … …  
    10395    function step3()
    10496    {
    105         var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 3];
     97        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 4];
    10698        dumpResource(resource, step4);
    10799    }
    … …  
    109101    function step4()
    110102    {
    111         var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 2];
     103        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 3];
    112104        dumpResource(resource, step5);
    113105    }
    … …  
    115107    function step5()
    116108    {
    117         var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
     109        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 2];
    118110        dumpResource(resource, step6);
    119111    }
    120112
    121113    function step6()
     114    {
     115        var resource = WebInspector.panels.network.resources[WebInspector.panels.network.resources.length - 1];
     116        dumpResource(resource, step7);
     117    }
     118
     119    function step7()
    122120    {
    123121        InspectorTest.completeTest();

  • trunk/LayoutTests/http/tests/inspector/network/network-xhr-async-expected.txt

    r90389 r90557  
    1 CONSOLE MESSAGE: line 21: Done.
     1CONSOLE MESSAGE: line 13: Done.
    22Tests XHR network resource type and content for asynchronous requests. Bug 61205
    33

  • trunk/LayoutTests/http/tests/inspector/network/network-xhr-async.html

    r90389 r90557  
    66function loadData()
    77{
    8     if (!window.internals) {
    9         console.log("This test can not be run as window.internals is not available.");
    10         return;
    11     }
    12     // Since this test could be run together with other inspector backend cache
    13     // tests, we need to reset size limits to default ones.
    14     internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
    15 
    168    doXHR("GET", "resources/resource.php", true, resourceLoaded);
    179}
    … …  
    2416function test()
    2517{
    26     InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
    27     InspectorTest.evaluateInPage("loadData()");
     18    // Since this test could be run together with other inspector backend cache
     19    // tests, we need to reset size limits to default ones.
     20    InspectorTest.resetInspectorResourcesData(step1);
     21
     22    function step1()
     23    {
     24        InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
     25        InspectorTest.evaluateInPage("loadData()");
     26    }
    2827
    2928    function step2()

  • trunk/LayoutTests/http/tests/inspector/network/network-xhr-sync-expected.txt

    r90389 r90557  
    1 CONSOLE MESSAGE: line 21: Done.
     1CONSOLE MESSAGE: line 13: Done.
    22Tests XHR network resource type and content for synchronous requests. Bug 61205
    33

  • trunk/LayoutTests/http/tests/inspector/network/network-xhr-sync.html

    r90389 r90557  
    66function loadData()
    77{
    8     if (!window.internals) {
    9         console.log("This test can not be run as window.internals is not available.");
    10         return;
    11     }
    12     // Since this test could be run together with other inspector backend cache
    13     // tests, we need to reset size limits to default ones.
    14     internals.setInspectorResourcesDataSizeLimits(document, 10 * 1000 * 1000, 1000 * 1000);
    15 
    168    doXHR("GET", "resources/resource.php", false, resourceLoaded);
    179}
    … …  
    2416function test()
    2517{
    26     InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
    27     InspectorTest.evaluateInPage("loadData()");
     18    // Since this test could be run together with other inspector backend cache
     19    // tests, we need to reset size limits to default ones.
     20    InspectorTest.resetInspectorResourcesData(step1);
     21
     22    function step1()
     23    {
     24        InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
     25        InspectorTest.evaluateInPage("loadData()");
     26    }
    2827
    2928    function step2()
Note: See TracChangeset for help on using the changeset viewer.