From 363599dd54c502ef45ec2ebfe5b4c4d57b516525 Mon Sep 17 00:00:00 2001 From: kimvde Date: Mon, 10 Feb 2020 17:51:04 +0000 Subject: [PATCH] Move assets from dash to testdata module PiperOrigin-RevId: 294241169 --- library/dash/build.gradle | 2 ++ .../source/dash/manifest/DashManifestParserTest.java | 10 +++++----- .../assets => testdata/src/test/assets/mpd}/sample_mpd | 0 .../src/test/assets/mpd}/sample_mpd_event_stream | 0 .../src/test/assets/mpd}/sample_mpd_labels | 0 .../src/test/assets/mpd}/sample_mpd_segment_template | 0 .../src/test/assets/mpd}/sample_mpd_unknown_mime_type | 0 7 files changed, 7 insertions(+), 5 deletions(-) rename {library/dash/src/test/assets => testdata/src/test/assets/mpd}/sample_mpd (100%) rename {library/dash/src/test/assets => testdata/src/test/assets/mpd}/sample_mpd_event_stream (100%) rename {library/dash/src/test/assets => testdata/src/test/assets/mpd}/sample_mpd_labels (100%) rename {library/dash/src/test/assets => testdata/src/test/assets/mpd}/sample_mpd_segment_template (100%) rename {library/dash/src/test/assets => testdata/src/test/assets/mpd}/sample_mpd_unknown_mime_type (100%) diff --git a/library/dash/build.gradle b/library/dash/build.gradle index f51fc509cc..ef87969037 100644 --- a/library/dash/build.gradle +++ b/library/dash/build.gradle @@ -33,6 +33,8 @@ android { } } + sourceSets.test.assets.srcDir '../../testdata/src/test/assets/' + testOptions.unitTests.includeAndroidResources = true } diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java index 390a18d2cc..e7963c5c48 100644 --- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java +++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java @@ -40,11 +40,11 @@ import org.xmlpull.v1.XmlPullParserFactory; @RunWith(AndroidJUnit4.class) public class DashManifestParserTest { - private static final String SAMPLE_MPD = "sample_mpd"; - private static final String SAMPLE_MPD_UNKNOWN_MIME_TYPE = "sample_mpd_unknown_mime_type"; - private static final String SAMPLE_MPD_SEGMENT_TEMPLATE = "sample_mpd_segment_template"; - private static final String SAMPLE_MPD_EVENT_STREAM = "sample_mpd_event_stream"; - private static final String SAMPLE_MPD_LABELS = "sample_mpd_labels"; + private static final String SAMPLE_MPD = "mpd/sample_mpd"; + private static final String SAMPLE_MPD_UNKNOWN_MIME_TYPE = "mpd/sample_mpd_unknown_mime_type"; + private static final String SAMPLE_MPD_SEGMENT_TEMPLATE = "mpd/sample_mpd_segment_template"; + private static final String SAMPLE_MPD_EVENT_STREAM = "mpd/sample_mpd_event_stream"; + private static final String SAMPLE_MPD_LABELS = "mpd/sample_mpd_labels"; private static final String NEXT_TAG_NAME = "Next"; private static final String NEXT_TAG = "<" + NEXT_TAG_NAME + "/>"; diff --git a/library/dash/src/test/assets/sample_mpd b/testdata/src/test/assets/mpd/sample_mpd similarity index 100% rename from library/dash/src/test/assets/sample_mpd rename to testdata/src/test/assets/mpd/sample_mpd diff --git a/library/dash/src/test/assets/sample_mpd_event_stream b/testdata/src/test/assets/mpd/sample_mpd_event_stream similarity index 100% rename from library/dash/src/test/assets/sample_mpd_event_stream rename to testdata/src/test/assets/mpd/sample_mpd_event_stream diff --git a/library/dash/src/test/assets/sample_mpd_labels b/testdata/src/test/assets/mpd/sample_mpd_labels similarity index 100% rename from library/dash/src/test/assets/sample_mpd_labels rename to testdata/src/test/assets/mpd/sample_mpd_labels diff --git a/library/dash/src/test/assets/sample_mpd_segment_template b/testdata/src/test/assets/mpd/sample_mpd_segment_template similarity index 100% rename from library/dash/src/test/assets/sample_mpd_segment_template rename to testdata/src/test/assets/mpd/sample_mpd_segment_template diff --git a/library/dash/src/test/assets/sample_mpd_unknown_mime_type b/testdata/src/test/assets/mpd/sample_mpd_unknown_mime_type similarity index 100% rename from library/dash/src/test/assets/sample_mpd_unknown_mime_type rename to testdata/src/test/assets/mpd/sample_mpd_unknown_mime_type