X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fandroid_webview%2Fjavatests%2Fsrc%2Forg%2Fchromium%2Fandroid_webview%2Ftest%2FAwZoomTest.java;h=c0e193f9829066475b80b3e22ea374604c81847c;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=afcf1272ee933184a7338c2b8baf50a8ea0c0c55;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git
diff --git a/src/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java b/src/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
index afcf127..c0e193f 100644
--- a/src/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
+++ b/src/android_webview/javatests/src/org/chromium/android_webview/test/AwZoomTest.java
@@ -33,10 +33,14 @@ public class AwZoomTest extends AwTestBase {
mAwContents = testContainerView.getAwContents();
}
- private String getZoomableHtml() {
- return "Zoomable";
+ private String getZoomableHtml(float scale) {
+ final int divWidthPercent = (int)(100.0f / scale);
+ return String.format("" +
+ "Zoomable
" +
+ "",
+ scale, scale, divWidthPercent);
}
private String getNonZoomableHtml() {
@@ -118,11 +122,11 @@ public class AwZoomTest extends AwTestBase {
});
}
- private void waitUntilCanZoomIn() throws Throwable {
+ private void waitForScaleToBecome(final float expectedScale) throws Throwable {
poll(new Callable() {
@Override
public Boolean call() throws Exception {
- return canZoomInOnUiThread(mAwContents);
+ return expectedScale == getScaleOnUiThread(mAwContents);
}
});
}
@@ -140,9 +144,10 @@ public class AwZoomTest extends AwTestBase {
private void runMagnificationTest() throws Throwable {
getAwSettingsOnUiThread(mAwContents).setUseWideViewPort(true);
assertFalse("Should not be able to zoom in", canZoomInOnUiThread(mAwContents));
+ final float pageMinimumScale = 0.5f;
loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
- getZoomableHtml(), "text/html", false);
- waitUntilCanZoomIn();
+ getZoomableHtml(pageMinimumScale), "text/html", false);
+ waitForScaleToBecome(pageMinimumScale);
assertTrue("Should be able to zoom in", canZoomInOnUiThread(mAwContents));
assertFalse("Should not be able to zoom out", canZoomOutOnUiThread(mAwContents));
@@ -178,7 +183,7 @@ public class AwZoomTest extends AwTestBase {
public void testZoomUsingMultiTouch() throws Throwable {
AwSettings webSettings = getAwSettingsOnUiThread(mAwContents);
loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
- getZoomableHtml(), "text/html", false);
+ getZoomableHtml(0.5f), "text/html", false);
assertTrue(webSettings.supportZoom());
assertFalse(webSettings.getBuiltInZoomControls());
@@ -197,9 +202,10 @@ public class AwZoomTest extends AwTestBase {
AwSettings webSettings = getAwSettingsOnUiThread(mAwContents);
webSettings.setUseWideViewPort(true);
assertFalse("Should not be able to zoom in", canZoomInOnUiThread(mAwContents));
+ final float pageMinimumScale = 0.5f;
loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
- getZoomableHtml(), "text/html", false);
- waitUntilCanZoomIn();
+ getZoomableHtml(pageMinimumScale), "text/html", false);
+ waitForScaleToBecome(pageMinimumScale);
// It must be possible to zoom in (or zoom out) for zoom controls to be shown
assertTrue("Should be able to zoom in", canZoomInOnUiThread(mAwContents));
@@ -244,7 +250,7 @@ public class AwZoomTest extends AwTestBase {
public void testZoomControlsOnOrientationChange() throws Throwable {
AwSettings webSettings = getAwSettingsOnUiThread(mAwContents);
loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
- getZoomableHtml(), "text/html", false);
+ getZoomableHtml(0.5f), "text/html", false);
assertTrue(webSettings.supportZoom());
webSettings.setBuiltInZoomControls(true);