Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1063)

Unified Diff: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java

Issue 2632043002: Create ContentShellActivityTestRule and BaseJUnitRunner (Closed)
Patch Set: Change to adapter pattern Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java
new file mode 100644
index 0000000000000000000000000000000000000000..56825f7bb5f0086c0213a2532f1f651ffc2788ae
--- /dev/null
+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java
@@ -0,0 +1,184 @@
+// Copyright 2017 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.content_shell_apk;
+
+import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.Assert;
+
+import org.chromium.base.test.util.CallbackHelper;
+import org.chromium.content.browser.ContentView;
+import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.content_public.browser.LoadUrlParams;
+import org.chromium.content_public.browser.NavigationController;
+import org.chromium.content_public.browser.WebContents;
+import org.chromium.content_shell.Shell;
+import org.chromium.content_shell_apk.ContentShellTestDelegate.TestDelegateCallback;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * ActivityTestRule for ContentShellActivity.
+ *
+ * Test can use this ActivityTestRule to launch or get ContentShellActivity.
+ */
+public class ContentShellActivityTestRule extends ActivityTestRule<ContentShellActivity>
+ implements TestDelegateCallback<ContentShellActivity> {
+ private final ContentShellTestDelegate mDelegate;
+ private final boolean mLaunchActivity;
+
+ protected static final long WAIT_PAGE_LOADING_TIMEOUT_SECONDS = scaleTimeout(15);
+
+ public ContentShellActivityTestRule() {
+ this(false, false);
+ }
+
+ public ContentShellActivityTestRule(boolean initialTouchMode, boolean launchActivity) {
+ super(ContentShellActivity.class, initialTouchMode, launchActivity);
+ mLaunchActivity = launchActivity;
+ mDelegate = new ContentShellTestDelegate(this);
+ }
+
+ @Override
+ public ContentShellActivity getActivityForDelegate() {
+ return getActivity();
+ }
+
+ @Override
+ public Instrumentation getInstrumentationForDelegate() {
+ return InstrumentationRegistry.getInstrumentation();
+ }
+
+ @Override
+ public ContentShellActivity launchActivityWithIntentForDelegate(Intent t) {
+ return launchActivity(t);
+ }
+
+ @Override
+ public void runOnUiThreadForDelegate(Runnable runnable) throws Throwable {
+ runOnUiThread(runnable);
+ }
+
+ @Override
+ protected void beforeActivityLaunched() {
+ mDelegate.assertScreenIsOn();
+ }
+
+ /**
+ * Starts the ContentShell activity and loads the given URL.
+ * The URL can be null, in which case will default to ContentShellActivity.DEFAULT_SHELL_URL.
+ */
+ public ContentShellActivity launchContentShellWithUrl(String url) {
+ Assert.assertFalse(mLaunchActivity);
+ return mDelegate.launchContentShellWithUrl(url);
+ }
+
+ /**
+ * Starts the content shell activity with the provided test url.
+ * The url is synchronously loaded.
+ * @param url Test url to load.
+ */
+ public void launchContentShellWithUrlSync(String url) {
+ mDelegate.launchContentShellWithUrlSync(url);
boliu 2017/03/02 21:12:02 assert as well
the real yoland 2017/03/02 21:26:56 Done
+ }
+
+ /**
+ * Returns the current ContentViewCore or null if there is no ContentView.
+ */
+ public ContentViewCore getContentViewCore() {
+ return mDelegate.getContentViewCore();
+ }
+
+ /**
+ * Returns the WebContents of this Shell.
+ */
+ public WebContents getWebContents() {
+ return mDelegate.getWebContents();
+ }
+
+ /**
+ * Waits for the Active shell to finish loading. This times out after
+ * WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT milliseconds and it shouldn't be used for long
+ * loading pages. Instead it should be used more for test initialization. The proper way
+ * to wait is to use a TestCallbackHelperContainer after the initial load is completed.
+ */
+ public void waitForActiveShellToBeDoneLoading() {
+ mDelegate.waitForActiveShellToBeDoneLoading();
+ }
+
+ /**
+ * Creates a new {@link Shell} and waits for it to finish loading.
+ * @param url The URL to create the new {@link Shell} with.
+ * @return A new instance of a {@link Shell}.
+ * @throws ExecutionException
+ */
+ public Shell loadNewShell(String url) throws ExecutionException {
+ return mDelegate.loadNewShell(url);
+ }
+
+ /**
+ * Loads a URL in the specified content view.
+ *
+ * @param navigationController The navigation controller to load the URL in.
+ * @param callbackHelperContainer The callback helper container used to monitor progress.
+ * @param params The URL params to use.
+ */
+ public void loadUrl(NavigationController navigationController,
+ TestCallbackHelperContainer callbackHelperContainer, LoadUrlParams params)
+ throws Throwable {
+ mDelegate.loadUrl(navigationController, callbackHelperContainer, params);
+ }
+
+ /**
+ * Handles performing an action on the UI thread that will return when the specified callback
+ * is incremented.
+ *
+ * @param callbackHelper The callback helper that will be blocked on.
+ * @param action The action to be performed on the UI thread.
+ */
+ public void handleBlockingCallbackAction(CallbackHelper callbackHelper, Runnable action)
+ throws Throwable {
+ mDelegate.handleBlockingCallbackAction(callbackHelper, action);
+ }
+
+ // TODO(aelias): This method needs to be removed once http://crbug.com/179511 is fixed.
+ // Meanwhile, we have to wait if the page has the <meta viewport> tag.
+ /**
+ * Waits till the ContentViewCore receives the expected page scale factor
+ * from the compositor and asserts that this happens.
+ */
+ public void assertWaitForPageScaleFactorMatch(float expectedScale) {
+ mDelegate.assertWaitForPageScaleFactorMatch(expectedScale);
+ }
+
+ /**
+ * Replaces the {@link ContentViewCore#mContainerView} with a newly created
+ * {@link ContentView}.
+ */
+ @SuppressWarnings("javadoc")
+ public void replaceContainerView() throws Throwable {
+ mDelegate.replaceContainerView();
+ }
+
+ /**
+ * Annotation for tests that should be executed a second time after replacing
+ * the ContentViewCore's container view.
+ * <p>Please note that activity launch is only invoked once before both runs,
+ * and that any state changes produced by the first run are visible to the second run.
+ */
+ @Target(ElementType.METHOD)
+ @Retention(RetentionPolicy.RUNTIME)
+ public @interface RerunWithUpdatedContainerView {}
+}

Powered by Google App Engine
This is Rietveld 408576698