Skip to site navigation (Press enter)

[webkit-changes] [184314] trunk/Tools

commit-queue Wed, 13 May 2015 15:27:58 -0700

Title: [184314] trunk/Tools

Revision: 184314
Author: [email protected]
Date: 2015-05-13 15:27:37 -0700 (Wed, 13 May 2015)

Log Message

[Content Extensions] Test interactions between multiple extensions and multiple domains.
https://bugs.webkit.org/show_bug.cgi?id=144967


Patch by Alex Christensen <[email protected]> on 2015-05-13
Reviewed by Benjamin Poulain.

* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
Xcode wanted to fix an alphabetization issue.
* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::TEST_F):
Test interactions that worked but were not explicitly tested before.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp

Diff

Modified: trunk/Tools/ChangeLog (184313 => 184314)


--- trunk/Tools/ChangeLog	2015-05-13 22:23:52 UTC (rev 184313)
+++ trunk/Tools/ChangeLog	2015-05-13 22:27:37 UTC (rev 184314)
@@ -1,3 +1,16 @@
+2015-05-13  Alex Christensen  <[email protected]>
+
+        [Content Extensions] Test interactions between multiple extensions and multiple domains.
+        https://bugs.webkit.org/show_bug.cgi?id=144967
+
+        Reviewed by Benjamin Poulain.
+
+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+        Xcode wanted to fix an alphabetization issue.
+        * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+        (TestWebKitAPI::TEST_F):
+        Test interactions that worked but were not explicitly tested before.
+
 2015-05-12  Ryosuke Niwa  <[email protected]>
 
         Unreviewed build fix.

Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (184313 => 184314)


--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj	2015-05-13 22:23:52 UTC (rev 184313)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj	2015-05-13 22:27:37 UTC (rev 184314)
@@ -1219,12 +1219,12 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = All;
 				SECTORDER_FLAGS = "";
+				USE_EXPORT_MACROS = 0;
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
 				);
-				USE_EXPORT_MACROS = 0;
 			};
 			name = Debug;
 		};
@@ -1237,12 +1237,12 @@
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = All;
 				SECTORDER_FLAGS = "";
+				USE_EXPORT_MACROS = 0;
 				WARNING_CFLAGS = (
 					"-Wmost",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
 				);
-				USE_EXPORT_MACROS = 0;
 			};
 			name = Release;
 		};

Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (184313 => 184314)


--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp	2015-05-13 22:23:52 UTC (rev 184313)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp	2015-05-13 22:27:37 UTC (rev 184314)
@@ -472,9 +472,52 @@
     testRequest(domainRegexBackend, mainDocumentRequest("http://webkit.org/test.html"), { });
     testRequest(domainRegexBackend, mainDocumentRequest("http://wbkit.org/test.html"), { });
     
+    auto multipleIfDomainsBackend = makeBackend("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"test\\\\.html\", \"if-domain\":[\"webkit.org\", \"w3c.org\"]}}]");
+    testRequest(multipleIfDomainsBackend, mainDocumentRequest("http://webkit.org/test.htm"), { });
+    testRequest(multipleIfDomainsBackend, mainDocumentRequest("http://webkit.org/test.html"), { ContentExtensions::ActionType::BlockLoad });
+    testRequest(multipleIfDomainsBackend, mainDocumentRequest("http://w3c.org/test.html"), { ContentExtensions::ActionType::BlockLoad });
+    testRequest(multipleIfDomainsBackend, mainDocumentRequest("http://whatwg.org/test.html"), { });
+
+    auto multipleUnlessDomainsBackend = makeBackend("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"test\\\\.html\", \"unless-domain\":[\"webkit.org\", \"w3c.org\"]}}]");
+    testRequest(multipleUnlessDomainsBackend, mainDocumentRequest("http://webkit.org/test.htm"), { });
+    testRequest(multipleUnlessDomainsBackend, mainDocumentRequest("http://webkit.org/test.html"), { });
+    testRequest(multipleUnlessDomainsBackend, mainDocumentRequest("http://w3c.org/test.html"), { });
+    testRequest(multipleUnlessDomainsBackend, mainDocumentRequest("http://whatwg.org/test.html"), { ContentExtensions::ActionType::BlockLoad });
+
     // FIXME: Add and test domain-specific popup-only blocking (with layout tests).
 }
     
+TEST_F(ContentExtensionTest, MultipleExtensions)
+{
+    auto extension1 = InMemoryCompiledContentExtension::createFromFilter("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"block_load\"}}]");
+    auto extension2 = InMemoryCompiledContentExtension::createFromFilter("[{\"action\":{\"type\":\"block-cookies\"},\"trigger\":{\"url-filter\":\"block_cookies\"}}]");
+    ContentExtensions::ContentExtensionsBackend backend;
+    backend.addContentExtension("testFilter1", extension1);
+    backend.addContentExtension("testFilter2", extension2);
+    
+    // These each have two display:none stylesheets. The second one is implied by using the default parameter ignorePreviousRules = false.
+    testRequest(backend, mainDocumentRequest("http://webkit.org"), { ContentExtensions::ActionType::CSSDisplayNoneStyleSheet });
+    testRequest(backend, mainDocumentRequest("http://webkit.org/block_load.html"), { ContentExtensions::ActionType::CSSDisplayNoneStyleSheet, ContentExtensions::ActionType::BlockLoad});
+    testRequest(backend, mainDocumentRequest("http://webkit.org/block_cookies.html"), { ContentExtensions::ActionType::BlockCookies, ContentExtensions::ActionType::CSSDisplayNoneStyleSheet});
+    testRequest(backend, mainDocumentRequest("http://webkit.org/block_load/block_cookies.html"), { ContentExtensions::ActionType::BlockCookies, ContentExtensions::ActionType::CSSDisplayNoneStyleSheet, ContentExtensions::ActionType::BlockLoad });
+    testRequest(backend, mainDocumentRequest("http://webkit.org/block_cookies/block_load.html"), { ContentExtensions::ActionType::BlockCookies, ContentExtensions::ActionType::CSSDisplayNoneStyleSheet, ContentExtensions::ActionType::BlockLoad });
+    
+    auto ignoreExtension1 = InMemoryCompiledContentExtension::createFromFilter("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"block_load\"}},"
+        "{\"action\":{\"type\":\"ignore-previous-rules\"},\"trigger\":{\"url-filter\":\"ignore1\"}}]");
+    auto ignoreExtension2 = InMemoryCompiledContentExtension::createFromFilter("[{\"action\":{\"type\":\"block-cookies\"},\"trigger\":{\"url-filter\":\"block_cookies\"}},"
+        "{\"action\":{\"type\":\"ignore-previous-rules\"},\"trigger\":{\"url-filter\":\"ignore2\"}}]");
+    ContentExtensions::ContentExtensionsBackend backendWithIgnore;
+    backendWithIgnore.addContentExtension("testFilter1", ignoreExtension1);
+    backendWithIgnore.addContentExtension("testFilter2", ignoreExtension2);
+    
+    testRequest(backendWithIgnore, mainDocumentRequest("http://webkit.org"), { ContentExtensions::ActionType::CSSDisplayNoneStyleSheet, ContentExtensions::ActionType::CSSDisplayNoneStyleSheet }, true);
+    testRequest(backendWithIgnore, mainDocumentRequest("http://webkit.org/block_load/ignore1.html"), { ContentExtensions::ActionType::CSSDisplayNoneStyleSheet }, true);
+    testRequest(backendWithIgnore, mainDocumentRequest("http://webkit.org/block_cookies/ignore1.html"), { ContentExtensions::ActionType::BlockCookies, ContentExtensions::ActionType::CSSDisplayNoneStyleSheet}, true);
+    testRequest(backendWithIgnore, mainDocumentRequest("http://webkit.org/block_load/ignore2.html"), { ContentExtensions::ActionType::BlockLoad, ContentExtensions::ActionType::CSSDisplayNoneStyleSheet }, true);
+    testRequest(backendWithIgnore, mainDocumentRequest("http://webkit.org/block_cookies/ignore2.html"), { ContentExtensions::ActionType::CSSDisplayNoneStyleSheet}, true);
+    testRequest(backendWithIgnore, mainDocumentRequest("http://webkit.org/block_load/block_cookies/ignore1/ignore2.html"), { }, true);
+}
+
 TEST_F(ContentExtensionTest, TermsKnownToMatchAnything)
 {
     auto backend = makeBackend("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"^pre1.*post1$\"}},"

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes