[Content Filtering] Add some additional unblock tests
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Apr 2015 04:48:33 +0000 (04:48 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Apr 2015 04:48:33 +0000 (04:48 +0000)
https://bugs.webkit.org/show_bug.cgi?id=143435

Reviewed by Dan Bernstein.

* contentfiltering/block-after-add-data-then-allow-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
* contentfiltering/block-after-add-data-then-allow-unblock.html: Added.
* contentfiltering/block-after-add-data-then-deny-unblock-expected.html: Renamed from LayoutTests/contentfiltering/allow-after-unblock-request-expected.html.
* contentfiltering/block-after-add-data-then-deny-unblock.html: Added.
* contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
* contentfiltering/block-after-finished-adding-data-then-allow-unblock.html: Renamed from LayoutTests/contentfiltering/allow-after-unblock-request.html.
* contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
* contentfiltering/block-after-finished-adding-data-then-deny-unblock.html: Renamed from LayoutTests/contentfiltering/block-after-unblock-request.html.
* contentfiltering/block-after-response-then-allow-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
* contentfiltering/block-after-response-then-allow-unblock.html: Added.
* contentfiltering/block-after-response-then-deny-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
* contentfiltering/block-after-response-then-deny-unblock.html: Added.
* contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
* contentfiltering/block-after-will-send-request-then-allow-unblock.html: Added.
* contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html: Renamed from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
* contentfiltering/block-after-will-send-request-then-deny-unblock.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182376 268f45cc-cd09-0410-ab3c-d52691b4dbfc

17 files changed:
LayoutTests/ChangeLog
LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock-expected.html [moved from LayoutTests/contentfiltering/allow-after-unblock-request-expected.html with 100% similarity]
LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock-expected.html [moved from LayoutTests/contentfiltering/block-after-unblock-request-expected.html with 100% similarity]
LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock.html [moved from LayoutTests/contentfiltering/allow-after-unblock-request.html with 100% similarity]
LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock.html [moved from LayoutTests/contentfiltering/block-after-unblock-request.html with 100% similarity]
LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-response-then-allow-unblock.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-response-then-deny-unblock.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html [new file with mode: 0644]
LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock.html [new file with mode: 0644]

index 1ead4b1..41ca98a 100644 (file)
@@ -1,5 +1,29 @@
 2015-04-05  Andy Estes  <aestes@apple.com>
 
+        [Content Filtering] Add some additional unblock tests
+        https://bugs.webkit.org/show_bug.cgi?id=143435
+
+        Reviewed by Dan Bernstein.
+
+        * contentfiltering/block-after-add-data-then-allow-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
+        * contentfiltering/block-after-add-data-then-allow-unblock.html: Added.
+        * contentfiltering/block-after-add-data-then-deny-unblock-expected.html: Renamed from LayoutTests/contentfiltering/allow-after-unblock-request-expected.html.
+        * contentfiltering/block-after-add-data-then-deny-unblock.html: Added.
+        * contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
+        * contentfiltering/block-after-finished-adding-data-then-allow-unblock.html: Renamed from LayoutTests/contentfiltering/allow-after-unblock-request.html.
+        * contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
+        * contentfiltering/block-after-finished-adding-data-then-deny-unblock.html: Renamed from LayoutTests/contentfiltering/block-after-unblock-request.html.
+        * contentfiltering/block-after-response-then-allow-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
+        * contentfiltering/block-after-response-then-allow-unblock.html: Added.
+        * contentfiltering/block-after-response-then-deny-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
+        * contentfiltering/block-after-response-then-deny-unblock.html: Added.
+        * contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html: Copied from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
+        * contentfiltering/block-after-will-send-request-then-allow-unblock.html: Added.
+        * contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html: Renamed from LayoutTests/contentfiltering/block-after-unblock-request-expected.html.
+        * contentfiltering/block-after-will-send-request-then-deny-unblock.html: Added.
+
+2015-04-05  Andy Estes  <aestes@apple.com>
+
         [Content Filtering] Tell the filter about requests and redirects
         https://bugs.webkit.org/show_bug.cgi?id=143414
         rdar://problem/19239549
diff --git a/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock.html b/LayoutTests/contentfiltering/block-after-add-data-then-allow-unblock.html
new file mode 100644 (file)
index 0000000..0bf6be3
--- /dev/null
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script src="resources/contentfiltering.js"></script>
+<script>
+if (window.internals) {
+    var settings = window.internals.mockContentFilterSettings;
+    testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_ADD_DATA, /* decision */settings.DECISION_ALLOW, /* decideAfterUnblockRequest */true);
+}
+</script>
diff --git a/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock.html b/LayoutTests/contentfiltering/block-after-add-data-then-deny-unblock.html
new file mode 100644 (file)
index 0000000..c8ee59e
--- /dev/null
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script src="resources/contentfiltering.js"></script>
+<script>
+if (window.internals) {
+    var settings = window.internals.mockContentFilterSettings;
+    testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_ADD_DATA, /* decision */settings.DECISION_BLOCK, /* decideAfterUnblockRequest */true);
+}
+</script>
diff --git a/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html b/LayoutTests/contentfiltering/block-after-finished-adding-data-then-allow-unblock-expected.html
new file mode 100644 (file)
index 0000000..fbd92ad
--- /dev/null
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<iframe src="data:text/html,<!DOCTYPE html><body>PASS"></iframe>
diff --git a/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html b/LayoutTests/contentfiltering/block-after-finished-adding-data-then-deny-unblock-expected.html
new file mode 100644 (file)
index 0000000..fbd92ad
--- /dev/null
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<iframe src="data:text/html,<!DOCTYPE html><body>PASS"></iframe>
diff --git a/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.html b/LayoutTests/contentfiltering/block-after-response-then-allow-unblock-expected.html
new file mode 100644 (file)
index 0000000..fbd92ad
--- /dev/null
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<iframe src="data:text/html,<!DOCTYPE html><body>PASS"></iframe>
diff --git a/LayoutTests/contentfiltering/block-after-response-then-allow-unblock.html b/LayoutTests/contentfiltering/block-after-response-then-allow-unblock.html
new file mode 100644 (file)
index 0000000..06cff59
--- /dev/null
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script src="resources/contentfiltering.js"></script>
+<script>
+if (window.internals) {
+    var settings = window.internals.mockContentFilterSettings;
+    testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_RESPONSE, /* decision */settings.DECISION_ALLOW, /* decideAfterUnblockRequest */true);
+}
+</script>
diff --git a/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.html b/LayoutTests/contentfiltering/block-after-response-then-deny-unblock-expected.html
new file mode 100644 (file)
index 0000000..fbd92ad
--- /dev/null
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<iframe src="data:text/html,<!DOCTYPE html><body>PASS"></iframe>
diff --git a/LayoutTests/contentfiltering/block-after-response-then-deny-unblock.html b/LayoutTests/contentfiltering/block-after-response-then-deny-unblock.html
new file mode 100644 (file)
index 0000000..5c3479c
--- /dev/null
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script src="resources/contentfiltering.js"></script>
+<script>
+if (window.internals) {
+    var settings = window.internals.mockContentFilterSettings;
+    testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_RESPONSE, /* decision */settings.DECISION_BLOCK, /* decideAfterUnblockRequest */true);
+}
+</script>
diff --git a/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html b/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock-expected.html
new file mode 100644 (file)
index 0000000..fbd92ad
--- /dev/null
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<iframe src="data:text/html,<!DOCTYPE html><body>PASS"></iframe>
diff --git a/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock.html b/LayoutTests/contentfiltering/block-after-will-send-request-then-allow-unblock.html
new file mode 100644 (file)
index 0000000..3daa31b
--- /dev/null
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script src="resources/contentfiltering.js"></script>
+<script>
+if (window.internals) {
+    var settings = window.internals.mockContentFilterSettings;
+    testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_WILL_SEND_REQUEST, /* decision */settings.DECISION_ALLOW, /* decideAfterUnblockRequest */true);
+}
+</script>
diff --git a/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html b/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock-expected.html
new file mode 100644 (file)
index 0000000..fbd92ad
--- /dev/null
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<iframe src="data:text/html,<!DOCTYPE html><body>PASS"></iframe>
diff --git a/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock.html b/LayoutTests/contentfiltering/block-after-will-send-request-then-deny-unblock.html
new file mode 100644 (file)
index 0000000..227b7c4
--- /dev/null
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script src="resources/contentfiltering.js"></script>
+<script>
+if (window.internals) {
+    var settings = window.internals.mockContentFilterSettings;
+    testContentFiltering(/* decisionPoint */settings.DECISION_POINT_AFTER_WILL_SEND_REQUEST, /* decision */settings.DECISION_BLOCK, /* decideAfterUnblockRequest */true);
+}
+</script>