From 79a3bad4c36ea2a4fa3c6e85328e8d47c8d38a01 Mon Sep 17 00:00:00 2001 From: kimvde Date: Thu, 6 Feb 2020 10:48:19 +0000 Subject: [PATCH] Move assets from FLAC extension to testdata PiperOrigin-RevId: 293553412 --- extensions/flac/build.gradle | 10 +++++++--- .../ext/flac/FlacBinarySearchSeekerTest.java | 2 +- .../exoplayer2/ext/flac/FlacExtractorSeekTest.java | 2 +- .../exoplayer2/ext/flac/FlacExtractorTest.java | 6 ++++-- .../exoplayer2/ext/flac/FlacPlaybackTest.java | 4 ++-- .../src/test/assets/flac/ext-bear-flac-16bit.mka | Bin .../flac/ext-bear-flac-16bit.mka.audiosink.dump | 0 .../src/test/assets/flac/ext-bear-flac-24bit.mka | Bin .../flac/ext-bear-flac-24bit.mka.audiosink.dump | 0 .../src/test/assets/flac/ext-bear.flac | Bin .../src/test/assets/flac/ext-bear.flac.0.dump | 0 .../src/test/assets/flac/ext-bear.flac.1.dump | 0 .../src/test/assets/flac/ext-bear.flac.2.dump | 0 .../src/test/assets/flac/ext-bear.flac.3.dump | 0 .../src/test/assets/flac/ext-bear_no_seek.flac | Bin .../src/test/assets/flac/ext-bear_with_id3.flac | Bin .../test/assets/flac/ext-bear_with_id3.flac.0.dump | 0 .../test/assets/flac/ext-bear_with_id3.flac.1.dump | 0 .../test/assets/flac/ext-bear_with_id3.flac.2.dump | 0 .../test/assets/flac/ext-bear_with_id3.flac.3.dump | 0 20 files changed, 15 insertions(+), 9 deletions(-) rename extensions/flac/src/androidTest/assets/bear-flac-16bit.mka => testdata/src/test/assets/flac/ext-bear-flac-16bit.mka (100%) rename extensions/flac/src/androidTest/assets/bear-flac-16bit.mka.audiosink.dump => testdata/src/test/assets/flac/ext-bear-flac-16bit.mka.audiosink.dump (100%) rename extensions/flac/src/androidTest/assets/bear-flac-24bit.mka => testdata/src/test/assets/flac/ext-bear-flac-24bit.mka (100%) rename extensions/flac/src/androidTest/assets/bear-flac-24bit.mka.audiosink.dump => testdata/src/test/assets/flac/ext-bear-flac-24bit.mka.audiosink.dump (100%) rename extensions/flac/src/androidTest/assets/bear.flac => testdata/src/test/assets/flac/ext-bear.flac (100%) rename extensions/flac/src/androidTest/assets/bear.flac.0.dump => testdata/src/test/assets/flac/ext-bear.flac.0.dump (100%) rename extensions/flac/src/androidTest/assets/bear.flac.1.dump => testdata/src/test/assets/flac/ext-bear.flac.1.dump (100%) rename extensions/flac/src/androidTest/assets/bear.flac.2.dump => testdata/src/test/assets/flac/ext-bear.flac.2.dump (100%) rename extensions/flac/src/androidTest/assets/bear.flac.3.dump => testdata/src/test/assets/flac/ext-bear.flac.3.dump (100%) rename extensions/flac/src/androidTest/assets/bear_no_seek.flac => testdata/src/test/assets/flac/ext-bear_no_seek.flac (100%) rename extensions/flac/src/androidTest/assets/bear_with_id3.flac => testdata/src/test/assets/flac/ext-bear_with_id3.flac (100%) rename extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump => testdata/src/test/assets/flac/ext-bear_with_id3.flac.0.dump (100%) rename extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump => testdata/src/test/assets/flac/ext-bear_with_id3.flac.1.dump (100%) rename extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump => testdata/src/test/assets/flac/ext-bear_with_id3.flac.2.dump (100%) rename extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump => testdata/src/test/assets/flac/ext-bear_with_id3.flac.3.dump (100%) diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle index 4a326ac646..4c4fd7fe6d 100644 --- a/extensions/flac/build.gradle +++ b/extensions/flac/build.gradle @@ -29,9 +29,12 @@ android { testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } - sourceSets.main { - jniLibs.srcDir 'src/main/libs' - jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio. + sourceSets { + main { + jniLibs.srcDir 'src/main/libs' + jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio. + } + androidTest.assets.srcDir '../../testdata/src/test/assets/' } testOptions.unitTests.includeAndroidResources = true @@ -46,6 +49,7 @@ dependencies { testImplementation 'androidx.test:core:' + androidxTestCoreVersion testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion testImplementation project(modulePrefix + 'testutils') + testImplementation project(modulePrefix + 'testdata') testImplementation 'org.robolectric:robolectric:' + robolectricVersion } diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java index a18202f4e2..6e6f41a9f4 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacBinarySearchSeekerTest.java @@ -34,7 +34,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class FlacBinarySearchSeekerTest { - private static final String NOSEEKTABLE_FLAC = "bear_no_seek.flac"; + private static final String NOSEEKTABLE_FLAC = "flac/ext-bear_no_seek.flac"; private static final int DURATION_US = 2_741_000; @Before diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java index a64a52b411..11c2e970ac 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorSeekTest.java @@ -48,7 +48,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class FlacExtractorSeekTest { - private static final String NO_SEEKTABLE_FLAC = "bear_no_seek.flac"; + private static final String NO_SEEKTABLE_FLAC = "flac/ext-bear_no_seek.flac"; private static final int DURATION_US = 2_741_000; private static final Uri FILE_URI = Uri.parse("file:///android_asset/" + NO_SEEKTABLE_FLAC); private static final Random RANDOM = new Random(1234L); diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java index c8033e04d3..553f8335b6 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java @@ -38,12 +38,14 @@ public class FlacExtractorTest { @Test public void testExtractFlacSample() throws Exception { ExtractorAsserts.assertBehavior( - FlacExtractor::new, "bear.flac", ApplicationProvider.getApplicationContext()); + FlacExtractor::new, "flac/ext-bear.flac", ApplicationProvider.getApplicationContext()); } @Test public void testExtractFlacSampleWithId3Header() throws Exception { ExtractorAsserts.assertBehavior( - FlacExtractor::new, "bear_with_id3.flac", ApplicationProvider.getApplicationContext()); + FlacExtractor::new, + "flac/ext-bear_with_id3.flac", + ApplicationProvider.getApplicationContext()); } } diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java index 0b33a8a618..11b0d44ac3 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java @@ -42,8 +42,8 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class FlacPlaybackTest { - private static final String BEAR_FLAC_16BIT = "bear-flac-16bit.mka"; - private static final String BEAR_FLAC_24BIT = "bear-flac-24bit.mka"; + private static final String BEAR_FLAC_16BIT = "flac/ext-bear-flac-16bit.mka"; + private static final String BEAR_FLAC_24BIT = "flac/ext-bear-flac-24bit.mka"; @Before public void setUp() { diff --git a/extensions/flac/src/androidTest/assets/bear-flac-16bit.mka b/testdata/src/test/assets/flac/ext-bear-flac-16bit.mka similarity index 100% rename from extensions/flac/src/androidTest/assets/bear-flac-16bit.mka rename to testdata/src/test/assets/flac/ext-bear-flac-16bit.mka diff --git a/extensions/flac/src/androidTest/assets/bear-flac-16bit.mka.audiosink.dump b/testdata/src/test/assets/flac/ext-bear-flac-16bit.mka.audiosink.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear-flac-16bit.mka.audiosink.dump rename to testdata/src/test/assets/flac/ext-bear-flac-16bit.mka.audiosink.dump diff --git a/extensions/flac/src/androidTest/assets/bear-flac-24bit.mka b/testdata/src/test/assets/flac/ext-bear-flac-24bit.mka similarity index 100% rename from extensions/flac/src/androidTest/assets/bear-flac-24bit.mka rename to testdata/src/test/assets/flac/ext-bear-flac-24bit.mka diff --git a/extensions/flac/src/androidTest/assets/bear-flac-24bit.mka.audiosink.dump b/testdata/src/test/assets/flac/ext-bear-flac-24bit.mka.audiosink.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear-flac-24bit.mka.audiosink.dump rename to testdata/src/test/assets/flac/ext-bear-flac-24bit.mka.audiosink.dump diff --git a/extensions/flac/src/androidTest/assets/bear.flac b/testdata/src/test/assets/flac/ext-bear.flac similarity index 100% rename from extensions/flac/src/androidTest/assets/bear.flac rename to testdata/src/test/assets/flac/ext-bear.flac diff --git a/extensions/flac/src/androidTest/assets/bear.flac.0.dump b/testdata/src/test/assets/flac/ext-bear.flac.0.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear.flac.0.dump rename to testdata/src/test/assets/flac/ext-bear.flac.0.dump diff --git a/extensions/flac/src/androidTest/assets/bear.flac.1.dump b/testdata/src/test/assets/flac/ext-bear.flac.1.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear.flac.1.dump rename to testdata/src/test/assets/flac/ext-bear.flac.1.dump diff --git a/extensions/flac/src/androidTest/assets/bear.flac.2.dump b/testdata/src/test/assets/flac/ext-bear.flac.2.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear.flac.2.dump rename to testdata/src/test/assets/flac/ext-bear.flac.2.dump diff --git a/extensions/flac/src/androidTest/assets/bear.flac.3.dump b/testdata/src/test/assets/flac/ext-bear.flac.3.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear.flac.3.dump rename to testdata/src/test/assets/flac/ext-bear.flac.3.dump diff --git a/extensions/flac/src/androidTest/assets/bear_no_seek.flac b/testdata/src/test/assets/flac/ext-bear_no_seek.flac similarity index 100% rename from extensions/flac/src/androidTest/assets/bear_no_seek.flac rename to testdata/src/test/assets/flac/ext-bear_no_seek.flac diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac b/testdata/src/test/assets/flac/ext-bear_with_id3.flac similarity index 100% rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac rename to testdata/src/test/assets/flac/ext-bear_with_id3.flac diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump b/testdata/src/test/assets/flac/ext-bear_with_id3.flac.0.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac.0.dump rename to testdata/src/test/assets/flac/ext-bear_with_id3.flac.0.dump diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump b/testdata/src/test/assets/flac/ext-bear_with_id3.flac.1.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac.1.dump rename to testdata/src/test/assets/flac/ext-bear_with_id3.flac.1.dump diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump b/testdata/src/test/assets/flac/ext-bear_with_id3.flac.2.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac.2.dump rename to testdata/src/test/assets/flac/ext-bear_with_id3.flac.2.dump diff --git a/extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump b/testdata/src/test/assets/flac/ext-bear_with_id3.flac.3.dump similarity index 100% rename from extensions/flac/src/androidTest/assets/bear_with_id3.flac.3.dump rename to testdata/src/test/assets/flac/ext-bear_with_id3.flac.3.dump