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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2963683002: Simplify CommandLine parameterizing J3 Instrumentation Tests (Closed)
Patch Set: address comments Created 3 years, 5 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 | « chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java ('k') | chrome/test/android/BUILD.gn » ('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/parameters/SigninParametersTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/test/util/parameters/SigninParametersTest.java b/chrome/android/javatests/src/org/chromium/chrome/test/util/parameters/SigninParametersTest.java
deleted file mode 100644
index 1fccb616b604ba17a24d95733aae76173c61da81..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/test/util/parameters/SigninParametersTest.java
+++ /dev/null
@@ -1,201 +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.parameters;
-
-import android.support.test.filters.SmallTest;
-
-import org.chromium.base.test.util.DisabledTest;
-import org.chromium.base.test.util.EnormousTest;
-import org.chromium.base.test.util.FlakyTest;
-import org.chromium.base.test.util.Restriction;
-import org.chromium.base.test.util.RetryOnFailure;
-import org.chromium.base.test.util.parameter.Parameter;
-import org.chromium.base.test.util.parameter.ParameterizedTest;
-import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
-
-/**
- * Tester class for implementation of Signin testing and ParameterizedTest.
- */
-@RetryOnFailure
-public class SigninParametersTest extends ChromeActivityTestCaseBase<ChromeActivity> {
- private static final String GOOGLE_ACCOUNT_USERNAME = "chromiumforandroid01@gmail.com";
- private static final String GOOGLE_ACCOUNT_PASSWORD = "chromeforandroid";
-
- private AddFakeAccountToAppParameter mAddFakeAccountToAppParameter;
- private AddFakeAccountToOsParameter mAddFakeAccountToOsParameter;
- private AddGoogleAccountToOsParameter mAddGoogleAccountToOsParameter;
-
- public SigninParametersTest() {
- super(ChromeActivity.class);
- }
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- mAddFakeAccountToAppParameter =
- getAvailableParameter(AddFakeAccountToAppParameter.PARAMETER_TAG);
- mAddFakeAccountToOsParameter =
- getAvailableParameter(AddFakeAccountToOsParameter.PARAMETER_TAG);
- mAddGoogleAccountToOsParameter =
- getAvailableParameter(AddGoogleAccountToOsParameter.PARAMETER_TAG);
- }
-
- @SmallTest
- public void testActivityIsNotSignedInOnAppOrFakeOSorGoogleOS() {
- assertFalse("Should not be signed into app.",
- mAddFakeAccountToAppParameter.isSignedIn());
- assertFalse("Should not be signed into OS with fake account.",
- mAddFakeAccountToOsParameter.isSignedIn());
- assertFalse("Should not be signed in on OS with Google account.",
- mAddGoogleAccountToOsParameter.isSignedIn(GOOGLE_ACCOUNT_USERNAME));
- }
-
- /*
- @SmallTest
- @ParameterizedTest(parameters = {
- @Parameter(tag = AddFakeAccountToAppParameter.PARAMETER_TAG)})
- */
- @DisabledTest(message = "crbug.com/524189")
- public void testIsSignedInOnApp() {
- assertTrue("Should not be signed into app.",
- mAddFakeAccountToAppParameter.isSignedIn());
- assertFalse("Should not be signed into OS with fake account.",
- mAddFakeAccountToOsParameter.isSignedIn());
- assertFalse("Should not be signed in on OS with Google account.",
- mAddGoogleAccountToOsParameter.isSignedIn(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @SmallTest
- @ParameterizedTest(parameters = {
- @Parameter(tag = AddFakeAccountToOsParameter.PARAMETER_TAG)})
- public void testIsSignedInOnFakeOS() {
- assertFalse("Should not be signed in on app.",
- mAddFakeAccountToAppParameter.isSignedIn());
- assertTrue("Should be signed in on OS with fake account.",
- mAddFakeAccountToOsParameter.isSignedIn());
- assertFalse("Should not be signed in on OS with Google account.",
- mAddGoogleAccountToOsParameter.isSignedIn(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @FlakyTest
- @EnormousTest
- @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
- @ParameterizedTest(parameters = {
- @Parameter(
- tag = AddGoogleAccountToOsParameter.PARAMETER_TAG,
- arguments = {
- @Parameter.Argument(
- name = AddGoogleAccountToOsParameter.ARGUMENT.USERNAME,
- stringVar = GOOGLE_ACCOUNT_USERNAME),
- @Parameter.Argument(
- name = AddGoogleAccountToOsParameter.ARGUMENT.PASSWORD,
- stringVar = GOOGLE_ACCOUNT_PASSWORD)})})
- public void testIsSignedInOnGoogleOS() {
- assertFalse("Should not be signed into app.",
- mAddFakeAccountToAppParameter.isSignedIn());
- assertFalse("Should not be signed into OS with fake account.",
- mAddFakeAccountToOsParameter.isSignedIn());
- assertTrue("Should be signed in on OS with Google account.",
- mAddGoogleAccountToOsParameter.isSignedIn(GOOGLE_ACCOUNT_USERNAME));
- }
-
- /*
- @SmallTest
- @ParameterizedTest(parameters = {
- @Parameter(tag = AddFakeAccountToAppParameter.PARAMETER_TAG),
- @Parameter(tag = AddFakeAccountToOsParameter.PARAMETER_TAG)})
- */
- @DisabledTest(message = "crbug.com/524189")
- public void testIsSignedInOnFakeOSandApp() {
- assertTrue("Should be signed in on app.",
- mAddFakeAccountToAppParameter.isSignedIn());
- assertTrue("Should be signed in on OS with fake account.",
- mAddFakeAccountToOsParameter.isSignedIn());
- assertFalse("Should not be signed in on OS with Google account.",
- mAddGoogleAccountToOsParameter.isSignedIn(GOOGLE_ACCOUNT_USERNAME));
- }
-
- /*
- @FlakyTest
- @EnormousTest
- @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
- @ParameterizedTest(parameters = {
- @Parameter(tag = AddFakeAccountToAppParameter.PARAMETER_TAG),
- @Parameter(
- tag = AddGoogleAccountToOsParameter.PARAMETER_TAG,
- arguments = {
- @Parameter.Argument(
- name = AddGoogleAccountToOsParameter.ARGUMENT.USERNAME,
- stringVar = GOOGLE_ACCOUNT_USERNAME),
- @Parameter.Argument(
- name = AddGoogleAccountToOsParameter.ARGUMENT.PASSWORD,
- stringVar = GOOGLE_ACCOUNT_PASSWORD)})})
- */
- @DisabledTest(message = "crbug.com/524189")
- public void testIsSignedInOnAppAndGoogleOS() {
- assertTrue("Should be signed into app.",
- mAddFakeAccountToAppParameter.isSignedIn());
- assertFalse("Should not be signed into OS with fake account.",
- mAddFakeAccountToOsParameter.isSignedIn());
- assertTrue("Should be signed in on OS with Google account.",
- mAddGoogleAccountToOsParameter.isSignedIn(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @FlakyTest
- @EnormousTest
- @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
- @ParameterizedTest(parameters = {
- @Parameter(tag = AddFakeAccountToOsParameter.PARAMETER_TAG),
- @Parameter(
- tag = AddGoogleAccountToOsParameter.PARAMETER_TAG,
- arguments = {
- @Parameter.Argument(
- name = AddGoogleAccountToOsParameter.ARGUMENT.USERNAME,
- stringVar = GOOGLE_ACCOUNT_USERNAME),
- @Parameter.Argument(
- name = AddGoogleAccountToOsParameter.ARGUMENT.PASSWORD,
- stringVar = GOOGLE_ACCOUNT_PASSWORD)})})
- public void testIsSignedInOnFakeOSandGoogleOS() {
- assertFalse("Should not be signed into app.",
- mAddFakeAccountToAppParameter.isSignedIn());
- assertTrue("Should be signed into OS with fake account.",
- mAddFakeAccountToOsParameter.isSignedIn());
- assertTrue("Should be signed in on OS with Google account.",
- mAddGoogleAccountToOsParameter.isSignedIn(GOOGLE_ACCOUNT_USERNAME));
- }
-
- /*
- @FlakyTest
- @EnormousTest
- @Restriction(Restriction.RESTRICTION_TYPE_INTERNET)
- @ParameterizedTest(parameters = {
- @Parameter(tag = AddFakeAccountToAppParameter.PARAMETER_TAG),
- @Parameter(tag = AddFakeAccountToOsParameter.PARAMETER_TAG),
- @Parameter(
- tag = AddGoogleAccountToOsParameter.PARAMETER_TAG,
- arguments = {
- @Parameter.Argument(
- name = AddGoogleAccountToOsParameter.ARGUMENT.USERNAME,
- stringVar = GOOGLE_ACCOUNT_USERNAME),
- @Parameter.Argument(
- name = AddGoogleAccountToOsParameter.ARGUMENT.PASSWORD,
- stringVar = GOOGLE_ACCOUNT_PASSWORD)})})
- */
- @DisabledTest(message = "crbug.com/524189")
- public void testIsSignedInOnAppAndFakeOSandGoogleOS() {
- assertTrue("Should be signed into app.",
- mAddFakeAccountToAppParameter.isSignedIn());
- assertTrue("Should be signed into OS with fake account.",
- mAddFakeAccountToOsParameter.isSignedIn());
- assertTrue("Should be signed in on OS with Google account.",
- mAddGoogleAccountToOsParameter.isSignedIn(GOOGLE_ACCOUNT_USERNAME));
- }
-
- @Override
- public void startMainActivity() throws InterruptedException {
- startMainActivityOnBlankPage();
- }
-}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java ('k') | chrome/test/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698