Title: [276195] trunk/Tools
Revision
276195
Author
[email protected]
Date
2021-04-16 22:03:59 -0700 (Fri, 16 Apr 2021)

Log Message

REGRESSION(r276164) [GTK] WKPreferencesDefaults API test is failing
https://bugs.webkit.org/show_bug.cgi?id=224710

Reviewed by Alex Christensen.

As of r276164, Mac/iOS disabled application cache by default but other
ports are still enabling it.

* TestWebKitAPI/Tests/WebKit/WKPreferences.cpp:
(TestWebKitAPI::TEST): Add missing WPE guard and test against expected
port value instead of enforcing a single value for every port.
* TestWebKitAPI/glib/TestExpectations.json: Remove WPE expected
failure.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (276194 => 276195)


--- trunk/Tools/ChangeLog	2021-04-17 04:45:48 UTC (rev 276194)
+++ trunk/Tools/ChangeLog	2021-04-17 05:03:59 UTC (rev 276195)
@@ -1,3 +1,19 @@
+2021-04-16  Lauro Moura  <[email protected]>
+
+        REGRESSION(r276164) [GTK] WKPreferencesDefaults API test is failing
+        https://bugs.webkit.org/show_bug.cgi?id=224710
+
+        Reviewed by Alex Christensen.
+
+        As of r276164, Mac/iOS disabled application cache by default but other
+        ports are still enabling it.
+
+        * TestWebKitAPI/Tests/WebKit/WKPreferences.cpp:
+        (TestWebKitAPI::TEST): Add missing WPE guard and test against expected
+        port value instead of enforcing a single value for every port.
+        * TestWebKitAPI/glib/TestExpectations.json: Remove WPE expected
+        failure.
+
 2021-04-16  Brent Fulgham  <[email protected]>
 
         Perform port blocking earlier in the load

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp (276194 => 276195)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp	2021-04-17 04:45:48 UTC (rev 276194)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp	2021-04-17 05:03:59 UTC (rev 276195)
@@ -44,7 +44,7 @@
 
 TEST(WebKit, WKPreferencesDefaults)
 {
-#if PLATFORM(GTK) || PLATFORM(PLAYSTATION)
+#if PLATFORM(GTK) || PLATFORM(PLAYSTATION) || PLATFORM(WPE)
     static const char* expectedStandardFontFamily = "Times";
     static const char* expectedFixedFontFamily = "Courier New";
     static const char* expectedSerifFontFamily = "Times";
@@ -52,6 +52,7 @@
     static const char* expectedCursiveFontFamily = "Comic Sans MS";
     static const char* expectedFantasyFontFamily = "Impact";
     static const char* expectedPictographFontFamily = "Times";
+    bool expectedApplicationCacheEnabled = true;
 #elif WK_HAVE_C_SPI
     static const char* expectedStandardFontFamily = "Times";
     static const char* expectedFixedFontFamily = "Courier";
@@ -60,6 +61,7 @@
     static const char* expectedCursiveFontFamily = "Apple Chancery";
     static const char* expectedFantasyFontFamily = "Papyrus";
     static const char* expectedPictographFontFamily = "Apple Color Emoji";
+    bool expectedApplicationCacheEnabled = false;
 #elif PLATFORM(IOS_FAMILY)
     static const char* expectedStandardFontFamily = "Times";
     static const char* expectedFixedFontFamily = "Courier";
@@ -68,6 +70,7 @@
     static const char* expectedCursiveFontFamily = "Snell Roundhand";
     static const char* expectedFantasyFontFamily = "Papyrus";
     static const char* expectedPictographFontFamily = "AppleColorEmoji";
+    bool expectedApplicationCacheEnabled = false;
 #endif
 
     WKPreferencesRef preference = WKPreferencesCreate();
@@ -74,7 +77,7 @@
 
     EXPECT_TRUE(WKPreferencesGetJavaScriptEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetLoadsImagesAutomatically(preference));
-    EXPECT_FALSE(WKPreferencesGetOfflineWebApplicationCacheEnabled(preference));
+    EXPECT_EQ(expectedApplicationCacheEnabled, WKPreferencesGetOfflineWebApplicationCacheEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetLocalStorageEnabled(preference));
     EXPECT_TRUE(WKPreferencesGetXSSAuditorEnabled(preference));
     EXPECT_FALSE(WKPreferencesGetFrameFlatteningEnabled(preference));

Modified: trunk/Tools/TestWebKitAPI/glib/TestExpectations.json (276194 => 276195)


--- trunk/Tools/TestWebKitAPI/glib/TestExpectations.json	2021-04-17 04:45:48 UTC (rev 276194)
+++ trunk/Tools/TestWebKitAPI/glib/TestExpectations.json	2021-04-17 05:03:59 UTC (rev 276195)
@@ -199,9 +199,6 @@
             "WebKit.TerminateTwice": {
                 "expected": {"gtk": {"status": ["SKIP"], "bug": "webkit.org/b/121970"}}
             },
-            "WebKit.WKPreferencesDefaults": {
-                "expected": {"wpe": {"status": ["FAIL"]}}
-            },
             "WebKit.HitTestResultNodeHandle": {
                 "expected": {"wpe": {"status": ["TIMEOUT"]}}
             },
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to