Changeset 287365 in webkit

Timestamp:

Dec 22, 2021, 10:52:52 AM (4 years ago)

Author:

achristensen@apple.com

Message:

Re-enable WebpagePreferences.WebsitePoliciesDuringRedirect API test on Monterey
​https://bugs.webkit.org/show_bug.cgi?id=234607

Reviewed by Brady Eidson.

This is the same as r285057 where we were responding with one byte short of the ranges requested,
which used to give a playing event but since Monterey it doesn't. The fix is to respond with all
the bytes requested. If the request is for bytes 0-1, we need to respond with two bytes, for example.

• TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm:

(-[TestSchemeHandler webView:startURLSchemeTask:]):
(TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-22  Alex Christensen  <achristensen@webkit.org>
+
+        Re-enable WebpagePreferences.WebsitePoliciesDuringRedirect API test on Monterey
+        https://bugs.webkit.org/show_bug.cgi?id=234607
+
+        Reviewed by Brady Eidson.
+
+        This is the same as r285057 where we were responding with one byte short of the ranges requested,
+        which used to give a playing event but since Monterey it doesn't.  The fix is to respond with all
+        the bytes requested.  If the request is for bytes 0-1, we need to respond with two bytes, for example.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WebsitePolicies.mm:
+        (-[TestSchemeHandler webView:startURLSchemeTask:]):
+        (TEST):
+
 2021-12-22  J Pascoe  <j_pascoe@apple.com>
 

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

@@ -696 +696 @@
     auto& range = *parsedRange.range;
     
-    NSDictionary *headerFields = @{ @"Content-Length": [@(range.second - range.first) stringValue], @"Content-Range": [NSString stringWithFormat:@"bytes %lu-%lu/%lu", range.first, range.second, [videoData length]] };
+    NSDictionary *headerFields = @{ @"Content-Length": [@(range.second - range.first + 1) stringValue], @"Content-Range": [NSString stringWithFormat:@"bytes %lu-%lu/%lu", range.first, range.second, [videoData length]] };
     auto response = adoptNS([[NSHTTPURLResponse alloc] initWithURL:task.request.URL statusCode:200 HTTPVersion:(NSString *)kCFHTTPVersion1_1 headerFields:headerFields]);
     [task didReceiveResponse:response.get()];
-    [task didReceiveData:[videoData subdataWithRange:NSMakeRange(range.first, range.second - range.first)]];
+    [task didReceiveData:[videoData subdataWithRange:NSMakeRange(range.first, range.second - range.first + 1)]];
     [task didFinish];
     
@@ -710 +710 @@
 @end
 
-// FIXME: Re-enable this test for Monterey+ once rdar://80476146 is resolved.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
-TEST(WebpagePreferences, DISABLED_WebsitePoliciesDuringRedirect)
-#else
 TEST(WebpagePreferences, WebsitePoliciesDuringRedirect)
-#endif
 {
     auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);