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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1288643003: Added Signin Parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sami's LGTM Nits 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 | « base/test/android/javatests/src/org/chromium/base/test/util/parameter/Parameterizable.java ('k') | chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java » ('j') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/parameters/AddFakeAccountToAppParameter.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java b/chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java
index 2f50547e578d86da6cc34d244f9ec0179c5cdd4e..df73705434b3e2e8d16b261c380af8edc624d8a8 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/test/ParametersOnMultiTest.java
@@ -4,12 +4,18 @@
package org.chromium.chrome.test;
+import android.test.FlakyTest;
import android.test.MoreAsserts;
import android.test.suitebuilder.annotation.SmallTest;
+import org.chromium.base.test.util.EnormousTest;
+import org.chromium.base.test.util.Restriction;
import org.chromium.base.test.util.parameter.Parameter;
import org.chromium.base.test.util.parameter.ParameterizedTest;
import org.chromium.base.test.util.parameter.parameters.MethodParameter;
+import org.chromium.chrome.test.util.parameters.AddFakeAccountToAppParameter;
+import org.chromium.chrome.test.util.parameters.AddFakeAccountToOsParameter;
+import org.chromium.chrome.test.util.parameters.AddGoogleAccountToOsParameter;
/**
* Tester class for the {@link ParameterizedTest} annotation and the {@link ParameterizedTest.Set}
@@ -19,6 +25,24 @@ import org.chromium.base.test.util.parameter.parameters.MethodParameter;
* parameter that runs tests on different test base activites exists.
*/
public class ParametersOnMultiTest extends MultiActivityTestBase {
+ 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;
+
+ @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 testNoParameterizedTestAnnotation() {
assertFalse("This is a parameterized test when it should not be.", getParameterReader()
@@ -362,6 +386,150 @@ public class ParametersOnMultiTest extends MultiActivityTestBase {
return temp[input - 1];
}
+ /**
+ * These are from {@link org.chromium.chrome.test.util.parameters.SigninParametersTest.
+ *
+ * TODO (crbug.com/522503): Merge tests together when this is fixed.
+ */
+ @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)})
+ 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)})
+ 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)})})
+ 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)})})
+ 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));
+ }
+
private Parameter.Argument getArgument(String name) {
return getParameterReader().getParameterArgument(MethodParameter.PARAMETER_TAG, name);
}
« no previous file with comments | « base/test/android/javatests/src/org/chromium/base/test/util/parameter/Parameterizable.java ('k') | chrome/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtilsTest.java » ('j') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/parameters/AddFakeAccountToAppParameter.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698