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

Unified Diff: webrtc/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java

Issue 2657813003: Move Android tests under sdk/android. (Closed)
Patch Set: Created 3 years, 11 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 | « webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
diff --git a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java b/webrtc/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
similarity index 65%
rename from webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
rename to webrtc/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
index c9396fc483031812f0d3d8c83a91e1c576665b2d..6047b559dc6863039bead322e43287031635f577 100644
--- a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
+++ b/webrtc/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
@@ -13,14 +13,12 @@ package org.webrtc;
import static org.junit.Assert.assertEquals;
import static org.webrtc.CameraEnumerationAndroid.getClosestSupportedFramerateRange;
-import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange;
-
+import java.util.Arrays;
import org.chromium.testing.local.LocalRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
-
-import java.util.Arrays;
+import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange;
/**
* Tests for CameraEnumerationAndroid.
@@ -31,20 +29,20 @@ public class CameraEnumerationTest {
@Test
public void testGetClosestSupportedFramerateRange() {
assertEquals(new FramerateRange(10000, 30000),
- getClosestSupportedFramerateRange(Arrays.asList(new FramerateRange(10000, 30000),
- new FramerateRange(30000, 30000)),
- 30 /* requestedFps */));
+ getClosestSupportedFramerateRange(
+ Arrays.asList(new FramerateRange(10000, 30000), new FramerateRange(30000, 30000)),
+ 30 /* requestedFps */));
assertEquals(new FramerateRange(10000, 20000),
getClosestSupportedFramerateRange(
- Arrays.asList(new FramerateRange(0, 30000), new FramerateRange(10000, 20000),
- new FramerateRange(14000, 16000), new FramerateRange(15000, 15000)),
- 15 /* requestedFps */));
+ Arrays.asList(new FramerateRange(0, 30000), new FramerateRange(10000, 20000),
+ new FramerateRange(14000, 16000), new FramerateRange(15000, 15000)),
+ 15 /* requestedFps */));
assertEquals(new FramerateRange(10000, 20000),
getClosestSupportedFramerateRange(
- Arrays.asList(new FramerateRange(15000, 15000),
- new FramerateRange(10000, 20000), new FramerateRange(10000, 30000)),
- 10 /* requestedFps */));
+ Arrays.asList(new FramerateRange(15000, 15000), new FramerateRange(10000, 20000),
+ new FramerateRange(10000, 30000)),
+ 10 /* requestedFps */));
}
}
« no previous file with comments | « webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698