Title: [131204] trunk
- Revision
- 131204
- Author
- [email protected]
- Date
- 2012-10-12 11:38:18 -0700 (Fri, 12 Oct 2012)
Log Message
[BlackBerry] Add tests of WebSocketEnabled preference
https://bugs.webkit.org/show_bug.cgi?id=84982
Reviewed by Yong Li.
Tools:
Allow WebSocketsEnabled preference setting.
* DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
(TestRunner::overridePreference):
LayoutTests:
* platform/blackberry/http/tests/websocket/tests/enable-disable-setting-expected.txt: Added.
* platform/blackberry/http/tests/websocket/tests/enable-disable-setting.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (131203 => 131204)
--- trunk/LayoutTests/ChangeLog 2012-10-12 18:30:05 UTC (rev 131203)
+++ trunk/LayoutTests/ChangeLog 2012-10-12 18:38:18 UTC (rev 131204)
@@ -1,3 +1,13 @@
+2012-10-12 Rob Buis <[email protected]>
+
+ [BlackBerry] Add tests of WebSocketEnabled preference
+ https://bugs.webkit.org/show_bug.cgi?id=84982
+
+ Reviewed by Yong Li.
+
+ * platform/blackberry/http/tests/websocket/tests/enable-disable-setting-expected.txt: Added.
+ * platform/blackberry/http/tests/websocket/tests/enable-disable-setting.html: Added.
+
2012-10-11 Emil A Eklund <[email protected]>
[Sub pixel layout] Change RenderBox to not round logicalTop/Left for RenderReplaced
Added: trunk/LayoutTests/platform/blackberry/http/tests/websocket/tests/enable-disable-setting-expected.txt (0 => 131204)
--- trunk/LayoutTests/platform/blackberry/http/tests/websocket/tests/enable-disable-setting-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/blackberry/http/tests/websocket/tests/enable-disable-setting-expected.txt 2012-10-12 18:38:18 UTC (rev 131204)
@@ -0,0 +1,3 @@
+PASSED: websocket object is available when WebSocketsEnabled is true
+PASSED: websocket object is not available when WebSocketsEnabled is false
+TEST COMPLETE
Added: trunk/LayoutTests/platform/blackberry/http/tests/websocket/tests/enable-disable-setting.html (0 => 131204)
--- trunk/LayoutTests/platform/blackberry/http/tests/websocket/tests/enable-disable-setting.html (rev 0)
+++ trunk/LayoutTests/platform/blackberry/http/tests/websocket/tests/enable-disable-setting.html 2012-10-12 18:38:18 UTC (rev 131204)
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>RIM PR 152311</title>
+<script>
+function appendResult(text)
+{
+ document.getElementById("results").innerHTML += text;
+}
+
+function runTest()
+{
+ if (window.testRunner) {
+ window.testRunner.dumpAsText();
+ window.testRunner.overridePreference("WebSocketsEnabled", true);
+ }
+ if (window.WebSocket) {
+ appendResult("PASSED: websocket object is available when WebSocketsEnabled is true<br>");
+ } else {
+ appendResult("FAILED: websocket object is not available when WebSocketsEnabled is true<br>");
+ }
+ if (window.testRunner) {
+ window.testRunner.overridePreference("WebSocketsEnabled", false);
+ }
+ if (window.WebSocket) {
+ appendResult("FAILED: websocket object is available when WebSocketsEnabled is false<br>");
+ } else {
+ appendResult("PASSED: websocket object is not available when WebSocketsEnabled is false<br>");
+ }
+ appendResult("TEST COMPLETE");
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<div id="results"></div>
+</body>
+</html>
Modified: trunk/Tools/ChangeLog (131203 => 131204)
--- trunk/Tools/ChangeLog 2012-10-12 18:30:05 UTC (rev 131203)
+++ trunk/Tools/ChangeLog 2012-10-12 18:38:18 UTC (rev 131204)
@@ -1,3 +1,17 @@
+2012-10-12 Rob Buis <[email protected]>
+
+ [BlackBerry] Add tests of WebSocketEnabled preference
+ https://bugs.webkit.org/show_bug.cgi?id=84982
+
+ Reviewed by Yong Li.
+
+ PR 209265.
+
+ Allow WebSocketsEnabled preference setting.
+
+ * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
+ (TestRunner::overridePreference):
+
2012-10-12 Tommy Widenflycht <[email protected]>
Creating a MediaStream subscription in watchlist
Modified: trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp (131203 => 131204)
--- trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp 2012-10-12 18:30:05 UTC (rev 131203)
+++ trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp 2012-10-12 18:38:18 UTC (rev 131204)
@@ -437,6 +437,8 @@
DumpRenderTreeSupport::setLinksIncludedInFocusChain(valueStr == "true" || valueStr == "1");
else if (keyStr == "WebKitHyperlinkAuditingEnabled")
mainFrame->page()->settings()->setHyperlinkAuditingEnabled(valueStr == "true" || valueStr == "1");
+ else if (keyStr == "WebSocketsEnabled")
+ BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setWebSocketsEnabled(valueStr == "true" || valueStr == "1");
}
void TestRunner::setAlwaysAcceptCookies(bool alwaysAcceptCookies)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
