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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java

Issue 2800833003: Revert of Android: Remove GetApplicationContext part 2 (Closed)
Patch Set: Created 3 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
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.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/browser/signin/OAuth2TokenServiceIntegrationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java
index 8500c46bc7e0d3a9d7baa0f3eab0f83c4628c914..a1b8b11dc0eaf03d1298eb8d5fd0d2b373c25470 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceIntegrationTest.java
@@ -75,7 +75,7 @@
AccountManagerHelper.overrideAccountManagerHelperForTests(mContext, mAccountManager);
// Make sure there is no account signed in yet.
- mChromeSigninController = ChromeSigninController.get();
+ mChromeSigninController = ChromeSigninController.get(mContext);
mChromeSigninController.setSignedInAccountName(null);
// Seed test accounts to AccountTrackerService.
@@ -95,7 +95,7 @@
@Override
public void run() {
mChromeSigninController.setSignedInAccountName(null);
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
}
});
}
@@ -106,12 +106,12 @@
public void run() {
AccountIdProvider.setInstanceForTest(new AccountIdProvider() {
@Override
- public String getAccountId(String accountName) {
+ public String getAccountId(Context ctx, String accountName) {
return "gaia-id-" + accountName;
}
@Override
- public boolean canBeUsed() {
+ public boolean canBeUsed(Context ctx) {
return true;
}
});
@@ -125,9 +125,10 @@
public void run() {
AccountIdProvider provider = AccountIdProvider.getInstance();
String[] accountNames = {TEST_ACCOUNT1.name, TEST_ACCOUNT2.name};
- String[] accountIds = {provider.getAccountId(accountNames[0]),
- provider.getAccountId(accountNames[1])};
- AccountTrackerService.get().syncForceRefreshForTest(accountIds, accountNames);
+ String[] accountIds = {provider.getAccountId(context, accountNames[0]),
+ provider.getAccountId(context, accountNames[1])};
+ AccountTrackerService.get(context).syncForceRefreshForTest(
+ accountIds, accountNames);
}
});
}
@@ -243,7 +244,7 @@
@Override
public void run() {
// Run test.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
// Ensure no calls have been made to the observer.
Assert.assertEquals(0, mObserver.getAvailableCallCount());
@@ -263,7 +264,7 @@
mAccountManager.addAccountHolderExplicitly(TEST_ACCOUNT_HOLDER_1);
// Run test.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
// Ensure no calls have been made to the observer.
Assert.assertEquals(0, mObserver.getAvailableCallCount());
@@ -286,7 +287,7 @@
mChromeSigninController.setSignedInAccountName(TEST_ACCOUNT1.name);
// Run test.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
// Ensure one call for the signed in account.
Assert.assertEquals(1, mObserver.getAvailableCallCount());
@@ -294,13 +295,13 @@
Assert.assertEquals(0, mObserver.getLoadedCallCount());
// Validate again and make sure no new calls are made.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(1, mObserver.getAvailableCallCount());
Assert.assertEquals(0, mObserver.getRevokedCallCount());
Assert.assertEquals(0, mObserver.getLoadedCallCount());
// Validate again with force notifications and make sure one new calls is made.
- mOAuth2TokenService.validateAccounts(true);
+ mOAuth2TokenService.validateAccounts(mContext, true);
Assert.assertEquals(2, mObserver.getAvailableCallCount());
Assert.assertEquals(0, mObserver.getRevokedCallCount());
Assert.assertEquals(0, mObserver.getLoadedCallCount());
@@ -321,13 +322,13 @@
mChromeSigninController.setSignedInAccountName(TEST_ACCOUNT1.name);
// Run one validation.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(1, mObserver.getAvailableCallCount());
Assert.assertEquals(0, mObserver.getRevokedCallCount());
Assert.assertEquals(0, mObserver.getLoadedCallCount());
// Re-run validation.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(1, mObserver.getAvailableCallCount());
Assert.assertEquals(0, mObserver.getRevokedCallCount());
Assert.assertEquals(0, mObserver.getLoadedCallCount());
@@ -348,7 +349,7 @@
mChromeSigninController.setSignedInAccountName(TEST_ACCOUNT1.name);
// Run one validation.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(1, mObserver.getAvailableCallCount());
Assert.assertEquals(0, mObserver.getRevokedCallCount());
Assert.assertEquals(0, mObserver.getLoadedCallCount());
@@ -360,7 +361,7 @@
seedAccountTrackerService(mContext);
// Re-run validation.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(2, mObserver.getAvailableCallCount());
Assert.assertEquals(0, mObserver.getRevokedCallCount());
Assert.assertEquals(0, mObserver.getLoadedCallCount());
@@ -382,11 +383,11 @@
mChromeSigninController.setSignedInAccountName(TEST_ACCOUNT1.name);
// Run one validation.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(2, mObserver.getAvailableCallCount());
mAccountManager.removeAccountHolderExplicitly(TEST_ACCOUNT_HOLDER_2);
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(2, mObserver.getAvailableCallCount());
Assert.assertEquals(1, mObserver.getRevokedCallCount());
@@ -408,7 +409,7 @@
// Mark user as signed in.
mChromeSigninController.setSignedInAccountName(TEST_ACCOUNT1.name);
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(2, mObserver.getAvailableCallCount());
// Remove all.
@@ -416,7 +417,7 @@
mAccountManager.removeAccountHolderExplicitly(TEST_ACCOUNT_HOLDER_2);
// Re-validate and run checks.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(2, mObserver.getRevokedCallCount());
Assert.assertEquals(0, mObserver.getLoadedCallCount());
}
@@ -437,7 +438,7 @@
// Mark user as signed in.
mChromeSigninController.setSignedInAccountName(TEST_ACCOUNT1.name);
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(2, mObserver.getAvailableCallCount());
// Remove all.
@@ -446,7 +447,7 @@
mAccountManager.removeAccountHolderExplicitly(TEST_ACCOUNT_HOLDER_2);
// Re-validate and run checks.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
Assert.assertEquals(2, mObserver.getRevokedCallCount());
Assert.assertEquals(0, mObserver.getLoadedCallCount());
}
@@ -467,7 +468,7 @@
mChromeSigninController.setSignedInAccountName(TEST_ACCOUNT1.name);
// Run test.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
// All accounts will be notified. It is up to the observer
// to design if any action is needed.
@@ -488,7 +489,7 @@
mChromeSigninController.setSignedInAccountName(TEST_ACCOUNT1.name);
// Run test.
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
// Ensure no calls have been made to the observer.
Assert.assertEquals(0, mObserver.getAvailableCallCount());
@@ -510,12 +511,12 @@
@Override
public void onRefreshTokenAvailable(Account account) {
super.onRefreshTokenAvailable(account);
- Assert.assertEquals(1, OAuth2TokenService.getAccounts().length);
+ Assert.assertEquals(1, OAuth2TokenService.getAccounts(mContext).length);
}
};
addObserver(ob);
- mOAuth2TokenService.validateAccounts(false);
+ mOAuth2TokenService.validateAccounts(mContext, false);
}
});
}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698