WKAttachmentTests.InPlaceImageAttachmentToggleDisplayMode times out on macOS bots

https://bugs.webkit.org/show_bug.cgi?id=180200

Reviewed by Alexey Proskuryakov.

Rewrites an API test to avoid checking against the hard-coded platform-dependent size of an attachment element.
Instead, first insert the attachment element as an icon and compute its size, and then check that the size of
the element is restored to this original value after toggling the display mode to in-place mode and back.

* TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
(-[TestWKWebView attachmentElementSize]):
(-[TestWKWebView waitForAttachmentElementSizeToBecome:]):
(TestWebKitAPI::TEST):
(platformAttachmentIconElementSize): Deleted.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@225332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Tools/ChangeLog

@@ -1,3 +1,20 @@
+2017-11-30  Wenson Hsieh  <[email protected]>
+
+        WKAttachmentTests.InPlaceImageAttachmentToggleDisplayMode times out on macOS bots
+        https://bugs.webkit.org/show_bug.cgi?id=180200
+
+        Reviewed by Alexey Proskuryakov.
+
+        Rewrites an API test to avoid checking against the hard-coded platform-dependent size of an attachment element.
+        Instead, first insert the attachment element as an icon and compute its size, and then check that the size of
+        the element is restored to this original value after toggling the display mode to in-place mode and back.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
+        (-[TestWKWebView attachmentElementSize]):
+        (-[TestWKWebView waitForAttachmentElementSizeToBecome:]):
+        (TestWebKitAPI::TEST):
+        (platformAttachmentIconElementSize): Deleted.
+
 2017-11-30  Michael Catanzaro  <[email protected]>
 
         [WPE] Stop building Wayland in JHBuild moduleset

Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm

@@ -34,15 +34,6 @@
 
 #if WK_API_ENABLED
 
-CGSize platformAttachmentIconElementSize()
-{
-#if PLATFORM(IOS)
-    return CGSizeMake(160, 119);
-#else
-    return CGSizeMake(61, 89);
-#endif
-}
-
 @interface AttachmentUpdateObserver : NSObject <WKUIDelegatePrivate>
 @property (nonatomic, readonly) NSArray *inserted;
 @property (nonatomic, readonly) NSArray *removed;
@@ -192,18 +183,22 @@ - (_WKAttachment *)synchronouslyInsertAttachmentWithFilename:(NSString *)filenam
     return attachment.autorelease();
 }
 
+- (CGSize)attachmentElementSize
+{
+    __block CGSize size;
+    __block bool doneEvaluatingScript = false;
+    [self evaluateJavaScript:@"r = document.querySelector('attachment').getBoundingClientRect(); [r.width, r.height]" completionHandler:^(NSArray<NSNumber *> *sizeResult, NSError *) {
+        size = CGSizeMake(sizeResult.firstObject.floatValue, sizeResult.lastObject.floatValue);
+        doneEvaluatingScript = true;
+    }];
+    TestWebKitAPI::Util::run(&doneEvaluatingScript);
+    return size;
+}
+
 - (void)waitForAttachmentElementSizeToBecome:(CGSize)expectedSize
 {
     while ([[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]]) {
-        __block bool doneEvaluatingScript = false;
-        __block BOOL sizeIsEqual = NO;
-        [self evaluateJavaScript:@"r = document.querySelector('attachment').getBoundingClientRect(); [r.width, r.height]" completionHandler:^(NSArray<NSNumber *> *sizeResult, NSError *) {
-            CGSize observedSize { sizeResult.firstObject.floatValue, sizeResult.lastObject.floatValue };
-            sizeIsEqual = CGSizeEqualToSize(expectedSize, observedSize);
-            doneEvaluatingScript = true;
-        }];
-        TestWebKitAPI::Util::run(&doneEvaluatingScript);
-        if (sizeIsEqual)
+        if (CGSizeEqualToSize(self.attachmentElementSize, expectedSize))
             break;
     }
 }
@@ -499,15 +494,19 @@ - (void)expectRequestedDataToBe:(NSData *)expectedData
     RetainPtr<_WKAttachment> attachment;
     {
         ObserveAttachmentUpdatesForScope observer(webView.get());
-        attachment = retainPtr([webView synchronouslyInsertAttachmentWithFilename:@"icon.png" contentType:@"image/png" data:imageData.get() options:displayOptionsWithMode(_WKAttachmentDisplayModeInPlace)]);
-        observer.expectAttachmentUpdates(@[], @[attachment.get()]);
+        attachment = retainPtr([webView synchronouslyInsertAttachmentWithFilename:@"icon.png" contentType:@"image/png" data:imageData.get() options:displayOptionsWithMode(_WKAttachmentDisplayModeAsIcon)]);
         [attachment expectRequestedDataToBe:imageData.get()];
-        [webView waitForAttachmentElementSizeToBecome:CGSizeMake(215, 174)];
+        observer.expectAttachmentUpdates(@[], @[attachment.get()]);
     }
+    CGSize iconAttachmentSize = [webView attachmentElementSize];
+
+    [attachment synchronouslySetDisplayOptions:displayOptionsWithMode(_WKAttachmentDisplayModeInPlace) error:nil];
+    [attachment expectRequestedDataToBe:imageData.get()];
+    [webView waitForAttachmentElementSizeToBecome:CGSizeMake(215, 174)];
 
     [attachment synchronouslySetDisplayOptions:displayOptionsWithMode(_WKAttachmentDisplayModeAsIcon) error:nil];
     [attachment expectRequestedDataToBe:imageData.get()];
-    [webView waitForAttachmentElementSizeToBecome:platformAttachmentIconElementSize()];
+    [webView waitForAttachmentElementSizeToBecome:iconAttachmentSize];
 
     [attachment synchronouslySetDisplayOptions:displayOptionsWithMode(_WKAttachmentDisplayModeInPlace) error:nil];
     [attachment expectRequestedDataToBe:imageData.get()];