Add test to ensure AdsLoader is initialized.
This tests explicitly that initialization happens even if the Timeline is a placeholder. No other change is needed. While the Timeline is still a placeholder ImaAdsLoader.getCurrentPeriodPosition will return 0 and trigger pre-rolls (intended behaviour) and it doesn't matter whether the actual initial period position may be somewhere else. PiperOrigin-RevId: 298833867
This commit is contained in:
parent
2b88961bc1
commit
8b9f7c5628
@ -16,6 +16,7 @@
|
|||||||
package com.google.android.exoplayer2.ext.ima;
|
package com.google.android.exoplayer2.ext.ima;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.Mockito.atLeastOnce;
|
import static org.mockito.Mockito.atLeastOnce;
|
||||||
import static org.mockito.Mockito.inOrder;
|
import static org.mockito.Mockito.inOrder;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
@ -40,6 +41,8 @@ import com.google.android.exoplayer2.ExoPlaybackException;
|
|||||||
import com.google.android.exoplayer2.Player;
|
import com.google.android.exoplayer2.Player;
|
||||||
import com.google.android.exoplayer2.Timeline;
|
import com.google.android.exoplayer2.Timeline;
|
||||||
import com.google.android.exoplayer2.Timeline.Period;
|
import com.google.android.exoplayer2.Timeline.Period;
|
||||||
|
import com.google.android.exoplayer2.ext.ima.ImaAdsLoader.ImaFactory;
|
||||||
|
import com.google.android.exoplayer2.source.MaskingMediaSource.DummyTimeline;
|
||||||
import com.google.android.exoplayer2.source.ads.AdPlaybackState;
|
import com.google.android.exoplayer2.source.ads.AdPlaybackState;
|
||||||
import com.google.android.exoplayer2.source.ads.AdsLoader;
|
import com.google.android.exoplayer2.source.ads.AdsLoader;
|
||||||
import com.google.android.exoplayer2.source.ads.AdsMediaSource.AdLoadException;
|
import com.google.android.exoplayer2.source.ads.AdsMediaSource.AdLoadException;
|
||||||
@ -77,11 +80,11 @@ public class ImaAdsLoaderTest {
|
|||||||
private static final FakeAd UNSKIPPABLE_AD =
|
private static final FakeAd UNSKIPPABLE_AD =
|
||||||
new FakeAd(/* skippable= */ false, /* podIndex= */ 0, /* totalAds= */ 1, /* adPosition= */ 1);
|
new FakeAd(/* skippable= */ false, /* podIndex= */ 0, /* totalAds= */ 1, /* adPosition= */ 1);
|
||||||
|
|
||||||
private @Mock ImaSdkSettings imaSdkSettings;
|
@Mock private ImaSdkSettings imaSdkSettings;
|
||||||
private @Mock AdsRenderingSettings adsRenderingSettings;
|
@Mock private AdsRenderingSettings adsRenderingSettings;
|
||||||
private @Mock AdDisplayContainer adDisplayContainer;
|
@Mock private AdDisplayContainer adDisplayContainer;
|
||||||
private @Mock AdsManager adsManager;
|
@Mock private AdsManager adsManager;
|
||||||
private SingletonImaFactory testImaFactory;
|
@Mock private ImaFactory mockImaFactory;
|
||||||
private ViewGroup adViewGroup;
|
private ViewGroup adViewGroup;
|
||||||
private View adOverlayView;
|
private View adOverlayView;
|
||||||
private AdsLoader.AdViewProvider adViewProvider;
|
private AdsLoader.AdViewProvider adViewProvider;
|
||||||
@ -94,13 +97,11 @@ public class ImaAdsLoaderTest {
|
|||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
FakeAdsRequest fakeAdsRequest = new FakeAdsRequest();
|
FakeAdsRequest fakeAdsRequest = new FakeAdsRequest();
|
||||||
FakeAdsLoader fakeAdsLoader = new FakeAdsLoader(imaSdkSettings, adsManager);
|
FakeAdsLoader fakeAdsLoader = new FakeAdsLoader(imaSdkSettings, adsManager);
|
||||||
testImaFactory =
|
when(mockImaFactory.createAdDisplayContainer()).thenReturn(adDisplayContainer);
|
||||||
new SingletonImaFactory(
|
when(mockImaFactory.createAdsRenderingSettings()).thenReturn(adsRenderingSettings);
|
||||||
imaSdkSettings,
|
when(mockImaFactory.createAdsRequest()).thenReturn(fakeAdsRequest);
|
||||||
adsRenderingSettings,
|
when(mockImaFactory.createImaSdkSettings()).thenReturn(imaSdkSettings);
|
||||||
adDisplayContainer,
|
when(mockImaFactory.createAdsLoader(any(), any(), any())).thenReturn(fakeAdsLoader);
|
||||||
fakeAdsRequest,
|
|
||||||
fakeAdsLoader);
|
|
||||||
adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
|
adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
|
||||||
adOverlayView = new View(ApplicationProvider.getApplicationContext());
|
adOverlayView = new View(ApplicationProvider.getApplicationContext());
|
||||||
adViewProvider =
|
adViewProvider =
|
||||||
@ -141,6 +142,16 @@ public class ImaAdsLoaderTest {
|
|||||||
verify(adDisplayContainer, atLeastOnce()).registerVideoControlsOverlay(adOverlayView);
|
verify(adDisplayContainer, atLeastOnce()).registerVideoControlsOverlay(adOverlayView);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testStart_withPlaceholderContent_initializedAdsLoader() {
|
||||||
|
Timeline placeholderTimeline = new DummyTimeline(/* tag= */ null);
|
||||||
|
setupPlayback(placeholderTimeline, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
|
||||||
|
imaAdsLoader.start(adsLoaderListener, adViewProvider);
|
||||||
|
|
||||||
|
// We'll only create the rendering settings when initializing the ads loader.
|
||||||
|
verify(mockImaFactory).createAdsRenderingSettings();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testStart_updatesAdPlaybackState() {
|
public void testStart_updatesAdPlaybackState() {
|
||||||
setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
|
setupPlayback(CONTENT_TIMELINE, PREROLL_ADS_DURATIONS_US, PREROLL_CUE_POINTS_SECONDS);
|
||||||
@ -245,7 +256,7 @@ public class ImaAdsLoaderTest {
|
|||||||
when(adsManager.getAdCuePoints()).thenReturn(Arrays.asList(cuePoints));
|
when(adsManager.getAdCuePoints()).thenReturn(Arrays.asList(cuePoints));
|
||||||
imaAdsLoader =
|
imaAdsLoader =
|
||||||
new ImaAdsLoader.Builder(ApplicationProvider.getApplicationContext())
|
new ImaAdsLoader.Builder(ApplicationProvider.getApplicationContext())
|
||||||
.setImaFactory(testImaFactory)
|
.setImaFactory(mockImaFactory)
|
||||||
.setImaSdkSettings(imaSdkSettings)
|
.setImaSdkSettings(imaSdkSettings)
|
||||||
.buildForAdTag(TEST_URI);
|
.buildForAdTag(TEST_URI);
|
||||||
imaAdsLoader.setPlayer(fakeExoPlayer);
|
imaAdsLoader.setPlayer(fakeExoPlayer);
|
||||||
|
@ -1,72 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2018 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.google.android.exoplayer2.ext.ima;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
|
|
||||||
import com.google.ads.interactivemedia.v3.api.AdsLoader;
|
|
||||||
import com.google.ads.interactivemedia.v3.api.AdsRenderingSettings;
|
|
||||||
import com.google.ads.interactivemedia.v3.api.AdsRequest;
|
|
||||||
import com.google.ads.interactivemedia.v3.api.ImaSdkSettings;
|
|
||||||
|
|
||||||
/** {@link ImaAdsLoader.ImaFactory} that returns provided instances from each getter, for tests. */
|
|
||||||
final class SingletonImaFactory implements ImaAdsLoader.ImaFactory {
|
|
||||||
|
|
||||||
private final ImaSdkSettings imaSdkSettings;
|
|
||||||
private final AdsRenderingSettings adsRenderingSettings;
|
|
||||||
private final AdDisplayContainer adDisplayContainer;
|
|
||||||
private final AdsRequest adsRequest;
|
|
||||||
private final com.google.ads.interactivemedia.v3.api.AdsLoader adsLoader;
|
|
||||||
|
|
||||||
public SingletonImaFactory(
|
|
||||||
ImaSdkSettings imaSdkSettings,
|
|
||||||
AdsRenderingSettings adsRenderingSettings,
|
|
||||||
AdDisplayContainer adDisplayContainer,
|
|
||||||
AdsRequest adsRequest,
|
|
||||||
com.google.ads.interactivemedia.v3.api.AdsLoader adsLoader) {
|
|
||||||
this.imaSdkSettings = imaSdkSettings;
|
|
||||||
this.adsRenderingSettings = adsRenderingSettings;
|
|
||||||
this.adDisplayContainer = adDisplayContainer;
|
|
||||||
this.adsRequest = adsRequest;
|
|
||||||
this.adsLoader = adsLoader;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ImaSdkSettings createImaSdkSettings() {
|
|
||||||
return imaSdkSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AdsRenderingSettings createAdsRenderingSettings() {
|
|
||||||
return adsRenderingSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AdDisplayContainer createAdDisplayContainer() {
|
|
||||||
return adDisplayContainer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AdsRequest createAdsRequest() {
|
|
||||||
return adsRequest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AdsLoader createAdsLoader(
|
|
||||||
Context context, ImaSdkSettings imaSdkSettings, AdDisplayContainer adDisplayContainer) {
|
|
||||||
return adsLoader;
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user