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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java

Issue 1025403002: [Sync] PassphraseActivity: unregister for sync events when paused. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ChromeActivityTestBase and rename FakeProfileSyncService. Created 5 years, 8 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: chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8498da16f4e902f54904994c4357a4fce7b43e74
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java
@@ -0,0 +1,94 @@
+// Copyright 2015 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.ui;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.browser.sync.FakeProfileSyncService;
+import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.chrome.shell.ChromeShellTestBase;
+import org.chromium.sync.signin.ChromeSigninController;
+
+/**
+ * Tests for PassphraseActivity.
+ */
+public class PassphraseActivityTest extends ChromeShellTestBase {
+ private static final String TAG = "PassphraseActivityTest";
+ private static final String TEST_ACCOUNT = "test@gmail.com";
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ clearAppData();
+ Context context = getInstrumentation().getTargetContext();
+ startChromeBrowserProcessSync(context);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // Clear ProfileSyncService in case it was mocked.
+ ProfileSyncService.overrideForTests(null);
+ super.tearDown();
+ }
+
+ /**
+ * This is a regression test for http://crbug.com/469890.
+ */
+ @SmallTest
+ @Feature({"Sync"})
+ public void testCallbackAfterBackgrounded() throws Exception {
+ final Context context = getInstrumentation().getTargetContext();
+ // Override before creating the activity so we know initialized is false.
+ overrideProfileSyncService(context);
+ // PassphraseActivity won't start if an account isn't set.
+ ChromeSigninController.get(context).setSignedInAccountName(TEST_ACCOUNT);
+ // Create the activity.
+ final PassphraseActivity activity = launchPassphraseActivity(context);
+ assertNotNull(activity);
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ // Fake backgrounding the activity.
+ Bundle bundle = new Bundle();
+ getInstrumentation().callActivityOnPause(activity);
+ getInstrumentation().callActivityOnSaveInstanceState(activity, bundle);
+ // Fake sync's backend finishing its initialization.
+ FakeProfileSyncService pss =
+ (FakeProfileSyncService) ProfileSyncService.get(context);
+ pss.setSyncInitialized(true);
+ pss.syncStateChanged();
+ }
+ });
+ // Nothing crashed; success!
+ }
+
+ private PassphraseActivity launchPassphraseActivity(Context context) {
+ Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.setComponent(new ComponentName(context, PassphraseActivity.class));
+ intent.addCategory(Intent.CATEGORY_LAUNCHER);
+ // This activity will become the start of a new task on this history stack.
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ // Clears the task stack above this activity if it already exists.
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ return launchActivityWithIntent(
+ "org.chromium.chrome.shell", PassphraseActivity.class, intent);
+ }
+
+ private void overrideProfileSyncService(final Context context) {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ // PSS has to be constructed on the UI thread.
+ ProfileSyncService.overrideForTests(new FakeProfileSyncService(context));
+ }
+ });
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698