Changeset 249704 in webkit

Timestamp:

Sep 9, 2019 9:30:39 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Fix iOS API tests after r249684
​https://bugs.webkit.org/show_bug.cgi?id=201573

• TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:

(TestWebKitAPI::getWebSocketEventWebKitLegacy):
(TestWebKitAPI::TEST):
The web thread still exists :(
That makes iOS immediate failure results more like WK2, which is fine.
The point is that the connection fails somehow and the server sees a TLS failure, which the test verifies.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-09-09  Alex Christensen  <achristensen@webkit.org>
+
+        Fix iOS API tests after r249684
+        https://bugs.webkit.org/show_bug.cgi?id=201573
+
+        * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
+        (TestWebKitAPI::getWebSocketEventWebKitLegacy):
+        (TestWebKitAPI::TEST):
+        The web thread still exists :(
+        That makes iOS immediate failure results more like WK2, which is fine.
+        The point is that the connection fails somehow and the server sees a TLS failure, which the test verifies.
+
 2019-09-09  Chris Dumez  <cdumez@apple.com>
 

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

@@ -35 +35 @@
 #import <wtf/RetainPtr.h>
 
+#if PLATFORM(IOS_FAMILY)
+#import <WebKit/WebUIKitSupport.h>
+#import <WebKit/WebCoreThread.h>
+#endif
+
 @interface WebSocketDelegate : NSObject <WKUIDelegate, WebUIDelegate>
 - (NSString *)waitForMessage;
@@ -107 +112 @@
 NSString *getWebSocketEventWebKitLegacy(bool clientAllowDeprecatedTLS, bool serverLimitTLS)
 {
+#if PLATFORM(IOS_FAMILY)
+    WebKitInitialize();
+    WebThreadLock();
+#endif
     Optional<uint16_t> maxServerTLSVersion;
     if (serverLimitTLS)
@@ -142 +151 @@
 TEST(WebKit, TLSVersionWebSocketWebKitLegacy2)
 {
-    EXPECT_WK_STREQ(getWebSocketEventWebKitLegacy(false, true), "close");
+#if PLATFORM(IOS_FAMILY)
+    const char* expected = "error: undefined";
+#else
+    const char* expected = "close";
+#endif
+    EXPECT_WK_STREQ(getWebSocketEventWebKitLegacy(false, true), expected);
 }