From da96288904bfddabb383bf9862233f0b1a34a494 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Sun, 18 Sep 2016 21:28:06 +0200 Subject: [PATCH] Make android_junit_tests use LocalRobolectricTestRunner This was originally fixed in https://codereview.webrtc.org/2346793002 but that CL was reverted. In the reland (https://codereview.webrtc.org/2348663003) only the GN change was included, not the code change. BUG=webrtc:6365 NOTRY=True TBR=sakal@webrtc.org Review URL: https://codereview.webrtc.org/2348083003 . Cr-Commit-Position: refs/heads/master@{#14281} --- webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java index 031cdfd5c9..5ec2ac4d90 100644 --- a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java +++ b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java @@ -15,9 +15,9 @@ import static org.webrtc.CameraEnumerationAndroid.getClosestSupportedFramerateRa import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange; +import org.chromium.testing.local.LocalRobolectricTestRunner; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import java.util.Arrays; @@ -25,7 +25,7 @@ import java.util.Arrays; /** * Tests for CameraEnumerationAndroid. */ -@RunWith(RobolectricTestRunner.class) +@RunWith(LocalRobolectricTestRunner.class) @Config(manifest = Config.NONE) public class CameraEnumerationTest { @Test