Move playback test utils to testutils.

This allows other tests to reuse the util classes without having to link to playbacktests.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=158214560

library/core/build.gradle

@@ -22,6 +22,7 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
     }
 
+    // Workaround to prevent circular dependency on project :testutils.
     sourceSets {
         androidTest {
             java.srcDirs += "../../testutils/src/main/java/"

library/dash/build.gradle

@@ -22,12 +22,6 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
     }
 
-    sourceSets {
-        androidTest {
-            java.srcDirs += "../../testutils/src/main/java/"
-        }
-    }
-
     buildTypes {
         debug {
             testCoverageEnabled = true
@@ -39,6 +33,7 @@ dependencies {
     compile project(':library-core')
     compile 'com.android.support:support-annotations:' + supportLibraryVersion
     compile 'com.android.support:support-core-utils:' + supportLibraryVersion
+    androidTestCompile project(':testutils')
     androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion

library/smoothstreaming/build.gradle

@@ -22,12 +22,6 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
     }
 
-    sourceSets {
-        androidTest {
-            java.srcDirs += "../../testutils/src/main/java/"
-        }
-    }
-
     buildTypes {
         debug {
             testCoverageEnabled = true
@@ -38,6 +32,7 @@ android {
 dependencies {
     compile project(':library-core')
     compile 'com.android.support:support-annotations:' + supportLibraryVersion
+    androidTestCompile project(':testutils')
     androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion

playbacktests/build.gradle

@@ -24,7 +24,8 @@ android {
 }
 
 dependencies {
-    compile project(':library-core')
+    androidTestCompile project(':library-core')
     androidTestCompile project(':library-dash')
     androidTestCompile project(':library-hls')
+    androidTestCompile project(':testutils')
 }

playbacktests/src/androidTest/AndroidManifest.xml

@@ -28,7 +28,7 @@
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
     <uses-library android:name="android.test.runner"/>
 
-    <activity android:name="com.google.android.exoplayer2.playbacktests.util.HostActivity"
+    <activity android:name="com.google.android.exoplayer2.testutil.HostActivity"
         android:configChanges="keyboardHidden|orientation|screenSize"
         android:label="ExoPlayerTest"/>
 

playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashStreamingTest.java

@@ -20,8 +20,8 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.mediacodec.MediaCodecInfo;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
-import com.google.android.exoplayer2.playbacktests.util.ActionSchedule;
+import com.google.android.exoplayer2.testutil.ActionSchedule;
-import com.google.android.exoplayer2.playbacktests.util.HostActivity;
+import com.google.android.exoplayer2.testutil.HostActivity;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 

playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java

@@ -38,18 +38,18 @@ import com.google.android.exoplayer2.drm.HttpMediaDrmCallback;
 import com.google.android.exoplayer2.drm.MediaDrmCallback;
 import com.google.android.exoplayer2.drm.UnsupportedDrmException;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil;
-import com.google.android.exoplayer2.playbacktests.util.ActionSchedule;
-import com.google.android.exoplayer2.playbacktests.util.DebugRenderersFactory;
-import com.google.android.exoplayer2.playbacktests.util.DecoderCountersUtil;
-import com.google.android.exoplayer2.playbacktests.util.ExoHostedTest;
-import com.google.android.exoplayer2.playbacktests.util.HostActivity;
-import com.google.android.exoplayer2.playbacktests.util.HostActivity.HostedTest;
-import com.google.android.exoplayer2.playbacktests.util.MetricsLogger;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.dash.DashMediaSource;
 import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource;
+import com.google.android.exoplayer2.testutil.ActionSchedule;
+import com.google.android.exoplayer2.testutil.DebugRenderersFactory;
+import com.google.android.exoplayer2.testutil.DecoderCountersUtil;
+import com.google.android.exoplayer2.testutil.ExoHostedTest;
+import com.google.android.exoplayer2.testutil.HostActivity;
+import com.google.android.exoplayer2.testutil.HostActivity.HostedTest;
+import com.google.android.exoplayer2.testutil.MetricsLogger;
 import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 import com.google.android.exoplayer2.trackselection.RandomTrackSelection;

playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashWidevineOfflineTest.java

@@ -22,10 +22,10 @@ import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.drm.OfflineLicenseHelper;
-import com.google.android.exoplayer2.playbacktests.util.ActionSchedule;
-import com.google.android.exoplayer2.playbacktests.util.HostActivity;
 import com.google.android.exoplayer2.source.dash.DashUtil;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
+import com.google.android.exoplayer2.testutil.ActionSchedule;
+import com.google.android.exoplayer2.testutil.HostActivity;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.util.MimeTypes;

testutils/src/main/AndroidManifest.xml

@@ -14,4 +14,4 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer2.testutils"/>
+<manifest package="com.google.android.exoplayer2.testutil"/>

testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.playbacktests.util;
+package com.google.android.exoplayer2.testutil;
 
 import android.util.Log;
 import android.view.Surface;

testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.playbacktests.util;
+package com.google.android.exoplayer2.testutil;
 
 import android.os.Handler;
 import android.view.Surface;
 import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.playbacktests.util.Action.ClearVideoSurface;
+import com.google.android.exoplayer2.testutil.Action.ClearVideoSurface;
-import com.google.android.exoplayer2.playbacktests.util.Action.Seek;
+import com.google.android.exoplayer2.testutil.Action.Seek;
-import com.google.android.exoplayer2.playbacktests.util.Action.SetPlayWhenReady;
+import com.google.android.exoplayer2.testutil.Action.SetPlayWhenReady;
-import com.google.android.exoplayer2.playbacktests.util.Action.SetRendererDisabled;
+import com.google.android.exoplayer2.testutil.Action.SetRendererDisabled;
-import com.google.android.exoplayer2.playbacktests.util.Action.SetVideoSurface;
+import com.google.android.exoplayer2.testutil.Action.SetVideoSurface;
-import com.google.android.exoplayer2.playbacktests.util.Action.Stop;
+import com.google.android.exoplayer2.testutil.Action.Stop;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 
 /**

testutils/src/main/java/com/google/android/exoplayer2/testutil/DebugRenderersFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.playbacktests.util;
+package com.google.android.exoplayer2.testutil;
 
 import android.annotation.TargetApi;
 import android.content.Context;

testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.playbacktests.util;
+package com.google.android.exoplayer2.testutil;
 
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import junit.framework.TestCase;

testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.playbacktests.util;
+package com.google.android.exoplayer2.testutil;
 
 import android.os.Handler;
 import android.os.SystemClock;
@@ -33,9 +33,9 @@ import com.google.android.exoplayer2.audio.AudioTrack;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
-import com.google.android.exoplayer2.playbacktests.util.HostActivity.HostedTest;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.testutil.HostActivity.HostedTest;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;

testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.playbacktests.util;
+package com.google.android.exoplayer2.testutil;
 
 import static junit.framework.Assert.fail;
 
@@ -32,7 +32,6 @@ import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.Window;
-import com.google.android.exoplayer2.playbacktests.R;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 
@@ -142,8 +141,9 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     requestWindowFeature(Window.FEATURE_NO_TITLE);
-    setContentView(R.layout.host_activity);
+    setContentView(getResources().getIdentifier("host_activity", "layout", getPackageName()));
-    surfaceView = (SurfaceView) findViewById(R.id.surface_view);
+    surfaceView = (SurfaceView) findViewById(
+        getResources().getIdentifier("surface_view", "id", getPackageName()));
     surfaceView.getHolder().addCallback(this);
     mainHandler = new Handler();
     checkCanStopRunnable = new CheckCanStopRunnable();

testutils/src/main/java/com/google/android/exoplayer2/testutil/LogcatMetricsLogger.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.playbacktests.util;
+package com.google.android.exoplayer2.testutil;
 
 import android.util.Log;
 

testutils/src/main/java/com/google/android/exoplayer2/testutil/MetricsLogger.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.playbacktests.util;
+package com.google.android.exoplayer2.testutil;
 
 import android.app.Instrumentation;