Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / inspector / console / console-filter-test.html

diff --git a/src/third_party/WebKit/LayoutTests/inspector/console/console-filter-test.html b/src/third_party/WebKit/LayoutTests/inspector/console/console-filter-test.html
index ed7c19f..5b505f8 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/inspector/console/console-filter-test.html
+++ b/src/third_party/WebKit/LayoutTests/inspector/console/console-filter-test.html
@@ -43,34 +43,23 @@ function onload()
 
 function test()
 {
-    var messagesElement = WebInspector.ConsolePanel._view().messagesElement;
+    var messages = WebInspector.ConsolePanel._view()._visibleViewMessages;
 
-    function dumpVisibleMessages(root, indent)
+    function dumpVisibleMessages()
     {
-        indent = indent || "";
-        root = root || WebInspector.ConsolePanel._view().topGroup.element; // .console-group
-        var children = root.childNodes;
-
-        for (var i = 0; i < children.length; i++) {
-            if (children[i].classList.contains("console-message")) {
-                InspectorTest.addResult(indent + ">" + children[i].textContent);
-                indent = indent + "  ";
-            } else if (children[i].classList.contains("console-group-messages")) {
-                var groupMessages = children[i].childNodes;
-                for (var j = 0; j < groupMessages.length; j++) {
-                    if (groupMessages[j].classList.contains("console-message"))
-                        InspectorTest.addResult(indent + groupMessages[j].textContent);
-                    else if (groupMessages[j].classList.contains("console-group"))
-                        dumpVisibleMessages(groupMessages[j], indent);
-                }
-            }
+        var messages = WebInspector.ConsolePanel._view()._visibleViewMessages;
+        for (var i = 0; i < messages.length; ++i) {
+            var viewMessage = messages[i];
+            var delimeter = viewMessage.consoleMessage().isGroupStartMessage() ? ">" : "";
+            var indent = "";
+            for (var j = 0; j < viewMessage.nestingLevel(); ++j)
+                indent += "  ";
+            InspectorTest.addResult(indent + delimeter + viewMessage.toMessageElement().textContent);
         }
     }
 
-    var groupMessages = messagesElement.querySelector(".console-group-messages");
-
-    var url1 = groupMessages.childNodes[0].message.consoleMessage().url;
-    var url2 = groupMessages.childNodes[1].message.consoleMessage().url;
+    var url1 = messages[0].consoleMessage().url;
+    var url2 = messages[1].consoleMessage().url;
 
     InspectorTest.runTestSuite([
         function beforeFilter(next)
@@ -108,6 +97,18 @@ function test()
             WebInspector.ConsolePanel._view()._filter.removeMessageURLFilter();
             dumpVisibleMessages();
             next();
+        },
+        function checkTextFilter(next)
+        {
+            WebInspector.ConsolePanel._view()._filter._textFilterUI.setValue("outer");
+            dumpVisibleMessages();
+            next();
+        },
+        function checkResetFilter(next)
+        {
+            WebInspector.ConsolePanel._view()._filter.reset();
+            dumpVisibleMessages();
+            next();
         }
     ]);
 }