From 39ab2c80b518843be90dae580e80654594c8be7a Mon Sep 17 00:00:00 2001 From: "dimich@google.com" Date: Tue, 14 Jul 2009 06:07:28 +0000 Subject: Fix the ConsoleLog test and enable it. It was previously disabled because WebKit change http://trac.webkit.org/changeset/45786 had split the 'type' and 'level' parameters of the ConsoleMessage into 2 separate parameters, which changed the way CSS styles are formatted for messages in Inspector front-end. Updated test expectations. BUG=16684 TEST=the test DevToolsSanityTest.TestConsoleLog is enabled by this CL Review URL: http://codereview.chromium.org/155482 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20609 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/debugger/devtools_sanity_unittest.cc | 2 +- webkit/glue/devtools/js/tests.js | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 90f225e..12286a0 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -162,7 +162,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleEval) { } // Tests console log. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestConsoleLog) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleLog) { RunTest("testConsoleLog", kConsoleTestPage); } diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js index 5f73415..ade8de3 100644 --- a/webkit/glue/devtools/js/tests.js +++ b/webkit/glue/devtools/js/tests.js @@ -482,7 +482,7 @@ TestSuite.prototype.testConsoleLog = function() { var index = 0; var test = this; - var assertNext = function(line, message, opt_level, opt_count, opt_substr) { + var assertNext = function(line, message, opt_class, opt_count, opt_substr) { var elem = messages[index++].toMessageElement(); var clazz = elem.getAttribute('class'); var expectation = (opt_count || '') + 'console_test_page.html:' + @@ -492,25 +492,25 @@ TestSuite.prototype.testConsoleLog = function() { } else { test.assertEquals(expectation, elem.textContent); } - if (opt_level) { - test.assertContains(clazz, 'console-' + opt_level + '-level'); + if (opt_class) { + test.assertContains(clazz, 'console-' + opt_class); } }; - assertNext('5', 'log', 'log'); - assertNext('7', 'debug', 'log'); - assertNext('9', 'info', 'log'); - assertNext('11', 'warn', 'warning'); - assertNext('13', 'error', 'error'); + assertNext('5', 'log', 'log-level'); + assertNext('7', 'debug', 'log-level'); + assertNext('9', 'info', 'log-level'); + assertNext('11', 'warn', 'warning-level'); + assertNext('13', 'error', 'error-level'); assertNext('15', 'Message format number 1, 2 and 3.5'); assertNext('17', 'Message format for string'); assertNext('19', 'Object Object'); - assertNext('22', 'repeated', 'log', 5); + assertNext('22', 'repeated', 'log-level', 5); assertNext('26', 'count: 1'); assertNext('26', 'count: 2'); assertNext('29', 'group', 'group-title'); index++; - assertNext('33', 'timer:', 'log', '', true); + assertNext('33', 'timer:', 'log-level', '', true); }; -- cgit v1.1