-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
import android.app.Instrumentation;
import android.content.Context;
import android.test.ActivityInstrumentationTestCase2;
+import android.util.Log;
+
+import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
import org.chromium.android_webview.AwBrowserContext;
import org.chromium.android_webview.AwBrowserProcess;
*/
public class AwTestBase
extends ActivityInstrumentationTestCase2<AwTestRunnerActivity> {
- protected static final int WAIT_TIMEOUT_SECONDS = 15;
+ protected static final long WAIT_TIMEOUT_MS = scaleTimeout(15000);
protected static final int CHECK_INTERVAL = 100;
+ private static final String TAG = "AwTestBase";
public AwTestBase() {
super(AwTestRunnerActivity.class);
@Override
protected void setUp() throws Exception {
super.setUp();
- final Context context = getActivity();
- getInstrumentation().runOnMainSync(new Runnable() {
- @Override
- public void run() {
- AwBrowserProcess.start(context);
- }
- });
+ if (needsBrowserProcessStarted()) {
+ final Context context = getActivity();
+ getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
+ public void run() {
+ AwBrowserProcess.start(context);
+ }
+ });
+ }
+ }
+
+ /* Override this to return false if the test doesn't want the browser startup sequence to
+ * be run automatically.
+ */
+ protected boolean needsBrowserProcessStarted() {
+ return true;
}
/**
});
}
+ protected void setNetworkAvailableOnUiThread(final AwContents awContents,
+ final boolean networkUp) {
+ getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
+ public void run() {
+ awContents.setNetworkAvailable(networkUp);
+ }
+ });
+ }
+
/**
* Loads url on the UI thread and blocks until onPageFinished is called.
*/
final String url) throws Exception {
int currentCallCount = onPageFinishedHelper.getCallCount();
loadUrlAsync(awContents, url);
- onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
- TimeUnit.SECONDS);
+ onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
}
protected void loadUrlSyncAndExpectError(final AwContents awContents,
int onErrorCallCount = onReceivedErrorHelper.getCallCount();
int onFinishedCallCount = onPageFinishedHelper.getCallCount();
loadUrlAsync(awContents, url);
- onReceivedErrorHelper.waitForCallback(onErrorCallCount, 1, WAIT_TIMEOUT_SECONDS,
- TimeUnit.SECONDS);
- onPageFinishedHelper.waitForCallback(onFinishedCallCount, 1, WAIT_TIMEOUT_SECONDS,
- TimeUnit.SECONDS);
+ onReceivedErrorHelper.waitForCallback(onErrorCallCount, 1, WAIT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
+ onPageFinishedHelper.waitForCallback(onFinishedCallCount, 1, WAIT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
}
/**
byte[] postData) throws Exception {
int currentCallCount = onPageFinishedHelper.getCallCount();
postUrlAsync(awContents, url, postData);
- onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
- TimeUnit.SECONDS);
+ onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
}
/**
final boolean isBase64Encoded) throws Exception {
int currentCallCount = onPageFinishedHelper.getCallCount();
loadDataAsync(awContents, data, mimeType, isBase64Encoded);
- onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
- TimeUnit.SECONDS);
+ onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
}
protected void loadDataSyncWithCharset(final AwContents awContents,
data, mimeType, isBase64Encoded, charset));
}
});
- onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
- TimeUnit.SECONDS);
+ onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
}
/**
});
}
+ protected void loadDataWithBaseUrlSync(final AwContents awContents,
+ CallbackHelper onPageFinishedHelper, final String data, final String mimeType,
+ final boolean isBase64Encoded, final String baseUrl,
+ final String historyUrl) throws Throwable {
+ int currentCallCount = onPageFinishedHelper.getCallCount();
+ loadDataWithBaseUrlAsync(awContents, data, mimeType, isBase64Encoded, baseUrl, historyUrl);
+ onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
+ }
+
+ protected void loadDataWithBaseUrlAsync(final AwContents awContents,
+ final String data, final String mimeType, final boolean isBase64Encoded,
+ final String baseUrl, final String historyUrl) throws Throwable {
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ awContents.loadUrl(LoadUrlParams.createLoadDataParamsWithBaseUrl(
+ data, mimeType, isBase64Encoded, baseUrl, historyUrl));
+ }
+ });
+ }
+
+ /**
+ * Reloads the current page synchronously.
+ */
+ protected void reloadSync(final AwContents awContents,
+ CallbackHelper onPageFinishedHelper) throws Exception {
+ int currentCallCount = onPageFinishedHelper.getCallCount();
+ getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
+ public void run() {
+ awContents.getContentViewCore().reload(true);
+ }
+ });
+ onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_MS,
+ TimeUnit.MILLISECONDS);
+ }
+
/**
* Factory class used in creation of test AwContents instances.
*
public AwTestContainerView createAwTestContainerView(AwTestRunnerActivity activity) {
return new AwTestContainerView(activity);
}
+ public AwSettings createAwSettings(Context context, boolean supportsLegacyQuirks) {
+ return new AwSettings(context, false, supportsLegacyQuirks);
+ }
}
protected TestDependencyFactory createTestDependencyFactory() {
protected AwTestContainerView createAwTestContainerView(
final AwContentsClient awContentsClient) {
- return createAwTestContainerView(awContentsClient, true);
+ return createAwTestContainerView(awContentsClient, false);
}
protected AwTestContainerView createAwTestContainerView(
protected AwTestContainerView createDetachedAwTestContainerView(
final AwContentsClient awContentsClient) {
- return createDetachedAwTestContainerView(awContentsClient, true);
+ return createDetachedAwTestContainerView(awContentsClient, false);
}
protected AwTestContainerView createDetachedAwTestContainerView(
final TestDependencyFactory testDependencyFactory = createTestDependencyFactory();
final AwTestContainerView testContainerView =
testDependencyFactory.createAwTestContainerView(getActivity());
- // TODO(mnaganov): Should also have tests for the "pure Chromium" mode.
- // See http://crbug.com/278106
+ AwSettings awSettings = testDependencyFactory.createAwSettings(getActivity(),
+ supportsLegacyQuirks);
testContainerView.initialize(new AwContents(
mBrowserContext, testContainerView, testContainerView.getInternalAccessDelegate(),
- awContentsClient, false, testDependencyFactory.createLayoutSizer(),
- supportsLegacyQuirks));
+ awContentsClient, awSettings, testDependencyFactory.createLayoutSizer()));
AwContents.setShouldDownloadFavicons();
return testContainerView;
}
protected AwTestContainerView createAwTestContainerViewOnMainSync(
final AwContentsClient client) throws Exception {
- return createAwTestContainerViewOnMainSync(client, true);
+ return createAwTestContainerViewOnMainSync(client, false);
}
protected AwTestContainerView createAwTestContainerViewOnMainSync(
}
/**
- * Similar to CriteriaHelper.pollForCriteria but runs the callable on the UI thread.
- * Note that exceptions are treated as failure.
+ * Wrapper around CriteriaHelper.pollForCriteria. This uses AwTestBase-specifc timeouts and
+ * treats timeouts and exceptions as test failures automatically.
*/
- protected boolean pollOnUiThread(final Callable<Boolean> callable) throws Exception {
- return CriteriaHelper.pollForCriteria(new Criteria() {
+ protected static void poll(final Callable<Boolean> callable) throws Exception {
+ assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
try {
- return runTestOnUiThreadAndGetResult(callable);
+ return callable.call();
} catch (Throwable e) {
+ Log.e(TAG, "Exception while polling.", e);
return false;
}
}
+ }, WAIT_TIMEOUT_MS, CHECK_INTERVAL));
+ }
+
+ /**
+ * Wrapper around {@link AwTestBase#poll()} but runs the callable on the UI thread.
+ */
+ protected void pollOnUiThread(final Callable<Boolean> callable) throws Exception {
+ poll(new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ return runTestOnUiThreadAndGetResult(callable);
+ }
});
}
getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
- awContents.clearCache(includeDiskFiles);
+ awContents.clearCache(includeDiskFiles);
}
});
}
return runTestOnUiThreadAndGetResult(new Callable<Float>() {
@Override
public Float call() throws Exception {
- return awContents.getContentViewCore().getScale();
+ return awContents.getPageScaleFactor();
}
});
}
/**
* Returns page scale multiplied by the screen density.
*/
- protected float getPixelScaleOnUiThread(final AwContents awContents) throws Throwable {
+ protected float getPixelScaleOnUiThread(final AwContents awContents) throws Exception {
return runTestOnUiThreadAndGetResult(new Callable<Float>() {
@Override
public Float call() throws Exception {
/**
* Returns whether a user can zoom the page in.
*/
- protected boolean canZoomInOnUiThread(final AwContents awContents) throws Throwable {
+ protected boolean canZoomInOnUiThread(final AwContents awContents) throws Exception {
return runTestOnUiThreadAndGetResult(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
/**
* Returns whether a user can zoom the page out.
*/
- protected boolean canZoomOutOnUiThread(final AwContents awContents) throws Throwable {
+ protected boolean canZoomOutOnUiThread(final AwContents awContents) throws Exception {
return runTestOnUiThreadAndGetResult(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
projects / platform / framework / web / crosswalk.git / blobdiff