[iOS] Fix WebStateTest.CreateFullPagePdf_ValidURL to Address Flakiness

Loading the URL before the data allows us to remove the spin loop (and potentially flakiness). Bug: 1132210 Change-Id: Ib696ff63a7b353871dff5984850ad0490a2d3ed1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453905Reviewed-by: Eugene But <eugenebut@chromium.org> Commit-Queue: Sebastien Lalancette <seblalancette@chromium.org> Cr-Commit-Position: refs/heads/master@{#814692}

[iOS] Fix WebStateTest.CreateFullPagePdf_ValidURL to Address Flakiness
Loading the URL before the data allows us to remove the spin loop (and potentially flakiness). Bug: 1132210 Change-Id: Ib696ff63a7b353871dff5984850ad0490a2d3ed1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453905Reviewed-by: Eugene But <eugenebut@chromium.org> Commit-Queue: Sebastien Lalancette <seblalancette@chromium.org> Cr-Commit-Position: refs/heads/master@{#814692}
297f5cf1 · Sebastien Lalancette · Commit Bot · 9a80d330 · 297f5cf1
Commit 297f5cf1 authored Oct 07, 2020 by Sebastien Lalancette Committed by Commit Bot Oct 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 15 deletions

ios/web/web_state/web_state_unittest.mm ios/web/web_state/web_state_unittest.mm +17 -15

No files found.
--- a/ios/web/web_state/web_state_unittest.mm
+++ b/ios/web/web_state/web_state_unittest.mm
@@ -219,24 +219,27 @@ TEST_F(WebStateTest, Snapshot) {

 // Tests that the create PDF method retuns an PDF of a rendered html page.
 TEST_F(WebStateTest, CreateFullPagePdf_ValidURL) {
+  [[[UIApplication sharedApplication] keyWindow]
+      addSubview:web_state()->GetView()];
+
  // Load a URL and some HTML in the WebState.
+  GURL url("https://www.chromium.org");
+  NavigationManager::WebLoadParams load_params(url);
+  web_state()->GetNavigationManager()->LoadURLWithParams(load_params);
+  ASSERT_TRUE(WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, ^bool {
+    return web_state()->GetLastCommittedURL() == url &&
+           !web_state()->IsLoading();
+  }));
+
  NSString* data_html =
      @"<html><div style='background-color:#FF0000; width:50%; "
       "height:100%;'></div></html>";
-  GURL url("https://www.chromium.org");
  web_state()->LoadData([data_html dataUsingEncoding:NSUTF8StringEncoding],
                        @"text/html", url);
-  [[[UIApplication sharedApplication] keyWindow]
-      addSubview:web_state()->GetView()];

-  NavigationManager::WebLoadParams load_params(url);
-  web_state()->GetNavigationManager()->LoadURLWithParams(load_params);
-  ASSERT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
-      base::test::ios::kWaitForPageLoadTimeout, ^bool {
-        return web_state()->GetLastCommittedURL() == url &&
-               !web_state()->IsLoading();
-      }));
-  base::test::ios::SpinRunLoopWithMinDelay(base::TimeDelta::FromSecondsD(0.2));
+  ASSERT_TRUE(WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, ^bool {
+    return !web_state()->IsLoading();
+  }));

  // Create a PDF for this page and validate the data.
  __block NSData* callback_data = nil;
@@ -244,10 +247,9 @@ TEST_F(WebStateTest, CreateFullPagePdf_ValidURL) {
    callback_data = [pdf_document_data copy];
  }));

-  ASSERT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
-      base::test::ios::kWaitForPageLoadTimeout, ^bool {
-        return callback_data;
-      }));
+  ASSERT_TRUE(WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, ^bool {
+    return callback_data;
+  }));

  CGPDFDocumentRef pdf = CGPDFDocumentCreateWithProvider(
      CGDataProviderCreateWithCFData((CFDataRef)callback_data));