testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java - Issue 2195143002: [Android] Update all Robolectric tests to Robolectric 3.0

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java

Issue 2195143002: [Android] Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: All tests pass again! Created 4 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 | « testing/android/junit/BUILD.gn ('k') | testing/android/junit/java/src/org/chromium/testing/local/LocalRobolectricTestRunner.java » ('j') | third_party/robolectric/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java

diff --git a/testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java b/testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java

index e542128b8d2d6b6040000826d920b1d687ac0ee7..aaef34b29a3031c95742e7ae7d3e1140f19d1c4b 100644

--- a/testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java

+++ b/testing/android/junit/java/src/org/chromium/testing/local/BackgroundShadowAsyncTask.java

@@ -8,9 +8,9 @@ import static org.junit.Assert.fail;

import android.os.AsyncTask;

-import org.robolectric.Robolectric;

import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

+import org.robolectric.shadows.ShadowApplication;

import org.robolectric.shadows.ShadowAsyncTask;

import java.util.concurrent.Callable;

@@ -51,8 +51,8 @@ public class BackgroundShadowAsyncTask<Params, Progress, Result> extends

sExecutorService.submit(new Runnable() {

@Override

public void run() {

- Robolectric.runBackgroundTasks();

+ ShadowApplication.runBackgroundTasks();

}

}).get();

}