From 99a3cc2877facaa358a8fd69c0d92657cdb6a25e Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Mon, 4 May 2020 14:06:44 +0100 Subject: [PATCH] Add test ads response with two midrolls Also clean up naming of test ads responses. PiperOrigin-RevId: 309728625 --- .../exoplayer2/ext/ima/ImaPlaybackTest.java | 23 +++++-- .../ad-responses/midroll1s_midroll7s.xml | 64 +++++++++++++++++++ ...oll.xml => preroll_midroll6s_postroll.xml} | 0 3 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 testdata/src/test/assets/ad-responses/midroll1s_midroll7s.xml rename testdata/src/test/assets/ad-responses/{midroll.xml => preroll_midroll6s_postroll.xml} (100%) diff --git a/extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java b/extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java index ed9130bc72..6e0084a374 100644 --- a/extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java +++ b/extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java @@ -64,8 +64,6 @@ public final class ImaPlaybackTest { private static final String CONTENT_URI = "https://storage.googleapis.com/exoplayer-test-media-1/mp4/android-screens-10s.mp4"; - private static final String PREROLL_ADS_RESPONSE_FILE_NAME = "ad-responses/preroll.xml"; - private static final String MIDROLL_ADS_RESPONSE_FILE_NAME = "ad-responses/midroll.xml"; private static final AdId CONTENT = new AdId(C.INDEX_UNSET, C.INDEX_UNSET); @@ -73,9 +71,9 @@ public final class ImaPlaybackTest { @Test public void playbackWithPrerollAdTag_playsAdAndContent() throws Exception { - AdId[] expectedAdIds = new AdId[] {ad(0), CONTENT}; String adsResponse = - TestUtil.getString(/* context= */ testRule.getActivity(), PREROLL_ADS_RESPONSE_FILE_NAME); + TestUtil.getString(/* context= */ testRule.getActivity(), "ad-responses/preroll.xml"); + AdId[] expectedAdIds = new AdId[] {ad(0), CONTENT}; ImaHostedTest hostedTest = new ImaHostedTest(Uri.parse(CONTENT_URI), adsResponse, expectedAdIds); @@ -84,9 +82,22 @@ public final class ImaPlaybackTest { @Test public void playbackWithMidrolls_playsAdAndContent() throws Exception { - AdId[] expectedAdIds = new AdId[] {ad(0), CONTENT, ad(1), CONTENT, ad(2), CONTENT}; String adsResponse = - TestUtil.getString(/* context= */ testRule.getActivity(), MIDROLL_ADS_RESPONSE_FILE_NAME); + TestUtil.getString( + /* context= */ testRule.getActivity(), "ad-responses/preroll_midroll6s_postroll.xml"); + AdId[] expectedAdIds = new AdId[] {ad(0), CONTENT, ad(1), CONTENT, ad(2), CONTENT}; + ImaHostedTest hostedTest = + new ImaHostedTest(Uri.parse(CONTENT_URI), adsResponse, expectedAdIds); + + testRule.getActivity().runTest(hostedTest, TIMEOUT_MS); + } + + @Test + public void playbackWithMidrolls1And7_playsAdsAndContent() throws Exception { + String adsResponse = + TestUtil.getString( + /* context= */ testRule.getActivity(), "ad-responses/midroll1s_midroll7s.xml"); + AdId[] expectedAdIds = new AdId[] {CONTENT, ad(0), CONTENT, ad(1), CONTENT}; ImaHostedTest hostedTest = new ImaHostedTest(Uri.parse(CONTENT_URI), adsResponse, expectedAdIds); diff --git a/testdata/src/test/assets/ad-responses/midroll1s_midroll7s.xml b/testdata/src/test/assets/ad-responses/midroll1s_midroll7s.xml new file mode 100644 index 0000000000..7b693747fc --- /dev/null +++ b/testdata/src/test/assets/ad-responses/midroll1s_midroll7s.xml @@ -0,0 +1,64 @@ + + + + + + + + GDFP + Midroll + + + + + + + 00:00:05 + + + + + + + + + + + + + + + + + + + + + GDFP + Midroll + + + + + + + 00:00:05 + + + + + + + + + + + + + + + diff --git a/testdata/src/test/assets/ad-responses/midroll.xml b/testdata/src/test/assets/ad-responses/preroll_midroll6s_postroll.xml similarity index 100% rename from testdata/src/test/assets/ad-responses/midroll.xml rename to testdata/src/test/assets/ad-responses/preroll_midroll6s_postroll.xml