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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheUMATest.java

Issue 2954393003: Fix test crashes related to AccountManagerHelper. (Closed)
Patch Set: . 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
Index: chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheUMATest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheUMATest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheUMATest.java
index 0cbc9c4334c1f8757612b605c922e684d78137b3..7c7dc4cfe587736b1dc9ca2932d3300ce051150e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheUMATest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheUMATest.java
@@ -4,9 +4,12 @@
package org.chromium.chrome.browser.precache;
+import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -17,6 +20,7 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.MetricsUtils.HistogramDelta;
import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
import org.chromium.content.browser.test.NativeLibraryTestRule;
import java.util.ArrayList;
@@ -31,6 +35,20 @@ public class PrecacheUMATest {
@Rule
public NativeLibraryTestRule mActivityTestRule = new NativeLibraryTestRule();
+ @Before
+ public void setUp() {
+ // TODO (thildebr): This is just copied from the ChromeBrowserTestRule because we need to
+ // be selective of when we load the native library, so we can't just use the rule.
+ SigninTestUtil.setUpAuthForTest(InstrumentationRegistry.getInstrumentation());
+ }
+
+ @After
+ public void tearDown() {
+ // TODO (thildebr): Also copied from ChromeBrowserTestRule until there's a better way.
+ SigninTestUtil.resetSigninState();
+ SigninTestUtil.tearDownAuthForTest();
+ }
+
@Test
@SmallTest
@Feature({"Precache"})

Powered by Google App Engine
This is Rietveld 408576698