Index: webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java |
diff --git a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java |
index 2f04f15ddf1c0853f305b8fb52bde6a9fc1f3250..c3b5b45798a4129dfdf020d94f41c11c2a505f8d 100644 |
--- a/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java |
+++ b/webrtc/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java |
@@ -10,18 +10,22 @@ |
package org.appspot.apprtc.test; |
-import android.test.InstrumentationTestCase; |
-import android.test.suitebuilder.annotation.SmallTest; |
- |
+import android.support.test.InstrumentationRegistry; |
+import android.support.test.filters.SmallTest; |
+import org.chromium.base.test.BaseJUnit4ClassRunner; |
+import org.junit.Test; |
+import org.junit.runner.RunWith; |
import org.webrtc.PeerConnectionFactory; |
// This test is intended to run on ARM and catch LoadLibrary errors when we load the WebRTC |
// JNI. It can't really be setting up calls since ARM emulators are too slow, but instantiating |
// a peer connection isn't timing-sensitive, so we can at least do that. |
-public class WebRtcJniBootTest extends InstrumentationTestCase { |
+@RunWith(BaseJUnit4ClassRunner.class) |
+public class WebRtcJniBootTest { |
+ @Test |
@SmallTest |
public void testJniLoadsWithoutError() throws InterruptedException { |
- PeerConnectionFactory.initializeAndroidGlobals(getInstrumentation().getTargetContext(), |
+ PeerConnectionFactory.initializeAndroidGlobals(InstrumentationRegistry.getTargetContext(), |
true /* initializeAudio */, true /* initializeVideo */, |
false /* videoCodecHwAcceleration */); |