[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 12:12:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d99f5e277a4da7db52dbdcd50d6d7ffb7e65851d
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 17 09:05:20 2010 +0000
2010-08-17 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: upstream Chromium console tests
https://bugs.webkit.org/show_bug.cgi?id=44057
* inspector/console-eval-expected.txt: Added.
* inspector/console-eval-global-expected.txt: Added.
* inspector/console-eval-global.html: Added.
* inspector/console-eval.html: Added.
* platform/chromium/inspector/console-eval-global-expected.txt: Added.
2010-08-17 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: upstream Chromium console tests and remove a couple
of tests that have already been covered with layout tests.
https://bugs.webkit.org/show_bug.cgi?id=44057
* src/js/Tests.js:
(.TestSuite.prototype.testConsoleEval):
(.TestSuite.prototype.testConsoleLog):
(.TestSuite.prototype.testEvalGlobal):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65490 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a26b50f..0499205 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-17 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: upstream Chromium console tests
+ https://bugs.webkit.org/show_bug.cgi?id=44057
+
+ * inspector/console-eval-expected.txt: Added.
+ * inspector/console-eval-global-expected.txt: Added.
+ * inspector/console-eval-global.html: Added.
+ * inspector/console-eval.html: Added.
+ * platform/chromium/inspector/console-eval-global-expected.txt: Added.
+
2010-08-17 Ademar de Souza Reis Jr <ademar.reis at openbossa.org>
Reviewed by Ariya Hidayat.
diff --git a/LayoutTests/inspector/console-eval-expected.txt b/LayoutTests/inspector/console-eval-expected.txt
new file mode 100644
index 0000000..73a5042
--- /dev/null
+++ b/LayoutTests/inspector/console-eval-expected.txt
@@ -0,0 +1,5 @@
+Tests that simple evaluations may be performed in the console.
+
+1+2
+3
+
diff --git a/LayoutTests/inspector/console-eval-global-expected.txt b/LayoutTests/inspector/console-eval-global-expected.txt
new file mode 100644
index 0000000..b11506b
--- /dev/null
+++ b/LayoutTests/inspector/console-eval-global-expected.txt
@@ -0,0 +1,7 @@
+Tests that simple evaluations may be performed in the console on global object.
+
+foo
+"fooValue"
+bar1
+ReferenceError: Can't find variable: bar1
+
diff --git a/LayoutTests/inspector/console-eval-global.html b/LayoutTests/inspector/console-eval-global.html
new file mode 100644
index 0000000..3fea772
--- /dev/null
+++ b/LayoutTests/inspector/console-eval-global.html
@@ -0,0 +1,38 @@
+<html>
+<head>
+<script src="../http/tests/inspector/inspector-test.js"></script>
+<script src="../http/tests/inspector/console-tests.js"></script>
+<script>
+
+var foo = 'fooValue';
+var bar = {
+ a: 'b'
+};
+
+function doit()
+{
+ evaluateInWebInspector("frontend_testEvalGlobal", function() {
+ dumpConsoleMessages();
+ });
+}
+
+function frontend_testEvalGlobal(layoutTestController)
+{
+ layoutTestController.waitUntilDone();
+ frontend_evaluateInConsole("foo", function() {
+ frontend_evaluateInConsole("bar1", function() {
+ layoutTestController.notifyDone();
+ });
+ });
+}
+
+</script>
+</head>
+
+<body onload="onload()">
+<p>
+Tests that simple evaluations may be performed in the console on global object.
+</p>
+
+</body>
+</html>
diff --git a/LayoutTests/inspector/console-eval.html b/LayoutTests/inspector/console-eval.html
new file mode 100644
index 0000000..e6c0baf
--- /dev/null
+++ b/LayoutTests/inspector/console-eval.html
@@ -0,0 +1,23 @@
+<html>
+<head>
+<script src="../http/tests/inspector/inspector-test.js"></script>
+<script src="../http/tests/inspector/console-tests.js"></script>
+<script>
+
+function doit()
+{
+ evaluateInWebInspector("frontend_evaluateInConsole('1+2', function() {});", function() {
+ dumpConsoleMessages();
+ });
+}
+
+</script>
+</head>
+
+<body onload="onload()">
+<p>
+Tests that simple evaluations may be performed in the console.
+</p>
+
+</body>
+</html>
diff --git a/LayoutTests/platform/chromium/inspector/console-eval-global-expected.txt b/LayoutTests/platform/chromium/inspector/console-eval-global-expected.txt
new file mode 100755
index 0000000..be7d8bd
--- /dev/null
+++ b/LayoutTests/platform/chromium/inspector/console-eval-global-expected.txt
@@ -0,0 +1,6 @@
+Tests that simple evaluations may be performed in the console on global object.
+
+foo
+"fooValue"
+bar1
+ReferenceError: bar1 is not defined
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 807225d..92ceb8b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-17 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: upstream Chromium console tests and remove a couple
+ of tests that have already been covered with layout tests.
+ https://bugs.webkit.org/show_bug.cgi?id=44057
+
+ * src/js/Tests.js:
+ (.TestSuite.prototype.testConsoleEval):
+ (.TestSuite.prototype.testConsoleLog):
+ (.TestSuite.prototype.testEvalGlobal):
+
2010-08-16 Kinuko Yasuda <kinuko at chromium.org>
Unreviewed; attempt to fix Chromium Windows build.
diff --git a/WebKit/chromium/src/js/Tests.js b/WebKit/chromium/src/js/Tests.js
index 764f624..d8242e8 100644
--- a/WebKit/chromium/src/js/Tests.js
+++ b/WebKit/chromium/src/js/Tests.js
@@ -1503,116 +1503,6 @@ TestSuite.prototype._hookGetPropertiesCallback = function(hook, code)
/**
- * Tests that all elements in prototype chain of an object have expected
- * intrinic proprties(__proto__, constructor, prototype).
- */
-TestSuite.prototype.testDebugIntrinsicProperties = function()
-{
- this.showPanel("scripts");
- var test = this;
-
- this._executeCodeWhenScriptsAreParsed("handleClick()", ["debugger_intrinsic_properties.html"]);
-
- this._waitForScriptPause(
- {
- functionsOnStack: ["callDebugger", "handleClick", ""],
- lineNumber: 29,
- lineText: " debugger;"
- },
- expandLocalScope);
-
- var localScopeSection = null;
- function expandLocalScope() {
- test._expandScopeSections(function(sections, i) {
- if (i === 0) {
- test.assertTrue(sections[i].object.isLocal, "Scope #0 is not Local.");
- localScopeSection = sections[i];
- return true;
- }
- return false;
- },
- examineLocalScope);
- }
-
- function examineLocalScope() {
- var scopeExpectations = [
- "a", "Child", [
- "__proto__", "Child", [
- "__proto__", "Parent", [
- "__proto__", "Object", null,
- "constructor", "function Parent(n) {", [
- "name", '"Parent"', null,
- "prototype", 'Parent', [
- "parentProtoField", "11", null,
- ]
- ],
- "parentProtoField", "11", null,
- ],
- "constructor", "function Child(n) {", null,
- "childProtoField", "21", null,
- ],
-
- "parentField", "10", null,
- "childField", "20", null,
- ]
- ];
- checkProperty(localScopeSection.propertiesTreeOutline, "<Local Scope>", scopeExpectations);
- }
-
- var propQueue = [];
- var index = 0;
- var expectedFinalIndex = 5;
-
- function expandAndCheckNextProperty() {
- if (index === propQueue.length) {
- test.assertEquals(expectedFinalIndex, index, "Unexpected number of expanded objects.");
- test.releaseControl();
- return;
- }
-
- // Read next property data from the queue.
- var treeElement = propQueue[index].treeElement;
- var path = propQueue[index].path;
- var expectations = propQueue[index].expectations;
- index++;
-
- // Expand the property.
- test._hookGetPropertiesCallback(function() {
- checkProperty(treeElement, path, expectations);
- },
- function() {
- treeElement.expand();
- });
- }
-
- function checkProperty(treeElement, path, expectations) {
- for (var i = 0; i < expectations.length; i += 3) {
- var name = expectations[i];
- var description = expectations[i+1];
- var value = expectations[i+2];
-
- var propertyPath = path + "." + name;
- var propertyTreeElement = test._findChildProperty(treeElement, name, path);
- test.assertTrue(propertyTreeElement, 'Property "' + propertyPath + '" not found.');
- test.assertEquals(description, propertyTreeElement.property.value.description, 'Unexpected "' + propertyPath + '" description.');
- if (value) {
- // Schedule property content check.
- propQueue.push({
- treeElement: propertyTreeElement,
- path: propertyPath,
- expectations: value,
- });
- }
- }
- // Check next property in the queue.
- expandAndCheckNextProperty();
- }
-
- test.takeControl();
-};
-
-
-/**
* Tests "Pause" button will pause debugger when a snippet is evaluated.
*/
TestSuite.prototype.testPauseInEval = function()
@@ -1647,101 +1537,6 @@ TestSuite.createKeyEvent = function(keyIdentifier)
/**
- * Tests console eval.
- */
-TestSuite.prototype.testConsoleEval = function()
-{
- var test = this;
- this.evaluateInConsole_("123",
- function(resultText) {
- test.assertEquals("123", resultText);
- test.releaseControl();
- });
-
- this.takeControl();
-};
-
-
-/**
- * Tests console log.
- */
-TestSuite.prototype.testConsoleLog = function()
-{
- WebInspector.showConsole();
- var messages = WebInspector.console.messages;
- var index = 0;
-
- var test = this;
- 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:' + line + message;
- if (opt_substr)
- test.assertContains(elem.textContent, expectation);
- else
- test.assertEquals(expectation, elem.textContent);
- if (opt_class)
- test.assertContains(clazz, "console-" + opt_class);
- };
-
- 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-level", 5);
- assertNext("26", "count: 1");
- assertNext("26", "count: 2");
- assertNext("29", "group", "group-title");
- index++;
- assertNext("33", "timer:", "log-level", "", true);
- assertNext("35", "1 2 3", "log-level");
- assertNext("37", "HTMLDocument", "log-level");
- assertNext("39", "<html>", "log-level", "", true);
-};
-
-
-/**
- * Tests eval of global objects.
- */
-TestSuite.prototype.testEvalGlobal = function()
-{
- WebInspector.showConsole();
-
- var inputs = ["foo", "foobar"];
- var expectations = ["foo", "fooValue", "foobar", "ReferenceError: foobar is not defined"];
-
- // Do not change code below - simply add inputs and expectations above.
- var initEval = function(input) {
- WebInspector.console.prompt.text = input;
- WebInspector.console.promptElement.dispatchEvent( TestSuite.createKeyEvent("Enter"));
- };
- var test = this;
- var messagesCount = 0;
- var inputIndex = 0;
- this.addSniffer(WebInspector.ConsoleView.prototype, "addMessage",
- function(commandResult) {
- messagesCount++;
- if (messagesCount === expectations.length) {
- var messages = WebInspector.console.messages;
- for (var i = 0; i < expectations; ++i) {
- var elem = messages[i++].toMessageElement();
- test.assertEquals(elem.textContent, expectations[i]);
- }
- test.releaseControl();
- } else if (messagesCount % 2 === 0)
- initEval(inputs[inputIndex++]);
- }, true);
-
- initEval(inputs[inputIndex++]);
- this.takeControl();
-};
-
-
-/**
* Tests the message loop re-entrancy.
*/
TestSuite.prototype.testMessageLoopReentrant = function()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list