Remove testutil dependency on Robolectric shadows
Move shadow-related utils for end-to-end tests into core test. PiperOrigin-RevId: 330902696
This commit is contained in:
parent
6abe6a676e
commit
abc39088d0
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
@ -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;
|
@ -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;
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user