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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java

Issue 1270423006: Revert of Added Signin Utilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « no previous file | chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java b/chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java
deleted file mode 100644
index f87a0fae096738c9f91691648604367cceea0394..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-// 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.test.util;
-
-import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import org.chromium.base.test.util.Restriction;
-import org.chromium.sync.signin.ChromeSigninController;
-
-/**
- * Tests for {@link ChromeSigninUtils}.
- */
-public class ChromeSigninUtilsTest extends InstrumentationTestCase {
- private static final String FAKE_ACCOUNT_USERNAME = "test@google.com";
- private static final String FAKE_ACCOUNT_PASSWORD = "$3cr3t";
- private static final String GOOGLE_ACCOUNT_USERNAME = "chromiumforandroid01@gmail.com";
- private static final String GOOGLE_ACCOUNT_PASSWORD = "chromeforandroid";
- private static final String GOOGLE_ACCOUNT_TYPE = "mail";
-
- private ChromeSigninUtils mSigninUtil;
- private ChromeSigninController mSigninController;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- mSigninUtil = new ChromeSigninUtils(this);
- mSigninController = ChromeSigninController.get(getInstrumentation().getTargetContext());
- mSigninController.clearSignedInUser();
- mSigninUtil.removeAllFakeAccountsFromOs();
- mSigninUtil.removeAllGoogleAccountsFromOs();
- }
-
- @SmallTest
- public void testActivityIsNotSignedInOnAppOrFakeOSorGoogleOS() {
- assertFalse("Should not be signed into app.",
- mSigninController.isSignedIn());
- assertFalse("Should not be signed into OS with fake account.",
- mSigninUtil.isExistingFakeAccountOnOs(FAKE_ACCOUNT_USERNAME));
- assertFalse("Should not be signed in on OS with Google account.",
- mSigninUtil.isExistingGoogleAccountOnOs(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @SmallTest
- public void testIsSignedInOnApp() {
- mSigninUtil.addAccountToApp(FAKE_ACCOUNT_USERNAME);
- assertTrue("Should be signed on app.",
- mSigninController.isSignedIn());
- assertFalse("Should not be signed on OS with fake account.",
- mSigninUtil.isExistingFakeAccountOnOs(FAKE_ACCOUNT_USERNAME));
- assertFalse("Should not be signed in on OS with Google account.",
- mSigninUtil.isExistingGoogleAccountOnOs(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @SmallTest
- public void testIsSignedInOnFakeOS() {
- mSigninUtil.addFakeAccountToOs(FAKE_ACCOUNT_USERNAME, FAKE_ACCOUNT_PASSWORD);
- assertFalse("Should not be signed in on app.",
- mSigninController.isSignedIn());
- assertTrue("Should be signed in on OS with fake account.",
- mSigninUtil.isExistingFakeAccountOnOs(FAKE_ACCOUNT_USERNAME));
- assertFalse("Should not be signed in on OS with Google account.",
- mSigninUtil.isExistingGoogleAccountOnOs(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @MediumTest
- @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
- public void testIsSignedInOnGoogleOS() {
- mSigninUtil.addGoogleAccountToOs(GOOGLE_ACCOUNT_USERNAME, GOOGLE_ACCOUNT_PASSWORD,
- GOOGLE_ACCOUNT_TYPE);
- assertFalse("Should not be signed into app.",
- mSigninController.isSignedIn());
- assertFalse("Should not be signed into OS with fake account.",
- mSigninUtil.isExistingFakeAccountOnOs(FAKE_ACCOUNT_USERNAME));
- assertTrue("Should be signed in on OS with Google account.",
- mSigninUtil.isExistingGoogleAccountOnOs(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @SmallTest
- public void testIsSignedInOnFakeOSandApp() {
- mSigninUtil.addAccountToApp(FAKE_ACCOUNT_USERNAME);
- mSigninUtil.addFakeAccountToOs(FAKE_ACCOUNT_USERNAME, FAKE_ACCOUNT_PASSWORD);
- assertTrue("Should be signed in on app.",
- mSigninController.isSignedIn());
- assertTrue("Should be signed in on OS with fake account.",
- mSigninUtil.isExistingFakeAccountOnOs(FAKE_ACCOUNT_USERNAME));
- assertFalse("Should not be signed in on OS with Google account.",
- mSigninUtil.isExistingGoogleAccountOnOs(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @MediumTest
- @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
- public void testIsSignedInOnAppAndGoogleOS() {
- mSigninUtil.addAccountToApp(FAKE_ACCOUNT_USERNAME);
- mSigninUtil.addGoogleAccountToOs(GOOGLE_ACCOUNT_USERNAME, GOOGLE_ACCOUNT_PASSWORD,
- GOOGLE_ACCOUNT_TYPE);
- assertTrue("Should be signed into app.",
- mSigninController.isSignedIn());
- assertFalse("Should not be signed into OS with fake account.",
- mSigninUtil.isExistingFakeAccountOnOs(FAKE_ACCOUNT_USERNAME));
- assertTrue("Should be signed in on OS with Google account.",
- mSigninUtil.isExistingGoogleAccountOnOs(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @MediumTest
- @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
- public void testIsSignedInOnFakeOSandGoogleOS() {
- mSigninUtil.addFakeAccountToOs(FAKE_ACCOUNT_USERNAME, FAKE_ACCOUNT_PASSWORD);
- mSigninUtil.addGoogleAccountToOs(GOOGLE_ACCOUNT_USERNAME, GOOGLE_ACCOUNT_PASSWORD,
- GOOGLE_ACCOUNT_TYPE);
- assertFalse("Should not be signed into app.",
- mSigninController.isSignedIn());
- assertTrue("Should be signed into OS with fake account.",
- mSigninUtil.isExistingFakeAccountOnOs(FAKE_ACCOUNT_USERNAME));
- assertTrue("Should be signed in on OS with Google account.",
- mSigninUtil.isExistingGoogleAccountOnOs(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @MediumTest
- @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
- public void testIsSignedInOnAppAndFakeOSandGoogleOS() {
- mSigninUtil.addAccountToApp(FAKE_ACCOUNT_USERNAME);
- mSigninUtil.addFakeAccountToOs(FAKE_ACCOUNT_USERNAME, FAKE_ACCOUNT_PASSWORD);
- mSigninUtil.addGoogleAccountToOs(GOOGLE_ACCOUNT_USERNAME, GOOGLE_ACCOUNT_PASSWORD,
- GOOGLE_ACCOUNT_TYPE);
- assertTrue("Should be signed into app.",
- mSigninController.isSignedIn());
- assertTrue("Should be signed into OS with fake account.",
- mSigninUtil.isExistingFakeAccountOnOs(FAKE_ACCOUNT_USERNAME));
- assertTrue("Should be signed in on OS with Google account.",
- mSigninUtil.isExistingGoogleAccountOnOs(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @Override
- protected void tearDown() throws Exception {
- mSigninController.clearSignedInUser();
- mSigninUtil.removeAllFakeAccountsFromOs();
- mSigninUtil.removeAllGoogleAccountsFromOs();
- super.tearDown();
- }
-}
« no previous file with comments | « no previous file | chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698