loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove testutil dependency on Robolectric shadows

Browse Source 
Move shadow-related utils for end-to-end tests into core test.

PiperOrigin-RevId: 330902696
This commit is contained in:
andrewlewis 2020-09-10 11:31:40 +01:00 committed by Oliver Woodman
parent 6abe6a676e
commit abc39088d0
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/test/java/com/google/android/exoplayer2/e2etest/Mp4PlaybackTest.java
View File

@ -23,10 +23,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.e2etest.util.PlaybackOutput;
import com.google.android.exoplayer2.e2etest.util.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock; import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock;
import com.google.android.exoplayer2.testutil.DumpFileAsserts; import com.google.android.exoplayer2.testutil.DumpFileAsserts;
import com.google.android.exoplayer2.testutil.PlaybackOutput;
import com.google.android.exoplayer2.testutil.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.testutil.TestExoPlayer; import com.google.android.exoplayer2.testutil.TestExoPlayer;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;

4
library/core/src/test/java/com/google/android/exoplayer2/e2etest/TsPlaybackTest.java
View File

@ -22,10 +22,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.e2etest.util.PlaybackOutput;
import com.google.android.exoplayer2.e2etest.util.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock; import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock;
import com.google.android.exoplayer2.testutil.DumpFileAsserts; import com.google.android.exoplayer2.testutil.DumpFileAsserts;
import com.google.android.exoplayer2.testutil.PlaybackOutput;
import com.google.android.exoplayer2.testutil.ShadowMediaCodecConfig;
import com.google.android.exoplayer2.testutil.TestExoPlayer; import com.google.android.exoplayer2.testutil.TestExoPlayer;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;

3
testutils/src/main/java/com/google/android/exoplayer2/testutil/PlaybackOutput.java → library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/PlaybackOutput.java
View File

@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.testutil; package com.google.android.exoplayer2.e2etest.util;
import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.testutil.Dumper;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

2
testutils/src/main/java/com/google/android/exoplayer2/testutil/ShadowMediaCodecConfig.java → library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/ShadowMediaCodecConfig.java
View File

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

3
testutils/src/main/java/com/google/android/exoplayer2/testutil/TeeCodec.java → library/core/src/test/java/com/google/android/exoplayer2/e2etest/util/TeeCodec.java
View File

@ -13,8 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.google.android.exoplayer2.testutil; package com.google.android.exoplayer2.e2etest.util;
import com.google.android.exoplayer2.testutil.Dumper;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

1
testutils/build.gradle
View File

@ -24,7 +24,6 @@ dependencies {
compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
implementation 'org.robolectric:robolectric:' + robolectricVersion
testImplementation 'org.robolectric:robolectric:' + robolectricVersion testImplementation 'org.robolectric:robolectric:' + robolectricVersion
} }