Diff
Modified: trunk/LayoutTests/ChangeLog (92184 => 92185)
--- trunk/LayoutTests/ChangeLog 2011-08-02 13:43:01 UTC (rev 92184)
+++ trunk/LayoutTests/ChangeLog 2011-08-02 13:54:24 UTC (rev 92185)
@@ -1,3 +1,12 @@
+2011-08-02 Pavel Feldman <[email protected]>
+
+ Not reviewed: fixing inspector tests.
+
+ * inspector/debugger/scripts-panel-expected.txt:
+ * inspector/debugger/scripts-panel.html:
+ * inspector/debugger/scripts-sorting-expected.txt:
+ * platform/chromium/inspector/debugger/scripts-sorting-expected.txt: Copied from LayoutTests/inspector/debugger/scripts-sorting-expected.txt.
+
2011-08-02 Shinichiro Hamaji <[email protected]>
Malformed chromium test expectation fix, again. Sorry for the spam...
Modified: trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt (92184 => 92185)
--- trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt 2011-08-02 13:43:01 UTC (rev 92184)
+++ trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt 2011-08-02 13:54:24 UTC (rev 92185)
@@ -10,16 +10,18 @@
Page reloaded.
Running: testFilesSelect
-text: ?a=b, tooltip: ?a=b
-text: example.com/, tooltip: http://example.com/?a=b
-text: script.js, tooltip: <root>/foo/bar/script.js
-text: script.js, tooltip: <root>/foo/bar/script.js?a=1
-text: script.js, tooltip: <root>/foo/bar/script.js?a=2
-text: script.js, tooltip: <root>/foo/baz/script.js
-text: very_loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo..., tooltip: very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url
+text: ?a=b, tooltip: ?a=b
+text: ?a=b, tooltip: http://example.com/?a=b
+text: …oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url, tooltip: very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url
+text: LayoutTests/inspector/debugger/foo/bar, tooltip:
+text: script.js, tooltip: <root>/foo/bar/script.js
+text: script.js?a=1, tooltip: <root>/foo/bar/script.js?a=1
+text: script.js?a=2, tooltip: <root>/foo/bar/script.js?a=2
+text: LayoutTests/inspector/debugger/foo/baz, tooltip:
+text: script.js, tooltip: <root>/foo/baz/script.js
text: Content scripts, tooltip:
-text: contentScript.js, tooltip: <root>/foo/bar/contentScript.js?a=1
-text: contentScript.js, tooltip: <root>/foo/bar/contentScript.js?a=2
-text: contentScript2.js, tooltip: <root>/foo/bar/contentScript2.js?a=1
+text: contentScript.js?a=1, tooltip: <root>/foo/bar/contentScript.js?a=1
+text: contentScript.js?a=2, tooltip: <root>/foo/bar/contentScript.js?a=2
+text: contentScript2.js?a=1, tooltip: <root>/foo/bar/contentScript2.js?a=1
Debugger was disabled.
Modified: trunk/LayoutTests/inspector/debugger/scripts-panel.html (92184 => 92185)
--- trunk/LayoutTests/inspector/debugger/scripts-panel.html 2011-08-02 13:43:01 UTC (rev 92184)
+++ trunk/LayoutTests/inspector/debugger/scripts-panel.html 2011-08-02 13:54:24 UTC (rev 92185)
@@ -22,7 +22,7 @@
for (var i = 0; i < files.length; ++i) {
var found = false;
for (var j = 0; j < select.length; ++j) {
- if (select[j].text === files[i]) {
+ if (select[j].text.indexOf(files[i]) !== -1) {
found = true;
break;
}
@@ -48,7 +48,7 @@
function showSourceFrame(fileName)
{
for (var i = 0; i < select.length; ++i) {
- if (select[i].text !== fileName)
+ if (select[i].text.indexOf(fileName) === -1)
continue;
select.selectedIndex = i;
panel._filesSelectChanged();
@@ -58,24 +58,25 @@
function checkCurrentlySelectedFileName(fileName)
{
- InspectorTest.assertEquals(fileName, select[select.selectedIndex].text);
+ InspectorTest.assertTrue(select[select.selectedIndex].text.indexOf(fileName) !== -1, "Option text should contain file name: " + select[select.selectedIndex].text + " vs " + fileName);
}
for (var i = 0; i < files.length; ++i)
showSourceFrame(files[i]);
checkCurrentlySelectedFileName("scripts-panel.html");
- InspectorTest.assertEquals(true, panel.forwardButton.disabled);
+ InspectorTest.assertEquals(true, panel.forwardButton.disabled, "Forward should be disabled at first.");
panel.backButton.click();
checkCurrentlySelectedFileName("script3.js");
- InspectorTest.assertEquals(false, panel.forwardButton.disabled);
+ InspectorTest.assertEquals(false, panel.forwardButton.disabled, "Forward should be enabled after back button click.");
panel.forwardButton.click();
checkCurrentlySelectedFileName("scripts-panel.html");
- InspectorTest.assertEquals(true, panel.forwardButton.disabled);
+ InspectorTest.assertEquals(true, panel.forwardButton.disabled, "Forward should be disabled after forward button click.");
for (var i = 0; i < files.length - 1; ++i)
panel.backButton.click();
+
checkCurrentlySelectedFileName("debugger-test.js");
panel.forwardButton.click();
@@ -117,7 +118,7 @@
function didReload()
{
- InspectorTest.assertEquals("scripts-panel.html", select[select.selectedIndex].text);
+ InspectorTest.assertTrue(select[select.selectedIndex].text.indexOf("scripts-panel.html") !== -1);
// There should be maximum 2 source frames: first one is the first shown, second one is the last viewed ("scripts-panel.html").
InspectorTest.assertEquals(true, sourceFrameCount <= 2, "too many source frames created after page reload");
next();
@@ -147,8 +148,9 @@
var select = panel._filesSelectElement;
for (var i = 0; i < select.length; ++i) {
var option = select[i];
+ var text = option.text.replace(/.*LayoutTests/, "LayoutTests");
var tooltip = option.title.replace(rootURL, "<root>/");
- InspectorTest.addResult("text: " + option.text + ", tooltip: " + tooltip);
+ InspectorTest.addResult("text: " + text + ", tooltip: " + tooltip);
}
next();
}
Modified: trunk/LayoutTests/inspector/debugger/scripts-sorting-expected.txt (92184 => 92185)
--- trunk/LayoutTests/inspector/debugger/scripts-sorting-expected.txt 2011-08-02 13:43:01 UTC (rev 92184)
+++ trunk/LayoutTests/inspector/debugger/scripts-sorting-expected.txt 2011-08-02 13:54:24 UTC (rev 92185)
@@ -1,18 +1,5 @@
Tests scripts sorting in the scripts panel.
Debugger was enabled.
- *Non*URL*path
- block.js?block=foo
- ga.js
- lenta.ban?pg=4883&ifr=1
- lenta.ban?pg=5309&ifr=1
- top100.jcn?80674
-/_js/production
- motor.js?1308927432
-/i
- xgemius.js
-/i/js
- jquery-1.5.1.min.js
- jquery.cookie.js
Debugger was disabled.
Copied: trunk/LayoutTests/platform/chromium/inspector/debugger/scripts-sorting-expected.txt (from rev 92184, trunk/LayoutTests/inspector/debugger/scripts-sorting-expected.txt) (0 => 92185)
--- trunk/LayoutTests/platform/chromium/inspector/debugger/scripts-sorting-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/inspector/debugger/scripts-sorting-expected.txt 2011-08-02 13:54:24 UTC (rev 92185)
@@ -0,0 +1,18 @@
+Tests scripts sorting in the scripts panel.
+
+Debugger was enabled.
+ *Non*URL*path
+ block.js?block=foo
+ ga.js
+ lenta.ban?pg=4883&ifr=1
+ lenta.ban?pg=5309&ifr=1
+ top100.jcn?80674
+/_js/production
+ motor.js?1308927432
+/i
+ xgemius.js
+/i/js
+ jquery-1.5.1.min.js
+ jquery.cookie.js
+Debugger was disabled.
+
Modified: trunk/Source/WebCore/ChangeLog (92184 => 92185)
--- trunk/Source/WebCore/ChangeLog 2011-08-02 13:43:01 UTC (rev 92184)
+++ trunk/Source/WebCore/ChangeLog 2011-08-02 13:54:24 UTC (rev 92185)
@@ -1,3 +1,10 @@
+2011-08-02 Pavel Feldman <[email protected]>
+
+ Not reviewed: fixing inspector tests.
+
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect):
+
2011-08-02 Pavel Feldman <[email protected]>
Not reviewed: one line inspector style change.
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (92184 => 92185)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-08-02 13:43:01 UTC (rev 92184)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-08-02 13:54:24 UTC (rev 92185)
@@ -286,7 +286,7 @@
var contentScriptSection = document.createElement("option");
contentScriptSection.text = WebInspector.UIString("Content scripts");
contentScriptSection.disabled = true;
- option.nameForSorting = "1/ContentScriptSeparator";
+ contentScriptSection.nameForSorting = "1/ContentScriptSeparator";
select.contentScriptSection = contentScriptSection;
insertOrdered(contentScriptSection);
}
