Add more control over sync for Chromium testshell.

chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..705c59ec58f0adaa91bc029b7cba8b2fcfea16f8
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
@@ -0,0 +1,203 @@
+// Copyright 2013 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.chrome.browser.sync;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.content.Context;
+import android.util.Log;
+
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.DisabledTest;
+import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator;
+import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
+import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
+import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
+import org.chromium.chrome.testshell.ChromiumTestShellActivity;
+import org.chromium.chrome.testshell.ChromiumTestShellTestBase;
+import org.chromium.chrome.testshell.sync.SyncController;
+import org.chromium.content.browser.BrowserStartupController;
+import org.chromium.content.browser.ContentView;
+import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
+import org.chromium.content.browser.test.util.JavaScriptUtils;
+import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.content.common.CommandLine;
+import org.chromium.sync.notifier.SyncStatusHelper;
+import org.chromium.sync.signin.AccountManagerHelper;
+import org.chromium.sync.signin.ChromeSigninController;
+import org.chromium.sync.test.util.MockAccountManager;
+import org.chromium.sync.test.util.MockSyncContentResolverDelegate;
+
+import java.lang.Override;
+import java.lang.Runnable;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Test suite for Sync.
+ */
+public class SyncTest extends ChromiumTestShellTestBase {
+    private static final String TAG = "SyncTest";
+
+    private static final String FOREIGN_SESSION_TEST_MACHINE_ID =
+            "DeleteForeignSessionTest_Machine_1";
+
+    private SyncTestUtil.SyncTestContext mContext;
+    private MockAccountManager mAccountManager;
+    private SyncController mSyncController;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        clearAppData();

[Yaron, 2013/08/27 18:19:23]

Should this be in ChromiumTestShellTestBase?

[nyquist, 2013/08/30 00:55:43]

Only some of the classes that extend ChromiumTestShellTestBase call it.
Could we look at changing that to be part of a future setUp() method in
ChromiumTestShellTestBase in the future instead?

+
+        // Mock out the account manager on the device.
+        mContext = new SyncTestUtil.SyncTestContext(getInstrumentation().getTargetContext());
+        mAccountManager = new MockAccountManager(mContext, getInstrumentation().getContext());
+        AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
+        MockSyncContentResolverDelegate syncContentResolverDelegate =
+                new MockSyncContentResolverDelegate();
+        syncContentResolverDelegate.setMasterSyncAutomatically(true);
+        SyncStatusHelper.overrideSyncStatusHelperForTests(mContext, syncContentResolverDelegate);
+        // This call initializes the ChromeSigninController to use our test context.
+        ChromeSigninController.get(mContext);
+        startChromeBrowserProcessSync(getInstrumentation().getTargetContext());
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                mSyncController = SyncController.get(mContext);
+            }
+        });
+    }
+
+    private static void startChromeBrowserProcessSync(final Context targetContext)

[Yaron, 2013/08/27 18:19:23]

Rebase as discussed off-thread.

[nyquist, 2013/08/30 00:55:43]

Done.

+            throws InterruptedException {
+        final Semaphore semaphore = new Semaphore(0);
+        ThreadUtils.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                CommandLine.initFromFile("/data/local/tmp/chromium-testshell-command-line");
+                BrowserStartupController.get(targetContext).startBrowserProcessesAsync(
+                        new BrowserStartupController.StartupCallback() {
+                            @Override
+                            public void onSuccess(boolean alreadyStarted) {
+                                semaphore.release();
+                            }
+
+                            @Override
+                            public void onFailure() {
+                                fail("Failed to launch tests.");
+                                semaphore.release();
+                            }
+                        });
+            }
+        });
+        semaphore.acquire();
+    }
+
+    @DisabledTest

[Yaron, 2013/08/27 18:19:23]

Why disabled? Oh cause called by python, nvm

[nyquist, 2013/08/30 00:55:43]

Yeah. Awkward, but that's our framework.

+    public void testGetAboutSyncInfoYieldsValidData() throws Throwable {
+        setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID);
+
+        final SyncTestUtil.AboutSyncInfoGetter syncInfoGetter =
+                new SyncTestUtil.AboutSyncInfoGetter(getActivity());
+        runTestOnUiThread(syncInfoGetter);
+
+        boolean gotInfo = CriteriaHelper.pollForCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return !syncInfoGetter.getAboutInfo().isEmpty();
+            }
+        }, SyncTestUtil.UI_TIMEOUT_MS, SyncTestUtil.CHECK_INTERVAL_MS);
+
+        assertTrue("Couldn't get about info.", gotInfo);
+    }
+
+    @DisabledTest
+    public void testAboutSyncPageDisplaysCurrentSyncStatus() throws InterruptedException {
+        setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID);
+
+        loadUrlWithSanitization("chrome://sync");
+        SyncTestUtil.AboutSyncInfoGetter aboutInfoGetter =
+               new SyncTestUtil.AboutSyncInfoGetter(getActivity());
+        try {
+            runTestOnUiThread(aboutInfoGetter);
+        } catch (Throwable t) {
+            Log.w(TAG,
+                    "Exception while trying to fetch about sync info from ProfileSyncService.", t);
+            fail("Unable to fetch sync info from ProfileSyncService.");
+        }
+        assertFalse("About sync info should not be empty.",
+                aboutInfoGetter.getAboutInfo().isEmpty());
+        assertTrue("About sync info should have sync summary status.",
+                aboutInfoGetter.getAboutInfo().containsKey(SyncTestUtil.SYNC_SUMMARY_STATUS));
+        final String expectedSyncSummary =
+                aboutInfoGetter.getAboutInfo().get(SyncTestUtil.SYNC_SUMMARY_STATUS);
+
+        Criteria checker = new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                final ContentViewCore contentViewCore = getContentViewCore(getActivity());
+                String innerHtml = "";
+                try {
+                    final TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper helper =
+                            new TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper();
+                    innerHtml = JavaScriptUtils.executeJavaScriptAndWaitForResult(
+                            contentViewCore, helper, "document.documentElement.innerHTML");
+                } catch (InterruptedException e) {
+                    Log.w(TAG, "Interrupted while polling about:sync page for sync status.", e);
+                } catch (TimeoutException e) {
+                    Log.w(TAG, "Interrupted while polling about:sync page for sync status.", e);
+                }
+                return innerHtml.contains(expectedSyncSummary);
+            }
+
+        };
+        boolean hadExpectedStatus = CriteriaHelper.pollForCriteria(
+                checker, SyncTestUtil.UI_TIMEOUT_MS, SyncTestUtil.CHECK_INTERVAL_MS);
+        assertTrue("Sync status not present on about sync page: " + expectedSyncSummary,
+                hadExpectedStatus);
+    }
+
+    private void setupTestAccountAndSignInToSync(
+            final String syncClientIdentifier)
+            throws InterruptedException {
+        SyncTestUtil.verifySyncServerIsRunning();

[Yaron, 2013/08/27 18:19:23]

How about doing this in setUp. Ensures that you don't confuse it as test
failure.

[nyquist, 2013/08/30 00:55:43]

Great idea!

+        Account defaultTestAccount = SyncTestUtil.setupTestAccount(mAccountManager,
+                SyncTestUtil.DEFAULT_TEST_ACCOUNT, SyncTestUtil.DEFAULT_PASSWORD,
+                SyncTestUtil.CHROME_SYNC_OAUTH2_SCOPE, SyncTestUtil.LOGIN_OAUTH2_SCOPE,
+                SyncStatusHelper.AUTH_TOKEN_TYPE_SYNC);
+
+        UniqueIdentificationGeneratorFactory.registerGenerator(
+                UuidBasedUniqueIdentificationGenerator.GENERATOR_ID,
+                new UniqueIdentificationGenerator() {
+                    @Override
+                    public String getUniqueId(String salt) {
+                        return syncClientIdentifier;
+                    }
+                }, true);
+
+        SyncTestUtil.verifySyncIsSignedOut(getActivity());
+
+        final Activity activity = launchChromiumTestShellWithBlankPage();
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                mSyncController.signIn(activity, SyncTestUtil.DEFAULT_TEST_ACCOUNT);
+            }
+        });
+
+        SyncTestUtil.verifySyncIsSignedIn(mContext, defaultTestAccount);
+    }
+
+    private static ContentViewCore getContentViewCore(ChromiumTestShellActivity activity) {
+        ContentView contentView = activity.getActiveContentView();
+        if (contentView == null) return null;
+        return contentView.getContentViewCore();
+    }
+}