Changeset 276195 in webkit

Timestamp:

Apr 16, 2021, 10:03:59 PM (5 years ago)

Author:

Lauro Moura

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit/WKPreferences.cpp (modified) (5 diffs)
• TestWebKitAPI/glib/TestExpectations.json (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-16  Lauro Moura  <lmoura@igalia.com>
+
+        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  <bfulgham@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/WKPreferences.cpp

@@ -45 +45 @@
 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";
@@ -53 +53 @@
     static const char* expectedFantasyFontFamily = "Impact";
     static const char* expectedPictographFontFamily = "Times";
+    bool expectedApplicationCacheEnabled = true;
 #elif WK_HAVE_C_SPI
     static const char* expectedStandardFontFamily = "Times";
@@ -61 +62 @@
     static const char* expectedFantasyFontFamily = "Papyrus";
     static const char* expectedPictographFontFamily = "Apple Color Emoji";
+    bool expectedApplicationCacheEnabled = false;
 #elif PLATFORM(IOS_FAMILY)
     static const char* expectedStandardFontFamily = "Times";
@@ -69 +71 @@
     static const char* expectedFantasyFontFamily = "Papyrus";
     static const char* expectedPictographFontFamily = "AppleColorEmoji";
+    bool expectedApplicationCacheEnabled = false;
 #endif
 
@@ -75 +78 @@
     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));

trunk/Tools/TestWebKitAPI/glib/TestExpectations.json

@@ -200 +200 @@
                 "expected": {"gtk": {"status": ["SKIP"], "bug": "webkit.org/b/121970"}}
             },
-            "WebKit.WKPreferencesDefaults": {
-                "expected": {"wpe": {"status": ["FAIL"]}}
-            },
             "WebKit.HitTestResultNodeHandle": {
                 "expected": {"wpe": {"status": ["TIMEOUT"]}}