Move contents of SetUp() to the constructors.

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I1a0354accc09e93c0c931e7528dce70aadfd3411
Reviewed-on: https://chromium-review.googlesource.com/1159930Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Hiroshi Ichikawa <ichikawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585328}

ios/web_view/test/navigation_delegate_inttest.mm

@@ -22,15 +22,24 @@ namespace ios_web_view {
 // Tests CWVNavigationDelegate.
 class NavigationDelegateTest : public ios_web_view::WebViewInttestBase {
  public:
+  NavigationDelegateTest()
+      : mock_delegate_(
+            OCMStrictProtocolMock(@protocol(CWVNavigationDelegate))) {
+    [(id)mock_delegate_ setExpectationOrderMatters:YES];
+    web_view_.navigationDelegate = mock_delegate_;
+  }
+
   void SetUp() override {
+    ios_web_view::WebViewInttestBase::SetUp();
     ASSERT_TRUE(test_server_->Start());
-    url_with_content_ =
-        net::NSURLWithGURL(GetUrlForPageWithTitleAndBody("Title", "Body"));
-    url_with_error_ = net::NSURLWithGURL(test_server_->GetURL("/close-socket"));
+  }
 
-    mock_delegate_ = OCMStrictProtocolMock(@protocol(CWVNavigationDelegate));
-    [(id)mock_delegate_ setExpectationOrderMatters:YES];
-    web_view_.navigationDelegate = mock_delegate_;
+  NSURL* GetEchoURL() {
+    return net::NSURLWithGURL(test_server_->GetURL("/echo"));
+  }
+
+  NSURL* GetCloseSocketURL() {
+    return net::NSURLWithGURL(test_server_->GetURL("/close-socket"));
   }
 
   id ArgWithURL(NSURL* url) {
@@ -39,8 +48,6 @@ class NavigationDelegateTest : public ios_web_view::WebViewInttestBase {
     }];
   }
 
-  NSURL* url_with_content_;
-  NSURL* url_with_error_;
   id<CWVNavigationDelegate> mock_delegate_;
 };
 
@@ -48,25 +55,25 @@ class NavigationDelegateTest : public ios_web_view::WebViewInttestBase {
 TEST_F(NavigationDelegateTest, RequestSucceeds) {
   // A request made with -loadRequest: has type CWVNavigationTypeClientRedirect.
   OCMExpect([mock_delegate_ webView:web_view_
-                shouldStartLoadWithRequest:ArgWithURL(url_with_content_)
+                shouldStartLoadWithRequest:ArgWithURL(GetEchoURL())
                             navigationType:CWVNavigationTypeClientRedirect])
       .andReturn(YES);
   OCMExpect([mock_delegate_ webViewDidStartProvisionalNavigation:web_view_]);
   OCMExpect([mock_delegate_ webView:web_view_
-                shouldContinueLoadWithResponse:ArgWithURL(url_with_content_)
+                shouldContinueLoadWithResponse:ArgWithURL(GetEchoURL())
                                   forMainFrame:YES])
       .andReturn(YES);
   OCMExpect([mock_delegate_ webViewDidCommitNavigation:web_view_]);
   OCMExpect([mock_delegate_ webViewDidFinishNavigation:web_view_]);
 
-  ASSERT_TRUE(test::LoadUrl(web_view_, url_with_content_));
+  ASSERT_TRUE(test::LoadUrl(web_view_, GetEchoURL()));
   [(id)mock_delegate_ verify];
 }
 
 // Tests that expected delegate methods are called for a failed request.
 TEST_F(NavigationDelegateTest, RequestFails) {
   OCMExpect([mock_delegate_ webView:web_view_
-                shouldStartLoadWithRequest:ArgWithURL(url_with_error_)
+                shouldStartLoadWithRequest:ArgWithURL(GetCloseSocketURL())
                             navigationType:CWVNavigationTypeClientRedirect])
       .andReturn(YES);
   OCMExpect([mock_delegate_ webViewDidStartProvisionalNavigation:web_view_]);
@@ -76,7 +83,7 @@ TEST_F(NavigationDelegateTest, RequestFails) {
   // -webViewDidCommitNavigation: is called one more time for failures.
   OCMExpect([mock_delegate_ webViewDidCommitNavigation:web_view_]);
 
-  ASSERT_TRUE(test::LoadUrl(web_view_, url_with_error_));
+  ASSERT_TRUE(test::LoadUrl(web_view_, GetCloseSocketURL()));
   [(id)mock_delegate_ verify];
 }
 
@@ -84,11 +91,11 @@ TEST_F(NavigationDelegateTest, RequestFails) {
 // when -shouldStartLoadWithRequest:navigationType: returns NO.
 TEST_F(NavigationDelegateTest, CancelRequest) {
   OCMExpect([mock_delegate_ webView:web_view_
-                shouldStartLoadWithRequest:ArgWithURL(url_with_content_)
+                shouldStartLoadWithRequest:ArgWithURL(GetEchoURL())
                             navigationType:CWVNavigationTypeClientRedirect])
       .andReturn(NO);
 
-  ASSERT_TRUE(test::LoadUrl(web_view_, url_with_content_));
+  ASSERT_TRUE(test::LoadUrl(web_view_, GetEchoURL()));
   [(id)mock_delegate_ verify];
 }
 
@@ -96,16 +103,16 @@ TEST_F(NavigationDelegateTest, CancelRequest) {
 // when -shouldContinueLoadWithResponse:forMainFrame: returns NO.
 TEST_F(NavigationDelegateTest, CancelResponse) {
   OCMExpect([mock_delegate_ webView:web_view_
-                shouldStartLoadWithRequest:ArgWithURL(url_with_content_)
+                shouldStartLoadWithRequest:ArgWithURL(GetEchoURL())
                             navigationType:CWVNavigationTypeClientRedirect])
       .andReturn(YES);
   OCMExpect([mock_delegate_ webViewDidStartProvisionalNavigation:web_view_]);
   OCMExpect([mock_delegate_ webView:web_view_
-                shouldContinueLoadWithResponse:ArgWithURL(url_with_content_)
+                shouldContinueLoadWithResponse:ArgWithURL(GetEchoURL())
                                   forMainFrame:YES])
       .andReturn(NO);
 
-  ASSERT_TRUE(test::LoadUrl(web_view_, url_with_content_));
+  ASSERT_TRUE(test::LoadUrl(web_view_, GetEchoURL()));
   [(id)mock_delegate_ verify];
 }
 

ios/web_view/test/ui_delegate_inttest.mm

@@ -25,16 +25,20 @@ namespace ios_web_view {
 // Tests CWVUIDelegate.
 class UIDelegateTest : public ios_web_view::WebViewInttestBase {
  public:
-  void SetUp() override {
-    mock_delegate_ = OCMProtocolMock(@protocol(CWVUIDelegate));
+  UIDelegateTest() : mock_delegate_(OCMProtocolMock(@protocol(CWVUIDelegate))) {
     web_view_.UIDelegate = mock_delegate_;
+  }
 
+  void SetUp() override {
+    ios_web_view::WebViewInttestBase::SetUp();
     ASSERT_TRUE(test_server_->Start());
-    url_ = net::NSURLWithGURL(GetUrlForPageWithTitleAndBody("Title", "Body"));
+  }
+
+  NSURL* GetEchoURL() {
+    return net::NSURLWithGURL(test_server_->GetURL("/echo"));
   }
 
   id<CWVUIDelegate> mock_delegate_;
-  NSURL* url_;
 };
 
 // Tests -webView:createWebViewWithConfiguration:forNavigationAction:
@@ -48,7 +52,7 @@ TEST_F(UIDelegateTest, CreateWebView) {
       createWebViewWithConfiguration:web_view_.configuration
                  forNavigationAction:expected_navigation_action]);
 
-  ASSERT_TRUE(test::LoadUrl(web_view_, url_));
+  ASSERT_TRUE(test::LoadUrl(web_view_, GetEchoURL()));
   NSError* error = nil;
   EXPECT_NE(nil, test::EvaluateJavaScript(
                      web_view_, @"open('http://example.com/')", &error));
@@ -67,10 +71,10 @@ TEST_F(UIDelegateTest, RunJavaScriptAlertPanel) {
 
   OCMExpect([mock_delegate_ webView:web_view_
       runJavaScriptAlertPanelWithMessage:@"message"
-                                 pageURL:url_
+                                 pageURL:GetEchoURL()
                        completionHandler:mock_completion_handler]);
 
-  ASSERT_TRUE(test::LoadUrl(web_view_, url_));
+  ASSERT_TRUE(test::LoadUrl(web_view_, GetEchoURL()));
   NSError* error = nil;
   test::EvaluateJavaScript(web_view_, @"alert('message')", &error);
   EXPECT_EQ(nil, error);
@@ -89,10 +93,10 @@ TEST_F(UIDelegateTest, RunJavaScriptConfirmPanel) {
 
   OCMExpect([mock_delegate_ webView:web_view_
       runJavaScriptConfirmPanelWithMessage:@"message"
-                                   pageURL:url_
+                                   pageURL:GetEchoURL()
                          completionHandler:mock_completion_handler]);
 
-  ASSERT_TRUE(test::LoadUrl(web_view_, url_));
+  ASSERT_TRUE(test::LoadUrl(web_view_, GetEchoURL()));
   NSError* error = nil;
   EXPECT_NSEQ(@(YES), test::EvaluateJavaScript(web_view_, @"confirm('message')",
                                                &error));
@@ -113,10 +117,10 @@ TEST_F(UIDelegateTest, RunJavaScriptTextInputPanel) {
   OCMExpect([mock_delegate_ webView:web_view_
       runJavaScriptTextInputPanelWithPrompt:@"prompt"
                                 defaultText:@"default"
-                                    pageURL:url_
+                                    pageURL:GetEchoURL()
                           completionHandler:mock_completion_handler]);
 
-  ASSERT_TRUE(test::LoadUrl(web_view_, url_));
+  ASSERT_TRUE(test::LoadUrl(web_view_, GetEchoURL()));
   NSError* error = nil;
   EXPECT_NSEQ(@"input", test::EvaluateJavaScript(
                             web_view_, @"prompt('prompt', 'default')", &error));

ios/web_view/test/web_view_inttest.mm

@@ -29,7 +29,7 @@ namespace ios_web_view {
 // Note that some methods are covered by other tests in this directory.
 class WebViewTest : public ios_web_view::WebViewInttestBase {
  public:
-  void SetUp() override {
+  WebViewTest() {
     test_server_->RegisterRequestHandler(base::BindRepeating(
         &WebViewTest::CaptureRequestHandler, base::Unretained(this)));
   }