From 57b490004db110bfb26c0ff6636c45b0579d3833 Mon Sep 17 00:00:00 2001 From: sakal Date: Fri, 16 Sep 2016 06:02:47 -0700 Subject: [PATCH] Change AppRTCDemoJUnitTest to use LocalRobolectricTestRunner. It was previously using org.robolectric.RobolectricTestRunner. Due to changes in Chromium this no longer works. This CL fixes the issue. BUG=webrtc:6363 NOTRY=True Review-Url: https://codereview.webrtc.org/2342783002 Cr-Commit-Position: refs/heads/master@{#14261} --- .../src/org/appspot/apprtc/DirectRTCClientTest.java | 4 ++-- .../src/org/appspot/apprtc/TCPChannelClientTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java b/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java index 12cdb57e4e..9c72c47311 100644 --- a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java +++ b/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java @@ -20,10 +20,10 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; +import org.chromium.testing.local.LocalRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.webrtc.IceCandidate; import org.webrtc.SessionDescription; @@ -32,7 +32,7 @@ import org.webrtc.SessionDescription; * Test for DirectRTCClient. Test is very simple and only tests the overall sanity of the class * behaviour. */ -@RunWith(RobolectricTestRunner.class) +@RunWith(LocalRobolectricTestRunner.class) @Config(manifest = Config.NONE) public class DirectRTCClientTest { private static final String ROOM_URL = ""; diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java b/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java index b4a6a50a4b..be8487f02d 100644 --- a/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java +++ b/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java @@ -15,13 +15,13 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; +import org.chromium.testing.local.LocalRobolectricTestRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -@RunWith(RobolectricTestRunner.class) +@RunWith(LocalRobolectricTestRunner.class) @Config(manifest = Config.NONE) public class TCPChannelClientTest { private static final int PORT = 8888;