Title: [147424] trunk/LayoutTests
- Revision
- 147424
- Author
- [email protected]
- Date
- 2013-04-02 06:45:45 -0700 (Tue, 02 Apr 2013)
Log Message
Web Inspector: add tests for grouped messages filtration in console.
https://bugs.webkit.org/show_bug.cgi?id=113766
Added console groups to console filter test. Fixed minor bugs in other tests.
Patch by Dmitry Zvorygin <[email protected]> on 2013-04-02
Reviewed by Pavel Feldman.
* inspector/console/console-filter-test-expected.txt:
* inspector/console/console-filter-test.html:
* inspector/console/console-preserve-log.html:
* inspector/console/console-tests-expected.txt:
* inspector/console/console-tests.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (147423 => 147424)
--- trunk/LayoutTests/ChangeLog 2013-04-02 13:44:27 UTC (rev 147423)
+++ trunk/LayoutTests/ChangeLog 2013-04-02 13:45:45 UTC (rev 147424)
@@ -1,3 +1,18 @@
+2013-04-02 Dmitry Zvorygin <[email protected]>
+
+ Web Inspector: add tests for grouped messages filtration in console.
+ https://bugs.webkit.org/show_bug.cgi?id=113766
+
+ Added console groups to console filter test. Fixed minor bugs in other tests.
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/console/console-filter-test-expected.txt:
+ * inspector/console/console-filter-test.html:
+ * inspector/console/console-preserve-log.html:
+ * inspector/console/console-tests-expected.txt:
+ * inspector/console/console-tests.html:
+
2013-04-02 Mike West <[email protected]>
[Mac] Unreviewed gardening.
Modified: trunk/LayoutTests/inspector/console/console-filter-test-expected.txt (147423 => 147424)
--- trunk/LayoutTests/inspector/console/console-filter-test-expected.txt 2013-04-02 13:44:27 UTC (rev 147423)
+++ trunk/LayoutTests/inspector/console/console-filter-test-expected.txt 2013-04-02 13:45:45 UTC (rev 147424)
@@ -1,60 +1,152 @@
-CONSOLE MESSAGE: line 9: 0
-CONSOLE MESSAGE: line 3: 1
-CONSOLE MESSAGE: line 9: 2
-CONSOLE MESSAGE: line 3: 3
-CONSOLE MESSAGE: line 9: 4
-CONSOLE MESSAGE: line 3: 5
-CONSOLE MESSAGE: line 9: 6
-CONSOLE MESSAGE: line 3: 7
-CONSOLE MESSAGE: line 9: 8
-CONSOLE MESSAGE: line 3: 9
-CONSOLE MESSAGE: line 22: 10
+CONSOLE MESSAGE: line 9: 0topGroup
+CONSOLE MESSAGE: line 3: 1topGroup
+CONSOLE MESSAGE: line 9: 2topGroup
+CONSOLE MESSAGE: line 3: 3topGroup
+CONSOLE MESSAGE: line 9: 4topGroup
+CONSOLE MESSAGE: line 3: 5topGroup
+CONSOLE MESSAGE: line 9: 6topGroup
+CONSOLE MESSAGE: line 3: 7topGroup
+CONSOLE MESSAGE: line 9: 8topGroup
+CONSOLE MESSAGE: line 3: 9topGroup
+CONSOLE MESSAGE: line 9: 10outerGroup
+CONSOLE MESSAGE: line 3: 11outerGroup
+CONSOLE MESSAGE: line 9: 12outerGroup
+CONSOLE MESSAGE: line 3: 13outerGroup
+CONSOLE MESSAGE: line 9: 14outerGroup
+CONSOLE MESSAGE: line 3: 15outerGroup
+CONSOLE MESSAGE: line 9: 16outerGroup
+CONSOLE MESSAGE: line 3: 17outerGroup
+CONSOLE MESSAGE: line 9: 18outerGroup
+CONSOLE MESSAGE: line 3: 19outerGroup
+CONSOLE MESSAGE: line 9: 20innerGroup
+CONSOLE MESSAGE: line 3: 21innerGroup
+CONSOLE MESSAGE: line 9: 22innerGroup
+CONSOLE MESSAGE: line 3: 23innerGroup
+CONSOLE MESSAGE: line 9: 24innerGroup
+CONSOLE MESSAGE: line 3: 25innerGroup
+CONSOLE MESSAGE: line 9: 26innerGroup
+CONSOLE MESSAGE: line 3: 27innerGroup
+CONSOLE MESSAGE: line 9: 28innerGroup
+CONSOLE MESSAGE: line 3: 29innerGroup
+CONSOLE MESSAGE: line 39: end
Tests that console can filter messages by source.
Running: beforeFilter
beforeFilter
-0 console-filter-test.html:9
-1 log-source.js:3
-2 console-filter-test.html:9
-3 log-source.js:3
-4 console-filter-test.html:9
-5 log-source.js:3
-6 console-filter-test.html:9
-7 log-source.js:3
-8 console-filter-test.html:9
-9 log-source.js:3
-10 console-filter-test.html:22
+0topGroup console-filter-test.html:9
+1topGroup log-source.js:3
+2topGroup console-filter-test.html:9
+3topGroup log-source.js:3
+4topGroup console-filter-test.html:9
+5topGroup log-source.js:3
+6topGroup console-filter-test.html:9
+7topGroup log-source.js:3
+8topGroup console-filter-test.html:9
+9topGroup log-source.js:3
+>outerGroup console-filter-test.html:22
+ 10outerGroup console-filter-test.html:9
+ 11outerGroup log-source.js:3
+ 12outerGroup console-filter-test.html:9
+ 13outerGroup log-source.js:3
+ 14outerGroup console-filter-test.html:9
+ 15outerGroup log-source.js:3
+ 16outerGroup console-filter-test.html:9
+ 17outerGroup log-source.js:3
+ 18outerGroup console-filter-test.html:9
+ 19outerGroup log-source.js:3
+ >innerGroup console-filter-test.html:29
+ 20innerGroup console-filter-test.html:9
+ 21innerGroup log-source.js:3
+ 22innerGroup console-filter-test.html:9
+ 23innerGroup log-source.js:3
+ 24innerGroup console-filter-test.html:9
+ 25innerGroup log-source.js:3
+ 26innerGroup console-filter-test.html:9
+ 27innerGroup log-source.js:3
+ 28innerGroup console-filter-test.html:9
+ 29innerGroup log-source.js:3
+end console-filter-test.html:39
Running: addURL1Filter
-1 log-source.js:3
-3 log-source.js:3
-5 log-source.js:3
-7 log-source.js:3
-9 log-source.js:3
+1topGroup log-source.js:3
+3topGroup log-source.js:3
+5topGroup log-source.js:3
+7topGroup log-source.js:3
+9topGroup log-source.js:3
+>outerGroup console-filter-test.html:22
+ 11outerGroup log-source.js:3
+ 13outerGroup log-source.js:3
+ 15outerGroup log-source.js:3
+ 17outerGroup log-source.js:3
+ 19outerGroup log-source.js:3
+ >innerGroup console-filter-test.html:29
+ 21innerGroup log-source.js:3
+ 23innerGroup log-source.js:3
+ 25innerGroup log-source.js:3
+ 27innerGroup log-source.js:3
+ 29innerGroup log-source.js:3
Running: addURL2Filter
+>outerGroup console-filter-test.html:22
+ >innerGroup console-filter-test.html:29
Running: removeURL1Filter
-0 console-filter-test.html:9
-2 console-filter-test.html:9
-4 console-filter-test.html:9
-6 console-filter-test.html:9
-8 console-filter-test.html:9
-10 console-filter-test.html:22
+0topGroup console-filter-test.html:9
+2topGroup console-filter-test.html:9
+4topGroup console-filter-test.html:9
+6topGroup console-filter-test.html:9
+8topGroup console-filter-test.html:9
+>outerGroup console-filter-test.html:22
+ >innerGroup console-filter-test.html:29
+ 20innerGroup console-filter-test.html:9
+ 22innerGroup console-filter-test.html:9
+ 24innerGroup console-filter-test.html:9
+ 26innerGroup console-filter-test.html:9
+ 28innerGroup console-filter-test.html:9
+ 10outerGroup console-filter-test.html:9
+ 12outerGroup console-filter-test.html:9
+ 14outerGroup console-filter-test.html:9
+ 16outerGroup console-filter-test.html:9
+ 18outerGroup console-filter-test.html:9
+end console-filter-test.html:39
Running: restoreURL1Filter
+>outerGroup console-filter-test.html:22
+ >innerGroup console-filter-test.html:29
Running: removeAllFilters
-0 console-filter-test.html:9
-1 log-source.js:3
-2 console-filter-test.html:9
-3 log-source.js:3
-4 console-filter-test.html:9
-5 log-source.js:3
-6 console-filter-test.html:9
-7 log-source.js:3
-8 console-filter-test.html:9
-9 log-source.js:3
-10 console-filter-test.html:22
+0topGroup console-filter-test.html:9
+1topGroup log-source.js:3
+2topGroup console-filter-test.html:9
+3topGroup log-source.js:3
+4topGroup console-filter-test.html:9
+5topGroup log-source.js:3
+6topGroup console-filter-test.html:9
+7topGroup log-source.js:3
+8topGroup console-filter-test.html:9
+9topGroup log-source.js:3
+>outerGroup console-filter-test.html:22
+ >innerGroup console-filter-test.html:29
+ 20innerGroup console-filter-test.html:9
+ 21innerGroup log-source.js:3
+ 22innerGroup console-filter-test.html:9
+ 23innerGroup log-source.js:3
+ 24innerGroup console-filter-test.html:9
+ 25innerGroup log-source.js:3
+ 26innerGroup console-filter-test.html:9
+ 27innerGroup log-source.js:3
+ 28innerGroup console-filter-test.html:9
+ 29innerGroup log-source.js:3
+ 10outerGroup console-filter-test.html:9
+ 11outerGroup log-source.js:3
+ 12outerGroup console-filter-test.html:9
+ 13outerGroup log-source.js:3
+ 14outerGroup console-filter-test.html:9
+ 15outerGroup log-source.js:3
+ 16outerGroup console-filter-test.html:9
+ 17outerGroup log-source.js:3
+ 18outerGroup console-filter-test.html:9
+ 19outerGroup log-source.js:3
+end console-filter-test.html:39
Modified: trunk/LayoutTests/inspector/console/console-filter-test.html (147423 => 147424)
--- trunk/LayoutTests/inspector/console/console-filter-test.html 2013-04-02 13:44:27 UTC (rev 147423)
+++ trunk/LayoutTests/inspector/console/console-filter-test.html 2013-04-02 13:45:45 UTC (rev 147424)
@@ -14,29 +14,61 @@
{
for (var i = 0; i < 10; i++) {
if (i % 2 == 0)
- log1(i); // from console-filter-test.html
+ log1(i + "topGroup"); // from console-filter-test.html
else
- log2(i); // from log-source.js
+ log2(i + "topGroup"); // from log-source.js
}
- console.log(10);
+ console.group("outerGroup");
+ for (var i = 10; i < 20; i++) {
+ if (i % 2 == 0)
+ log1(i + "outerGroup"); // from console-filter-test.html
+ else
+ log2(i + "outerGroup"); // from log-source.js
+ }
+ console.group("innerGroup");
+ for (var i = 20; i < 30; i++) {
+ if (i % 2 == 0)
+ log1(i + "innerGroup"); // from console-filter-test.html
+ else
+ log2(i + "innerGroup"); // from log-source.js
+ }
+ console.groupEnd();
+ console.groupEnd();
+ console.log("end");
+
runTest();
}
function test()
{
var messagesElement = WebInspector.consoleView.messagesElement;
- var groupMessages = messagesElement.querySelector(".console-group-messages");
- function dumpVisibleMessages()
+ function dumpVisibleMessages(root, indent)
{
- var children = groupMessages.childNodes;
+ indent = indent || "";
+ root = root || WebInspector.consoleView.messagesElement.firstChild; // .console-group
+ var children = root.childNodes;
- for (var i = 0; i < children.length; i++)
- InspectorTest.addResult(children[i].textContent);
+ for (var i = 0; i < children.length; i++) {
+ if (children[i].hasStyleClass("console-message")) {
+ InspectorTest.addResult(indent + ">" + children[i].textContent);
+ indent = indent + " ";
+ } else if (children[i].hasStyleClass("console-group-messages")) {
+ var groupMessages = children[i].childNodes;
+ for (var j = 0; j < groupMessages.length; j++) {
+ if (groupMessages[j].hasStyleClass("console-message"))
+ InspectorTest.addResult(indent + groupMessages[j].textContent);
+ else if (groupMessages[j].hasStyleClass("console-group"))
+ dumpVisibleMessages(groupMessages[j], indent);
+ }
+ }
+ }
}
+ var groupMessages = messagesElement.querySelector(".console-group-messages");
+
var url1 = groupMessages.childNodes[0].message.url;
var url2 = groupMessages.childNodes[1].message.url;
Modified: trunk/LayoutTests/inspector/console/console-preserve-log.html (147423 => 147424)
--- trunk/LayoutTests/inspector/console/console-preserve-log.html 2013-04-02 13:44:27 UTC (rev 147423)
+++ trunk/LayoutTests/inspector/console/console-preserve-log.html 2013-04-02 13:45:45 UTC (rev 147424)
@@ -5,7 +5,7 @@
<script>
function test()
{
- WebInspector.console.addMessage(WebInspector.ConsoleMessage.create(WebInspector.ConsoleMessage.MessageSource.Other, WebInspector.ConsoleMessage.MessageLevel, "PASS"));
+ WebInspector.console.addMessage(WebInspector.ConsoleMessage.create(WebInspector.ConsoleMessage.MessageSource.Other, WebInspector.ConsoleMessage.MessageLevel.Log, "PASS"));
WebInspector.settings.preserveConsoleLog.set(true);
InspectorTest.reloadPage(function() {
InspectorTest.dumpConsoleMessages();
Modified: trunk/LayoutTests/inspector/console/console-tests-expected.txt (147423 => 147424)
--- trunk/LayoutTests/inspector/console/console-tests-expected.txt 2013-04-02 13:44:27 UTC (rev 147423)
+++ trunk/LayoutTests/inspector/console/console-tests-expected.txt 2013-04-02 13:45:45 UTC (rev 147424)
@@ -43,4 +43,5 @@
function f() { } console-tests.html:29 console-message console-log-level
Array[3] console-tests.html:30 console-message console-log-level
/regexp.*/ console-tests.html:31 console-message console-log-level
+ console-message console-log-level
Modified: trunk/LayoutTests/inspector/console/console-tests.html (147423 => 147424)
--- trunk/LayoutTests/inspector/console/console-tests.html 2013-04-02 13:44:27 UTC (rev 147423)
+++ trunk/LayoutTests/inspector/console/console-tests.html 2013-04-02 13:45:45 UTC (rev 147424)
@@ -29,6 +29,7 @@
console.log(function f() { });
console.log([1, 2, 3]);
console.log(/regexp.*/);
+ console.groupEnd();
runTest();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
