Title: [154090] trunk/LayoutTests
- Revision
- 154090
- Author
- [email protected]
- Date
- 2013-08-14 23:12:53 -0700 (Wed, 14 Aug 2013)
Log Message
Don't copy js-test-pre in cookies-test-pre
https://bugs.webkit.org/show_bug.cgi?id=119802
Reviewed by Sam Weinig.
* http/tests/cookies/resources/cookies-test-post.js:
* http/tests/cookies/resources/cookies-test-pre.js:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (154089 => 154090)
--- trunk/LayoutTests/ChangeLog 2013-08-15 05:14:04 UTC (rev 154089)
+++ trunk/LayoutTests/ChangeLog 2013-08-15 06:12:53 UTC (rev 154090)
@@ -1,3 +1,13 @@
+2013-08-14 Alexey Proskuryakov <[email protected]>
+
+ Don't copy js-test-pre in cookies-test-pre
+ https://bugs.webkit.org/show_bug.cgi?id=119802
+
+ Reviewed by Sam Weinig.
+
+ * http/tests/cookies/resources/cookies-test-post.js:
+ * http/tests/cookies/resources/cookies-test-pre.js:
+
2013-08-14 Ryuan Choi <[email protected]>
<https://webkit.org/b/119786> [EFL] decoration of search type is different from other platforms
Modified: trunk/LayoutTests/http/tests/cookies/resources/cookies-test-post.js (154089 => 154090)
--- trunk/LayoutTests/http/tests/cookies/resources/cookies-test-post.js 2013-08-15 05:14:04 UTC (rev 154089)
+++ trunk/LayoutTests/http/tests/cookies/resources/cookies-test-post.js 2013-08-15 06:12:53 UTC (rev 154090)
@@ -1,5 +1,4 @@
-shouldBeTrue("successfullyParsed");
-debug('<br /><span class="pass">TEST COMPLETE</span>');
+document.write("<script src=''></script>");
// Make sure that we do not leak any cookies.
clearCookies();
Modified: trunk/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js (154089 => 154090)
--- trunk/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js 2013-08-15 05:14:04 UTC (rev 154089)
+++ trunk/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js 2013-08-15 06:12:53 UTC (rev 154090)
@@ -1,154 +1,5 @@
-if (window.testRunner)
- testRunner.dumpAsText();
+document.write("<script src=''></script>");
-function description(msg)
-{
- // For MSIE 6 compatibility
- var span = document.createElement("span");
- span.innerHTML = '<p>' + msg + '</p><p>On success, you will see a series of "<span class="pass">PASS</span>" messages, followed by "<span class="pass">TEST COMPLETE</span>".</p>';
- var description = document.getElementById("description");
- if (description.firstChild)
- description.replaceChild(span, description.firstChild);
- else
- description.appendChild(span);
-}
-
-function debug(msg)
-{
- var span = document.createElement("span");
- document.getElementById("console").appendChild(span); // insert it first so XHTML knows the namespace
- span.innerHTML = msg + '<br />';
-}
-
-function escapeHTML(text)
-{
- return text.replace(/&/g, "&").replace(/</g, "<");
-}
-
-function testPassed(msg)
-{
- debug('<span><span class="pass">PASS</span> ' + escapeHTML(msg) + '</span>');
-}
-
-function testFailed(msg)
-{
- debug('<span><span class="fail">FAIL</span> ' + escapeHTML(msg) + '</span>');
-}
-
-function areArraysEqual(_a, _b)
-{
- if (_a.length !== _b.length)
- return false;
- for (var i = 0; i < _a.length; i++)
- if (_a[i] !== _b[i])
- return false;
- return true;
-}
-
-function isMinusZero(n)
-{
- // the only way to tell 0 from -0 in JS is the fact that 1/-0 is
- // -Infinity instead of Infinity
- return n === 0 && 1/n < 0;
-}
-
-function isResultCorrect(_actual, _expected)
-{
- if (_expected === 0)
- return _actual === _expected && (1/_actual) === (1/_expected);
- if (_actual === _expected)
- return true;
- if (typeof(_expected) == "number" && isNaN(_expected))
- return typeof(_actual) == "number" && isNaN(_actual);
- if (Object.prototype.toString.call(_expected) == Object.prototype.toString.call([]))
- return areArraysEqual(_actual, _expected);
- return false;
-}
-
-function stringify(v)
-{
- if (v === 0 && 1/v < 0)
- return "-0";
- else return "" + v;
-}
-
-function shouldBe(_a, _b)
-{
- if (typeof _a != "string" || typeof _b != "string")
- debug("WARN: shouldBe() expects string arguments");
- var exception;
- var _av;
- try {
- _av = eval(_a);
- } catch (e) {
- exception = e;
- }
- var _bv = eval(_b);
-
- if (exception)
- testFailed(_a + " should be " + _bv + ". Threw exception " + exception);
- else if (isResultCorrect(_av, _bv))
- testPassed(_a + " is " + _b);
- else if (typeof(_av) == typeof(_bv))
- testFailed(_a + " should be " + _bv + ". Was " + stringify(_av) + ".");
- else
- testFailed(_a + " should be " + _bv + " (of type " + typeof _bv + "). Was " + _av + " (of type " + typeof _av + ").");
-}
-
-function shouldBeTrue(_a) { shouldBe(_a, "true"); }
-function shouldBeFalse(_a) { shouldBe(_a, "false"); }
-function shouldBeNaN(_a) { shouldBe(_a, "NaN"); }
-function shouldBeNull(_a) { shouldBe(_a, "null"); }
-
-function shouldBeEqualToString(a, b)
-{
- var unevaledString = '"' + b.replace(/\\/g, "\\\\").replace(/"/g, "\"").replace(/\n/g, "\\n").replace(/\r/g, "\\r") + '"';
- shouldBe(a, unevaledString);
-}
-
-function shouldBeUndefined(_a)
-{
- var exception;
- var _av;
- try {
- _av = eval(_a);
- } catch (e) {
- exception = e;
- }
-
- if (exception)
- testFailed(_a + " should be undefined. Threw exception " + exception);
- else if (typeof _av == "undefined")
- testPassed(_a + " is undefined.");
- else
- testFailed(_a + " should be undefined. Was " + _av);
-}
-
-function shouldThrow(_a, _e)
-{
- var exception;
- var _av;
- try {
- _av = eval(_a);
- } catch (e) {
- exception = e;
- }
-
- var _ev;
- if (_e)
- _ev = eval(_e);
-
- if (exception) {
- if (typeof _e == "undefined" || exception == _ev)
- testPassed(_a + " threw exception " + exception + ".");
- else
- testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Threw exception " + exception + ".");
- } else if (typeof _av == "undefined")
- testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Was undefined.");
- else
- testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Was " + _av + ".");
-}
-
var cookies = new Array();
// This method sets the cookies using XMLHttpRequest.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
