Skip to content

SDK / exoplayer

Go to a project
Commit 3aa17bfb by ibaker Committed by Andrew Lewis
Options

Switch extractor tests to single-parameter parameterized syntax 

This is simpler than instantiating a single-element string array for
every parameter.

#exofixit

PiperOrigin-RevId: 344237475
parent 8c9b92ef
Inline Side-by-side
Showing with 41 additions and 40 deletions
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorParameterizedTest.java
......@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.extractor.amr;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -33,7 +33,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class AmrExtractorParameterizedTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java
......@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.extractor.flac;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.AssertionConfig;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -29,7 +29,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public class FlacExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
......@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.extractor.flv;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -28,7 +28,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class FlvExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
......@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.extractor.mkv;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -28,7 +28,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class MatroskaExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
......@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.extractor.mp3;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.AssertionConfig;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -29,7 +29,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class Mp3ExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
......@@ -33,7 +33,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class FragmentedMp4ExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
......@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.extractor.mp4;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -28,7 +28,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class Mp4ExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorParameterizedTest.java
......@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.extractor.ogg;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -32,7 +32,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class OggExtractorParameterizedTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
......@@ -18,7 +18,7 @@ package com.google.android.exoplayer2.extractor.rawcc;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.util.MimeTypes;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -28,7 +28,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner;
public final class RawCcExtractorTest {
@ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
......@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.extractor.ts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -28,7 +28,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class Ac3ExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java
......@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.extractor.ts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -28,7 +28,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class Ac4ExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
......@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.extractor.ts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.AssertionConfig;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -29,7 +29,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class AdtsExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
......@@ -16,7 +16,7 @@
package com.google.android.exoplayer2.extractor.ts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -28,7 +28,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class PsExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
......@@ -36,7 +36,7 @@ import com.google.android.exoplayer2.testutil.FakeTrackOutput;
import com.google.android.exoplayer2.testutil.TestUtil;
import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.TimestampAdjuster;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -48,7 +48,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
public final class TsExtractorTest {
@Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
......@@ -17,7 +17,7 @@ package com.google.android.exoplayer2.extractor.wav;
import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.AssertionConfig;
import java.util.List;
import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.ParameterizedRobolectricTestRunner;
......@@ -27,7 +27,7 @@ import org.robolectric.ParameterizedRobolectricTestRunner;
public final class WavExtractorTest {
@ParameterizedRobolectricTestRunner.Parameters(name = "{0}")
public static List<Object[]> params() {
public static ImmutableList<ExtractorAsserts.SimulationConfig> params() {
return ExtractorAsserts.configs();
}
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExtractorAsserts.java
......@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOExce
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
......@@ -48,17 +49,17 @@ public final class ExtractorAsserts {
* <p>This is intended to be used from tests using {@code ParameterizedRobolectricTestRunner} or
* {@code org.junit.runners.Parameterized}.
*/
public static List<Object[]> configs() {
return Arrays.asList(
new Object[] {new SimulationConfig(true, false, false, false)},
new Object[] {new SimulationConfig(true, false, false, true)},
new Object[] {new SimulationConfig(true, false, true, false)},
new Object[] {new SimulationConfig(true, false, true, true)},
new Object[] {new SimulationConfig(true, true, false, false)},
new Object[] {new SimulationConfig(true, true, false, true)},
new Object[] {new SimulationConfig(true, true, true, false)},
new Object[] {new SimulationConfig(true, true, true, true)},
new Object[] {new SimulationConfig(false, false, false, false)});
public static ImmutableList<SimulationConfig> configs() {
return ImmutableList.of(
new SimulationConfig(true, false, false, false),
new SimulationConfig(true, false, false, true),
new SimulationConfig(true, false, true, false),
new SimulationConfig(true, false, true, true),
new SimulationConfig(true, true, false, false),
new SimulationConfig(true, true, false, true),
new SimulationConfig(true, true, true, false),
new SimulationConfig(true, true, true, true),
new SimulationConfig(false, false, false, false));
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment