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

Unified Diff: chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java

Issue 2243353002: (Reland) Update all Robolectric tests to Robolectric 3.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java
index e538b4934a318d3e4d44f7d21ec3a85907c7bdfe..ebf5382f3738310e21605ed13361b9cd0e7a2395 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java
@@ -32,7 +32,6 @@ import android.support.v7.media.MediaRouter.RouteInfo;
import org.chromium.base.BaseChromiumApplication;
import org.chromium.base.CommandLine;
import org.chromium.base.ContextUtils;
-import org.chromium.base.test.shadows.ShadowMultiDex;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.media.remote.MediaRouteController.MediaStateListener;
import org.chromium.chrome.browser.media.remote.MediaRouteController.UiListener;
@@ -44,11 +43,12 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import org.robolectric.internal.ReflectionHelpers;
+import org.robolectric.shadows.multidex.ShadowMultiDex;
+import org.robolectric.util.ReflectionHelpers;
/** Tests for {@link AbstractMediaRouteController}. */
@RunWith(LocalRobolectricTestRunner.class)
@@ -63,7 +63,7 @@ public class AbstractMediaRouteControllerTest {
// see http://crbug.com/469649
CommandLine.init(new String[] {});
- ContextUtils.initApplicationContextForTests(Robolectric.application);
+ ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application);
ShadowMediaRouter.sMediaRouter = null;
ShadowMediaRouter.sCallback = null;
@@ -321,9 +321,9 @@ public class AbstractMediaRouteControllerTest {
private static RouteInfo createRouteInfo(int playbackType) {
Class<?>[] paramClasses = new Class[] {ProviderInfo.class, String.class, String.class};
Object[] paramValues = new Object[] {null, "", ""};
- RouteInfo routeInfo = ReflectionHelpers.callConstructorReflectively(RouteInfo.class,
+ RouteInfo routeInfo = ReflectionHelpers.callConstructor(RouteInfo.class,
ReflectionHelpers.ClassParameter.fromComponentLists(paramClasses, paramValues));
- ReflectionHelpers.setFieldReflectively(routeInfo, "mPlaybackType", playbackType);
+ ReflectionHelpers.setField(routeInfo, "mPlaybackType", playbackType);
return routeInfo;
}

Powered by Google App Engine
This is Rietveld 408576698