Move extension tests to Robolectric.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=187021822
ash242186 · Mar 7, 2018 · 4519c31 · 4519c31
1 parent 7c7711c
commit 4519c31
Show file tree

Hide file tree

Showing 76 changed files with 3,715 additions and 2,229 deletions.
diff --git a/core_settings.gradle b/core_settings.gradle
@@ -24,6 +24,7 @@ include modulePrefix + 'library-hls'
 include modulePrefix + 'library-smoothstreaming'
 include modulePrefix + 'library-ui'
 include modulePrefix + 'testutils'
+include modulePrefix + 'testutils-robolectric'
 include modulePrefix + 'extension-ffmpeg'
 include modulePrefix + 'extension-flac'
 include modulePrefix + 'extension-gvr'
@@ -43,6 +44,7 @@ project(modulePrefix + 'library-hls').projectDir = new File(rootDir, 'library/hl
 project(modulePrefix + 'library-smoothstreaming').projectDir = new File(rootDir, 'library/smoothstreaming')
 project(modulePrefix + 'library-ui').projectDir = new File(rootDir, 'library/ui')
 project(modulePrefix + 'testutils').projectDir = new File(rootDir, 'testutils')
+project(modulePrefix + 'testutils-robolectric').projectDir = new File(rootDir, 'testutils_robolectric')
 project(modulePrefix + 'extension-ffmpeg').projectDir = new File(rootDir, 'extensions/ffmpeg')
 project(modulePrefix + 'extension-flac').projectDir = new File(rootDir, 'extensions/flac')
 project(modulePrefix + 'extension-gvr').projectDir = new File(rootDir, 'extensions/gvr')

diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
@@ -38,10 +38,7 @@ dependencies {
     compile 'com.google.android.gms:play-services-cast-framework:' + playServicesLibraryVersion
     compile project(modulePrefix + 'library-core')
     compile project(modulePrefix + 'library-ui')
-    testCompile project(modulePrefix + 'testutils')
-    testCompile 'junit:junit:' + junitVersion
-    testCompile 'org.mockito:mockito-core:' + mockitoVersion
-    testCompile 'org.robolectric:robolectric:' + robolectricVersion
+    testCompile project(modulePrefix + 'testutils-robolectric')
 }
 
 ext {

diff --git a/extensions/cast/src/test/AndroidManifest.xml b/extensions/cast/src/test/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.google.android.exoplayer2.ext.cast.test">
+
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
+
+</manifest>
diff --git a/...ns/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java b/...ns/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java
@@ -17,6 +17,7 @@
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TimelineAsserts;
+import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.gms.cast.MediaInfo;
 import com.google.android.gms.cast.MediaQueueItem;
 import com.google.android.gms.cast.MediaStatus;
@@ -25,11 +26,9 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 /** Tests for {@link CastTimelineTracker}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
 public class CastTimelineTrackerTest {
 
   private static final long DURATION_1_MS = 1000;
@@ -49,20 +48,20 @@ public void testGetCastTimeline() {
             new long[] {DURATION_1_MS, MediaInfo.UNKNOWN_DURATION, MediaInfo.UNKNOWN_DURATION});
 
     CastTimelineTracker tracker = new CastTimelineTracker();
-    mediaInfo = mockMediaInfo("contentId1", DURATION_1_MS);
+    mediaInfo = getMediaInfo("contentId1", DURATION_1_MS);
     Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
     TimelineAsserts.assertPeriodDurations(
         tracker.getCastTimeline(status), C.msToUs(DURATION_1_MS), C.TIME_UNSET, C.TIME_UNSET);
 
-    mediaInfo = mockMediaInfo("contentId3", DURATION_3_MS);
+    mediaInfo = getMediaInfo("contentId3", DURATION_3_MS);
     Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
     TimelineAsserts.assertPeriodDurations(
         tracker.getCastTimeline(status),
         C.msToUs(DURATION_1_MS),
         C.TIME_UNSET,
         C.msToUs(DURATION_3_MS));
 
-    mediaInfo = mockMediaInfo("contentId2", DURATION_2_MS);
+    mediaInfo = getMediaInfo("contentId2", DURATION_2_MS);
     Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
     TimelineAsserts.assertPeriodDurations(
         tracker.getCastTimeline(status),
@@ -80,7 +79,7 @@ public void testGetCastTimeline() {
               DURATION_5_MS,
               MediaInfo.UNKNOWN_DURATION
             });
-    mediaInfo = mockMediaInfo("contentId5", DURATION_5_MS);
+    mediaInfo = getMediaInfo("contentId5", DURATION_5_MS);
     Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
     TimelineAsserts.assertPeriodDurations(
         tracker.getCastTimeline(newStatus),
@@ -89,7 +88,7 @@ public void testGetCastTimeline() {
         C.msToUs(DURATION_5_MS),
         C.msToUs(DURATION_3_MS));
 
-    mediaInfo = mockMediaInfo("contentId3", DURATION_3_MS);
+    mediaInfo = getMediaInfo("contentId3", DURATION_3_MS);
     Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
     TimelineAsserts.assertPeriodDurations(
         tracker.getCastTimeline(newStatus),
@@ -98,7 +97,7 @@ public void testGetCastTimeline() {
         C.msToUs(DURATION_5_MS),
         C.msToUs(DURATION_3_MS));
 
-    mediaInfo = mockMediaInfo("contentId4", DURATION_4_MS);
+    mediaInfo = getMediaInfo("contentId4", DURATION_4_MS);
     Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
     TimelineAsserts.assertPeriodDurations(
         tracker.getCastTimeline(newStatus),
@@ -112,7 +111,7 @@ private static MediaStatus mockMediaStatus(
       int[] itemIds, String[] contentIds, long[] durationsMs) {
     ArrayList<MediaQueueItem> items = new ArrayList<>();
     for (int i = 0; i < contentIds.length; i++) {
-      MediaInfo mediaInfo = mockMediaInfo(contentIds[i], durationsMs[i]);
+      MediaInfo mediaInfo = getMediaInfo(contentIds[i], durationsMs[i]);
       MediaQueueItem item = Mockito.mock(MediaQueueItem.class);
       Mockito.when(item.getMedia()).thenReturn(mediaInfo);
       Mockito.when(item.getItemId()).thenReturn(itemIds[i]);
@@ -123,10 +122,11 @@ private static MediaStatus mockMediaStatus(
     return status;
   }
 
-  private static MediaInfo mockMediaInfo(String contentId, long durationMs) {
-    MediaInfo mediaInfo = Mockito.mock(MediaInfo.class);
-    Mockito.when(mediaInfo.getContentId()).thenReturn(contentId);
-    Mockito.when(mediaInfo.getStreamDuration()).thenReturn(durationMs);
-    return mediaInfo;
+  private static MediaInfo getMediaInfo(String contentId, long durationMs) {
+    return new MediaInfo.Builder(contentId)
+        .setStreamDuration(durationMs)
+        .setContentType(MimeTypes.APPLICATION_MP4)
+        .setStreamType(MediaInfo.STREAM_TYPE_NONE)
+        .build();
   }
 }
diff --git a/extensions/cast/src/test/resources/robolectric.properties b/extensions/cast/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+manifest=src/test/AndroidManifest.xml
diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
@@ -39,12 +39,8 @@ dependencies {
     compile files('libs/cronet_api.jar')
     compile files('libs/cronet_impl_common_java.jar')
     compile files('libs/cronet_impl_native_java.jar')
-    androidTestCompile project(modulePrefix + 'library')
-    androidTestCompile project(modulePrefix + 'testutils')
-    androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
-    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
-    androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion
-    androidTestCompile 'com.android.support.test:runner:' + testSupportLibraryVersion
+    testCompile project(modulePrefix + 'library')
+    testCompile project(modulePrefix + 'testutils-robolectric')
 }
 
 ext {

diff --git a/...ronet/src/androidTest/AndroidManifest.xml → ...sions/cronet/src/test/AndroidManifest.xml b/...ronet/src/androidTest/AndroidManifest.xml → ...sions/cronet/src/test/AndroidManifest.xml
@@ -18,16 +18,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.cronet">
 
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="27"/>
-
-  <application android:debuggable="true"
-      android:allowBackup="false"
-      tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
-    <uses-library android:name="android.test.runner" />
-  </application>
-
-  <instrumentation
-      android:name="android.test.InstrumentationTestRunner"
-      android:targetPackage="com.google.android.exoplayer2.ext.cronet"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
 </manifest>
diff --git a/...onet/ByteArrayUploadDataProviderTest.java → ...onet/ByteArrayUploadDataProviderTest.java b/...onet/ByteArrayUploadDataProviderTest.java → ...onet/ByteArrayUploadDataProviderTest.java
@@ -19,9 +19,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-import com.google.android.exoplayer2.testutil.MockitoUtil;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -30,11 +27,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
-/**
- * Tests for {@link ByteArrayUploadDataProvider}.
- */
-@RunWith(AndroidJUnit4.class)
+/** Tests for {@link ByteArrayUploadDataProvider}. */
+@RunWith(RobolectricTestRunner.class)
 public final class ByteArrayUploadDataProviderTest {
 
   private static final byte[] TEST_DATA = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
@@ -45,7 +42,7 @@ public final class ByteArrayUploadDataProviderTest {
 
   @Before
   public void setUp() {
-    MockitoUtil.setUpMockito(InstrumentationRegistry.getTargetContext(), this);
+    MockitoAnnotations.initMocks(this);
     byteBuffer = ByteBuffer.allocate(TEST_DATA.length);
     byteArrayUploadDataProvider = new ByteArrayUploadDataProvider(TEST_DATA);
   }
@@ -90,5 +87,4 @@ public void testRewind() throws IOException {
     assertThat(byteBuffer.array()).isEqualTo(TEST_DATA);
     verify(mockUploadDataSink).onRewindSucceeded();
   }
-
 }