[Android WebView] Filter out error page URL from onPageFinished to un-flake tests

android_webview/javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.CommonResources;
@@ skipping 33 matching lines @@
         int currentCallCount = onPageFinishedHelper.getCallCount();
         loadDataAsync(mAwContents, html, "text/html", false);
 
         onPageFinishedHelper.waitForCallback(currentCallCount);
         assertEquals("data:text/html," + html, onPageFinishedHelper.getUrl());
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnPageFinishedCalledAfterError() throws Throwable {
-        setTestAwContentsClient(new TestAwContentsClient() {
+        class OurTestAwContentsClient extends TestAwContentsClient {

[mkosiba (inactive), 2014/06/06 14:25:04]

nit: maybe LocalTestAwContentsClient? or just LocalTestClient ?

[mnaganov (inactive), 2014/06/16 15:00:41]

Done.

             private boolean isOnReceivedErrorCalled = false;
             private boolean isOnPageFinishedCalled = false;
+            private boolean allowAboutBlank = false;
 
             @Override
             public void onReceivedError(int errorCode, String description, String failingUrl) {
+                assertEquals("onReceivedError called twice for " + failingUrl,
+                        false, isOnReceivedErrorCalled);
                 isOnReceivedErrorCalled = true;
-                // Make sure onReceivedError is called before onPageFinished
-                assertEquals(false, isOnPageFinishedCalled);
+                assertEquals("onPageFinished called before onReceivedError for " + failingUrl,
+                        false, isOnPageFinishedCalled);
                 super.onReceivedError(errorCode, description, failingUrl);
             }
 
             @Override
             public void onPageFinished(String url) {
+                if (allowAboutBlank && "about:blank".equals(url)) {
+                    super.onPageFinished(url);
+                    return;
+                }
+                assertEquals("onPageFinished called twice for " + url,
+                        false, isOnPageFinishedCalled);
                 isOnPageFinishedCalled = true;
-                // Make sure onReceivedError is called before onPageFinished
-                assertEquals(true, isOnReceivedErrorCalled);
+                assertEquals("onReceivedError not called before onPageFinished for " + url,
+                        true, isOnReceivedErrorCalled);
                 super.onPageFinished(url);
             }
-        });
+
+            void setAllowAboutBlank() {
+                allowAboutBlank = true;
+            }
+        };
+        OurTestAwContentsClient testContentsClient = new OurTestAwContentsClient();
+        setTestAwContentsClient(testContentsClient);
 
         TestCallbackHelperContainer.OnReceivedErrorHelper onReceivedErrorHelper =
                 mContentsClient.getOnReceivedErrorHelper();
         TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
                 mContentsClient.getOnPageFinishedHelper();
 
         String invalidUrl = "http://localhost:7/non_existent";
-        int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
-        int onPageFinishedCallCount = onPageFinishedHelper.getCallCount();
         loadUrlSync(mAwContents, onPageFinishedHelper, invalidUrl);
 
         assertEquals(invalidUrl, onReceivedErrorHelper.getFailingUrl());
         assertEquals(invalidUrl, onPageFinishedHelper.getUrl());
+
+        // Rather than wait a fixed time to see that another onPageFinished callback isn't issued
+        // we load a valid page. Since callbacks arrive sequentially, this will ensure that
+        // any extra calls of onPageFinished / onReceivedError will arrive to our client.
+        testContentsClient.setAllowAboutBlank();
+        loadUrlSync(mAwContents, onPageFinishedHelper, "about:blank");
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnPageFinishedCalledAfterRedirectedUrlIsOverridden() throws Throwable {
         /*
          * If url1 is redirected url2, and url2 load is overridden, onPageFinished should still be
          * called for url2.
          * Steps:
          * 1. load url1. url1 onPageStarted
@@ skipping 163 matching lines @@
             executeJavaScriptAndWaitForResult(mAwContents, mContentsClient,
                     "window.history.go(-1)");
 
             onPageFinishedHelper.waitForCallback(onPageFinishedCallCount);
             assertEquals(onPageStartedCallCount, onPageStartedHelper.getCallCount());
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 }