diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 16:01:52 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 16:01:52 +0000 |
| commit | 486cbd69bce30025d5711a0c844ee606769bba12 (patch) | |
| tree | b8a566692fd4de7cb65b3effabf1136eb1d25e15 /android_webview | |
| parent | 26d451ff999e3e2689f982cbeca0d6a1fe6d222c (diff) | |
| download | chromium_src-486cbd69bce30025d5711a0c844ee606769bba12.zip chromium_src-486cbd69bce30025d5711a0c844ee606769bba12.tar.gz chromium_src-486cbd69bce30025d5711a0c844ee606769bba12.tar.bz2 | |
[Android WebView] Unflake ContentViewZoomTests
- wait for onScaleChanged event instead of polling canZoomOutOnUiThread;
- reduce page content size to avoid hitting
"All tiles considered for activation should be live" assertion
in picture_layer_impl.cc;
- remove unneeded "setUseWideViewPort".
BUG=153522
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/14539002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java | 63 |
1 files changed, 11 insertions, 52 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java index 5634393..2cadb70 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java @@ -6,7 +6,6 @@ package org.chromium.android_webview.test; import android.app.Activity; import android.content.pm.ActivityInfo; -import android.test.FlakyTest; import android.test.suitebuilder.annotation.SmallTest; import android.view.View; import android.view.ViewConfiguration; @@ -44,17 +43,9 @@ public class ContentViewZoomTest extends AwTestBase { } private String getZoomableHtml() { - StringBuilder sb = new StringBuilder(); - sb.append("<html><head><meta name=\"viewport\" content=\"" - + "width=device-width, minimum-scale=0.5, maximum-scale=2.0, initial-scale=0.5" - + "\"/></head><body>"); - - for (int i = 0; i < 1000; i++) { - sb.append("This is body. "); - } - - sb.append("</body></html>"); - return sb.toString(); + return "<html><head><meta name=\"viewport\" content=\"" + + "width=device-width, minimum-scale=0.5, maximum-scale=2.0, initial-scale=0.5" + + "\"/></head><body>Zoomable</body></html>"; } private String getNonZoomableHtml() { @@ -177,27 +168,11 @@ public class ContentViewZoomTest extends AwTestBase { }, TEST_TIMEOUT_MS, CHECK_INTERVAL_MS); } - private boolean waitUntilCanNotZoomOut() throws Throwable { - return CriteriaHelper.pollForCriteria(new Criteria() { - @Override - public boolean isSatisfied() { - try { - return !canZoomOutOnUiThread(); - } catch (Throwable t) { - t.printStackTrace(); - fail("Failed to query canZoomIn/Out: " + t.toString()); - return false; - } - } - }, TEST_TIMEOUT_MS, CHECK_INTERVAL_MS); - } - private void runMagnificationTest(boolean supportZoom) throws Throwable { - getAwSettingsOnUiThread(mAwContents).setUseWideViewPort(true); + int onScaleChangedCallCount = mContentsClient.getOnScaleChangedHelper().getCallCount(); loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), getZoomableHtml(), "text/html", false); - // It takes some time for scaling to settle down. - waitUntilCanNotZoomOut(); + mContentsClient.getOnScaleChangedHelper().waitForCallback(onScaleChangedCallCount); getContentSettingsOnUiThread(mAwContents).setSupportZoom(supportZoom); assertTrue("Should be able to zoom in", canZoomInOnUiThread()); assertFalse("Should not be able to zoom out", canZoomOutOnUiThread()); @@ -213,24 +188,16 @@ public class ContentViewZoomTest extends AwTestBase { assertTrue("Should be able to zoom in", canZoomInOnUiThread()); } - /** - * @SmallTest - * @Feature({"AndroidWebView"}) - * BUG 153522 - */ - @FlakyTest + @SmallTest + @Feature({"AndroidWebView"}) public void testMagnification() throws Throwable { runMagnificationTest(true); } // According to Android CTS test, zoomIn/Out must work // even if supportZoom is turned off. - /** - * @SmallTest - * @Feature({"AndroidWebView"}) - * BUG 153522 - */ - @FlakyTest + @SmallTest + @Feature({"AndroidWebView"}) public void testMagnificationWithZoomSupportOff() throws Throwable { runMagnificationTest(false); } @@ -239,7 +206,6 @@ public class ContentViewZoomTest extends AwTestBase { @Feature({"AndroidWebView"}) public void testZoomUsingMultiTouch() throws Throwable { AwSettings webSettings = getAwSettingsOnUiThread(mAwContents); - webSettings.setUseWideViewPort(true); loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), getZoomableHtml(), "text/html", false); @@ -254,15 +220,10 @@ public class ContentViewZoomTest extends AwTestBase { assertFalse(isMultiTouchZoomSupportedOnUiThread()); } - /** - * @SmallTest - * @Feature({"AndroidWebView"}) - * BUG 153522 - */ - @FlakyTest + @SmallTest + @Feature({"AndroidWebView"}) public void testZoomControls() throws Throwable { AwSettings webSettings = getAwSettingsOnUiThread(mAwContents); - webSettings.setUseWideViewPort(true); loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), getZoomableHtml(), "text/html", false); @@ -287,7 +248,6 @@ public class ContentViewZoomTest extends AwTestBase { @Feature({"AndroidWebView"}) public void testZoomControlsOnNonZoomableContent() throws Throwable { AwSettings webSettings = getAwSettingsOnUiThread(mAwContents); - webSettings.setUseWideViewPort(true); loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), getNonZoomableHtml(), "text/html", false); @@ -307,7 +267,6 @@ public class ContentViewZoomTest extends AwTestBase { @Feature({"AndroidWebView"}) public void testZoomControlsOnOrientationChange() throws Throwable { AwSettings webSettings = getAwSettingsOnUiThread(mAwContents); - webSettings.setUseWideViewPort(true); loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), getZoomableHtml(), "text/html", false); |