Diff
Modified: trunk/LayoutTests/ChangeLog (181782 => 181783)
--- trunk/LayoutTests/ChangeLog 2015-03-20 05:45:38 UTC (rev 181782)
+++ trunk/LayoutTests/ChangeLog 2015-03-20 05:58:32 UTC (rev 181783)
@@ -1,3 +1,22 @@
+2015-03-19 Andy Estes <aes...@apple.com>
+
+ [Content Filtering] Give contentfiltering tests a _javascript_ harness
+ https://bugs.webkit.org/show_bug.cgi?id=142899
+
+ Reviewed by Andreas Kling.
+
+ Create a _javascript_ function to run the contentfiltering/ tests. This consolodates shared logic and will make
+ it easier to write new tests.
+
+ * TestExpectations: Skipped a test that times out with the new harness (but it also failed before).
+ * contentfiltering/allow-after-add-data.html: Called testContentFiltering().
+ * contentfiltering/allow-after-finished-adding-data.html: Ditto.
+ * contentfiltering/allow-after-response.html: Ditto.
+ * contentfiltering/block-after-add-data.html: Ditto.
+ * contentfiltering/block-after-finished-adding-data.html: Ditto.
+ * contentfiltering/block-after-response.html: Ditto.
+ * contentfiltering/resources/contentfiltering.js: Added.
+
2015-03-19 Brent Fulgham <bfulg...@apple.com>
[Win] Try to get the Debug bots green.
Modified: trunk/LayoutTests/TestExpectations (181782 => 181783)
--- trunk/LayoutTests/TestExpectations 2015-03-20 05:45:38 UTC (rev 181782)
+++ trunk/LayoutTests/TestExpectations 2015-03-20 05:58:32 UTC (rev 181783)
@@ -490,3 +490,6 @@
webkit.org/b/114280 svg/animations/smil-leak-element-instances-noBaseValRef.svg [ Pass Failure ]
webkit.org/b/114280 svg/animations/smil-leak-element-instances.svg [ Pass Failure ]
webkit.org/b/114280 svg/animations/smil-leak-elements.svg [ Pass Failure ]
+
+# contentfiltering/block-after-add-data.html times out unexpectedly
+webkit.org/b/142894 contentfiltering/block-after-add-data.html [ Skip ]
Modified: trunk/LayoutTests/contentfiltering/allow-after-add-data.html (181782 => 181783)
--- trunk/LayoutTests/contentfiltering/allow-after-add-data.html 2015-03-20 05:45:38 UTC (rev 181782)
+++ trunk/LayoutTests/contentfiltering/allow-after-add-data.html 2015-03-20 05:58:32 UTC (rev 181783)
@@ -1,9 +1,8 @@
<!DOCTYPE html>
+<script src=""
<script>
-var settings = window.internals.mockContentFilterSettings;
-settings.enabled = true;
-settings.blockedString = "FAIL";
-settings.decisionPoint = settings.DECISION_POINT_AFTER_ADD_DATA;
-settings.decision = settings.DECISION_ALLOW;
+if (window.internals) {
+ var settings = window.internals.mockContentFilterSettings;
+ testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_ADD_DATA, /* decision */settings.DECISION_ALLOW);
+}
</script>
-<iframe src=""
Modified: trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data.html (181782 => 181783)
--- trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data.html 2015-03-20 05:45:38 UTC (rev 181782)
+++ trunk/LayoutTests/contentfiltering/allow-after-finished-adding-data.html 2015-03-20 05:58:32 UTC (rev 181783)
@@ -1,9 +1,8 @@
<!DOCTYPE html>
+<script src=""
<script>
-var settings = window.internals.mockContentFilterSettings;
-settings.enabled = true;
-settings.blockedString = "FAIL";
-settings.decisionPoint = settings.DECISION_POINT_AFTER_FINISHED_ADDING_DATA;
-settings.decision = settings.DECISION_ALLOW;
+if (window.internals) {
+ var settings = window.internals.mockContentFilterSettings;
+ testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_FINISHED_ADDING_DATA, /* decision */settings.DECISION_ALLOW);
+}
</script>
-<iframe src=""
Modified: trunk/LayoutTests/contentfiltering/allow-after-response.html (181782 => 181783)
--- trunk/LayoutTests/contentfiltering/allow-after-response.html 2015-03-20 05:45:38 UTC (rev 181782)
+++ trunk/LayoutTests/contentfiltering/allow-after-response.html 2015-03-20 05:58:32 UTC (rev 181783)
@@ -1,9 +1,8 @@
<!DOCTYPE html>
+<script src=""
<script>
-var settings = window.internals.mockContentFilterSettings;
-settings.enabled = true;
-settings.blockedString = "FAIL";
-settings.decisionPoint = settings.DECISION_POINT_AFTER_RESPONSE;
-settings.decision = settings.DECISION_ALLOW;
+if (window.internals) {
+ var settings = window.internals.mockContentFilterSettings;
+ testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_RESPONSE, /* decision */settings.DECISION_ALLOW);
+}
</script>
-<iframe src=""
Modified: trunk/LayoutTests/contentfiltering/block-after-add-data.html (181782 => 181783)
--- trunk/LayoutTests/contentfiltering/block-after-add-data.html 2015-03-20 05:45:38 UTC (rev 181782)
+++ trunk/LayoutTests/contentfiltering/block-after-add-data.html 2015-03-20 05:58:32 UTC (rev 181783)
@@ -1,9 +1,8 @@
<!DOCTYPE html>
+<script src=""
<script>
-var settings = window.internals.mockContentFilterSettings;
-settings.enabled = true;
-settings.blockedString = "PASS";
-settings.decisionPoint = settings.DECISION_POINT_AFTER_ADD_DATA;
-settings.decision = settings.DECISION_BLOCK;
+if (window.internals) {
+ var settings = window.internals.mockContentFilterSettings;
+ testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_ADD_DATA, /* decision */settings.DECISION_BLOCK);
+}
</script>
-<iframe src=""
Modified: trunk/LayoutTests/contentfiltering/block-after-finished-adding-data.html (181782 => 181783)
--- trunk/LayoutTests/contentfiltering/block-after-finished-adding-data.html 2015-03-20 05:45:38 UTC (rev 181782)
+++ trunk/LayoutTests/contentfiltering/block-after-finished-adding-data.html 2015-03-20 05:58:32 UTC (rev 181783)
@@ -1,9 +1,8 @@
<!DOCTYPE html>
+<script src=""
<script>
-var settings = window.internals.mockContentFilterSettings;
-settings.enabled = true;
-settings.blockedString = "PASS";
-settings.decisionPoint = settings.DECISION_POINT_AFTER_FINISHED_ADDING_DATA;
-settings.decision = settings.DECISION_BLOCK;
+if (window.internals) {
+ var settings = window.internals.mockContentFilterSettings;
+ testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_FINISHED_ADDING_DATA, /* decision */settings.DECISION_BLOCK);
+}
</script>
-<iframe src=""
Modified: trunk/LayoutTests/contentfiltering/block-after-response.html (181782 => 181783)
--- trunk/LayoutTests/contentfiltering/block-after-response.html 2015-03-20 05:45:38 UTC (rev 181782)
+++ trunk/LayoutTests/contentfiltering/block-after-response.html 2015-03-20 05:58:32 UTC (rev 181783)
@@ -1,9 +1,8 @@
<!DOCTYPE html>
+<script src=""
<script>
-var settings = window.internals.mockContentFilterSettings;
-settings.enabled = true;
-settings.blockedString = "PASS";
-settings.decisionPoint = settings.DECISION_POINT_AFTER_RESPONSE;
-settings.decision = settings.DECISION_BLOCK;
+if (window.internals) {
+ var settings = window.internals.mockContentFilterSettings;
+ testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_RESPONSE, /* decision */settings.DECISION_BLOCK);
+}
</script>
-<iframe src=""
Added: trunk/LayoutTests/contentfiltering/resources/contentfiltering.js (0 => 181783)
--- trunk/LayoutTests/contentfiltering/resources/contentfiltering.js (rev 0)
+++ trunk/LayoutTests/contentfiltering/resources/contentfiltering.js 2015-03-20 05:58:32 UTC (rev 181783)
@@ -0,0 +1,35 @@
+function _doTest(decisionPoint, decision)
+{
+ var settings = window.internals.mockContentFilterSettings;
+ settings.enabled = true;
+ settings.decisionPoint = decisionPoint;
+ settings.decision = decision;
+
+ var blockedStringText = (decision === settings.DECISION_ALLOW ? "FAIL" : "PASS");
+ settings.blockedString = "<!DOCTYPE html><body>" + blockedStringText;
+
+ var iframe = document.createElement("iframe");
+ document.body.appendChild(iframe);
+ iframe.addEventListener("load", function(event) {
+ window.testRunner.notifyDone();
+ }, false);
+ iframe.src = "" html><body>" + (blockedStringText === "FAIL" ? "PASS" : "FAIL");
+}
+
+function testContentFiltering(decisionPoint, decision)
+{
+ if (!window.internals) {
+ console.log("This test requires window.internals");
+ return;
+ }
+
+ if (!window.testRunner) {
+ console.log("This test requires window.testRunner");
+ return;
+ }
+
+ window.testRunner.waitUntilDone();
+ window.addEventListener("load", function(event) {
+ _doTest(decisionPoint, decision);
+ }, false);
+}
\ No newline at end of file
