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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/signin/OAuth2TokenServiceTest.java

Issue 2583933003: Replace deprecated Android java test annotations (Closed)
Patch Set: Add presubmit checks Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.signin; 5 package org.chromium.chrome.browser.signin;
6 6
7 import android.accounts.Account; 7 import android.accounts.Account;
8 import android.support.test.filters.SmallTest;
8 import android.test.InstrumentationTestCase; 9 import android.test.InstrumentationTestCase;
9 import android.test.suitebuilder.annotation.SmallTest;
10 10
11 import org.chromium.base.test.util.AdvancedMockContext; 11 import org.chromium.base.test.util.AdvancedMockContext;
12 import org.chromium.base.test.util.DisabledTest; 12 import org.chromium.base.test.util.DisabledTest;
13 import org.chromium.base.test.util.Feature; 13 import org.chromium.base.test.util.Feature;
14 import org.chromium.components.signin.AccountManagerHelper; 14 import org.chromium.components.signin.AccountManagerHelper;
15 import org.chromium.components.signin.test.util.AccountHolder; 15 import org.chromium.components.signin.test.util.AccountHolder;
16 import org.chromium.components.signin.test.util.MockAccountManager; 16 import org.chromium.components.signin.test.util.MockAccountManager;
17 17
18 import java.util.Arrays; 18 import java.util.Arrays;
19 import java.util.concurrent.TimeUnit; 19 import java.util.concurrent.TimeUnit;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 .account(account) 111 .account(account)
112 .hasBeenAccepted(oauth2Scope, true) 112 .hasBeenAccepted(oauth2Scope, true)
113 .authToken(oauth2Scope, expectedToken).build(); 113 .authToken(oauth2Scope, expectedToken).build();
114 mAccountManager.addAccountHolderExplicitly(accountHolder); 114 mAccountManager.addAccountHolderExplicitly(accountHolder);
115 115
116 String accessToken = OAuth2TokenService.getOAuth2AccessTokenWithTimeout( 116 String accessToken = OAuth2TokenService.getOAuth2AccessTokenWithTimeout(
117 mContext, account, scope, 5, TimeUnit.SECONDS); 117 mContext, account, scope, 5, TimeUnit.SECONDS);
118 assertEquals(expectedToken, accessToken); 118 assertEquals(expectedToken, accessToken);
119 } 119 }
120 } 120 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698