Changeset 260451 in webkit

Timestamp:

Apr 21, 2020 1:49:32 PM (4 years ago)

Author:

Kate Cheney

Message:

Move WebKit.WebViewCategory test to InAppBrowserPrivacy.mm
​https://bugs.webkit.org/show_bug.cgi?id=210811
<rdar://problem/60972505>

Reviewed by Alexey Proskuryakov.

This test was added before InAppBrowserPrivacy.mm existed. It should
be moved here so it has access to all setup/cleanup needed by these
tests.

• TestWebKitAPI/Tests/WebKitCocoa/Configuration.mm:
• TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/Configuration.mm (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-21  Kate Cheney  <katherine_cheney@apple.com>
+
+        Move WebKit.WebViewCategory test to InAppBrowserPrivacy.mm
+        https://bugs.webkit.org/show_bug.cgi?id=210811
+        <rdar://problem/60972505> 
+
+        Reviewed by Alexey Proskuryakov.
+
+        This test was added before InAppBrowserPrivacy.mm existed. It should
+        be moved here so it has access to all setup/cleanup needed by these
+        tests.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/Configuration.mm:
+        * TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:
+
 2020-04-21  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Configuration.mm

@@ -60 +60 @@
 }
 
-TEST(WebKit, WebViewCategory)
-{
-    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    EXPECT_EQ([configuration _webViewCategory], _WKWebViewCategoryAppBoundDomain);
-
-    [configuration _setWebViewCategory:_WKWebViewCategoryInAppBrowser];
-    EXPECT_EQ([configuration _webViewCategory], _WKWebViewCategoryInAppBrowser);
-
-    [configuration _setWebViewCategory:_WKWebViewCategoryWebBrowser];
-    EXPECT_EQ([configuration _webViewCategory], _WKWebViewCategoryWebBrowser);
-
-    [configuration _setWebViewCategory:_WKWebViewCategoryAppBoundDomain];
-    EXPECT_EQ([configuration _webViewCategory], _WKWebViewCategoryAppBoundDomain);
-}
-
 #endif

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm

@@ -1029 +1029 @@
 }
 
+TEST(InAppBrowserPrivacy, WebViewCategory)
+{
+    initializeInAppBrowserPrivacyTestSettings();
+
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    EXPECT_EQ([configuration _webViewCategory], _WKWebViewCategoryAppBoundDomain);
+
+    [configuration _setWebViewCategory:_WKWebViewCategoryInAppBrowser];
+    EXPECT_EQ([configuration _webViewCategory], _WKWebViewCategoryInAppBrowser);
+
+    [configuration _setWebViewCategory:_WKWebViewCategoryWebBrowser];
+    EXPECT_EQ([configuration _webViewCategory], _WKWebViewCategoryWebBrowser);
+
+    [configuration _setWebViewCategory:_WKWebViewCategoryAppBoundDomain];
+    EXPECT_EQ([configuration _webViewCategory], _WKWebViewCategoryAppBoundDomain);
+
+    cleanUpInAppBrowserPrivacyTestSettings();
+}
+
 #endif // USE(APPLE_INTERNAL_SDK)