From c724ef802153563f5e3121c8d10983edd703dbd7 Mon Sep 17 00:00:00 2001 From: Valentin Petrovych Date: Mon, 28 Mar 2022 17:56:59 +0300 Subject: [PATCH] feat(multi-format): fix tests #393 Remove m prefix for Interstitial classes. --- .../parallel/BaseInterstitialAdUnit.java | 64 +++++++++---------- .../bidding/parallel/RewardedAdUnit.java | 60 +++++++++-------- .../prebid/mobile/AdUnitSuccessorTest.java | 14 ++-- .../org/prebid/mobile/NativeAdUnitTest.java | 4 +- .../display/MediationBannerAdUnitTest.java | 4 +- .../MediationInterstitialAdUnitTest.java | 13 ++-- .../MediationRewardedVideoAdUnitTest.java | 4 +- .../parallel/BaseInterstitialAdUnitTest.java | 3 +- .../parallel/InterstitialAdUnitTest.java | 33 ++++++---- .../bidding/parallel/RewardedAdUnitTest.java | 22 +++---- .../rendering/models/HTMLCreativeTest.java | 13 +--- 11 files changed, 122 insertions(+), 112 deletions(-) diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnit.java index 08ae4f3f9..3905dea4b 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnit.java @@ -44,17 +44,17 @@ public abstract class BaseInterstitialAdUnit { protected AdUnitConfiguration configuration; - private BidLoader mBidLoader; - private BidResponse mBidResponse; - private InterstitialController mInterstitialController; - private InterstitialAdUnitState mInterstitialAdUnitState = READY_FOR_LOAD; + private BidLoader bidLoader; + private BidResponse bidResponse; + private InterstitialController interstitialController; + private InterstitialAdUnitState interstitialAdUnitState = READY_FOR_LOAD; - private final WeakReference mWeakContext; - private final BidRequesterListener mBidRequesterListener = createBidRequesterListener(); - private final InterstitialControllerListener mControllerListener = createInterstitialControllerListener(); + private final WeakReference weakContext; + private final BidRequesterListener bidRequesterListener = createBidRequesterListener(); + private final InterstitialControllerListener controllerListener = createInterstitialControllerListener(); protected BaseInterstitialAdUnit(Context context) { - mWeakContext = new WeakReference<>(context); + weakContext = new WeakReference<>(context); } @@ -71,17 +71,17 @@ protected BaseInterstitialAdUnit(Context context) { * Executes ad loading if no request is running. */ public void loadAd() { - if (mBidLoader == null) { + if (bidLoader == null) { LogUtil.error(TAG, "loadAd: Failed. BidLoader is not initialized."); return; } if (!isAdLoadAllowed()) { - LogUtil.debug(TAG, "loadAd: Skipped. InterstitialAdUnitState is: " + mInterstitialAdUnitState); + LogUtil.debug(TAG, "loadAd: Skipped. InterstitialAdUnitState is: " + interstitialAdUnitState); return; } - mBidLoader.load(); + bidLoader.load(); } /** @@ -100,16 +100,16 @@ public void show() { return; } - switch (mInterstitialAdUnitState) { + switch (interstitialAdUnitState) { case READY_TO_DISPLAY_GAM: showGamAd(); break; case READY_TO_DISPLAY_PREBID: - mInterstitialController.show(); + interstitialController.show(); break; default: notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, - "show(): Encountered an invalid mInterstitialAdUnitState - " + mInterstitialAdUnitState + "show(): Encountered an invalid mInterstitialAdUnitState - " + interstitialAdUnitState )); } } @@ -174,11 +174,11 @@ public void setPbAdSlot(String adSlot) { * Cleans up resources when destroyed. */ public void destroy() { - if (mBidLoader != null) { - mBidLoader.destroy(); + if (bidLoader != null) { + bidLoader.destroy(); } - if (mInterstitialController != null) { - mInterstitialController.destroy(); + if (interstitialController != null) { + interstitialController.destroy(); } } @@ -192,27 +192,27 @@ protected void init(AdUnitConfiguration adUnitConfiguration) { } protected void loadPrebidAd() { - if (mInterstitialController == null) { + if (interstitialController == null) { notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "InterstitialController is not defined. Unable to process bid." )); return; } - mInterstitialController.loadAd(configuration, mBidResponse); + interstitialController.loadAd(configuration, bidResponse); } @Nullable protected Context getContext() { - return mWeakContext.get(); + return weakContext.get(); } protected boolean isBidInvalid() { - return mBidResponse == null || mBidResponse.getWinningBid() == null; + return bidResponse == null || bidResponse.getWinningBid() == null; } protected void changeInterstitialAdUnitState(InterstitialAdUnitState state) { - mInterstitialAdUnitState = state; + interstitialAdUnitState = state; } private void initPrebidRenderingSdk() { @@ -220,36 +220,36 @@ private void initPrebidRenderingSdk() { } private void initBidLoader() { - mBidLoader = new BidLoader(getContext(), configuration, mBidRequesterListener); + bidLoader = new BidLoader(getContext(), configuration, bidRequesterListener); } private void initInterstitialController() { try { - mInterstitialController = new InterstitialController(getContext(), mControllerListener); + interstitialController = new InterstitialController(getContext(), controllerListener); } catch (AdException e) { notifyErrorListener(e); } } private Bid getWinnerBid() { - return mBidResponse != null ? mBidResponse.getWinningBid() : null; + return bidResponse != null ? bidResponse.getWinningBid() : null; } public BidResponse getBidResponse() { - return mBidResponse; + return bidResponse; } private boolean isAuctionWinnerReadyToDisplay() { - return mInterstitialAdUnitState == READY_TO_DISPLAY_PREBID || mInterstitialAdUnitState == READY_TO_DISPLAY_GAM; + return interstitialAdUnitState == READY_TO_DISPLAY_PREBID || interstitialAdUnitState == READY_TO_DISPLAY_GAM; } private boolean isAdLoadAllowed() { - return mInterstitialAdUnitState == READY_FOR_LOAD; + return interstitialAdUnitState == READY_FOR_LOAD; } @VisibleForTesting final InterstitialAdUnitState getAdUnitState() { - return mInterstitialAdUnitState; + return interstitialAdUnitState; } public void addContent(ContentObject content) { @@ -261,7 +261,7 @@ private BidRequesterListener createBidRequesterListener() { return new BidRequesterListener() { @Override public void onFetchCompleted(BidResponse response) { - mBidResponse = response; + bidResponse = response; changeInterstitialAdUnitState(LOADING); requestAdWithBid(getWinnerBid()); @@ -269,7 +269,7 @@ public void onFetchCompleted(BidResponse response) { @Override public void onError(AdException exception) { - mBidResponse = null; + bidResponse = null; requestAdWithBid(null); } }; diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnit.java index 1bd3b5101..70bee19dd 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnit.java @@ -34,22 +34,23 @@ public class RewardedAdUnit extends BaseInterstitialAdUnit { private static final String TAG = RewardedAdUnit.class.getSimpleName(); - private final RewardedEventHandler mEventHandler; + private final RewardedEventHandler eventHandler; - @Nullable - private RewardedAdUnitListener mRewardedAdUnitListener; + @Nullable private RewardedAdUnitListener rewardedAdUnitListener; - @Nullable - private Object mUserReward; + @Nullable private Object userReward; //region ==================== Listener implementation - private final RewardedVideoEventListener mEventListener = new RewardedVideoEventListener() { + private final RewardedVideoEventListener eventListener = new RewardedVideoEventListener() { @Override public void onPrebidSdkWin() { if (isBidInvalid()) { changeInterstitialAdUnitState(READY_FOR_LOAD); - notifyErrorListener(new AdException(AdException.INTERNAL_ERROR, "WinnerBid is null when executing onPrebidSdkWin.")); + notifyErrorListener(new AdException( + AdException.INTERNAL_ERROR, + "WinnerBid is null when executing onPrebidSdkWin." + )); return; } @@ -58,7 +59,7 @@ public void onPrebidSdkWin() { @Override public void onAdServerWin(Object userReward) { - mUserReward = userReward; + RewardedAdUnit.this.userReward = userReward; changeInterstitialAdUnitState(READY_TO_DISPLAY_GAM); notifyAdEventListener(AdListenerEvent.AD_LOADED); } @@ -92,8 +93,8 @@ public void onAdDisplayed() { @Override public void onUserEarnedReward() { - if (mRewardedAdUnitListener != null) { - mRewardedAdUnitListener.onUserEarnedReward(RewardedAdUnit.this); + if (rewardedAdUnitListener != null) { + rewardedAdUnitListener.onUserEarnedReward(RewardedAdUnit.this); } } }; @@ -101,8 +102,8 @@ public void onUserEarnedReward() { public RewardedAdUnit(Context context, String configId, RewardedEventHandler eventHandler) { super(context); - mEventHandler = eventHandler; - mEventHandler.setRewardedEventListener(mEventListener); + this.eventHandler = eventHandler; + this.eventHandler.setRewardedEventListener(eventListener); AdUnitConfiguration adUnitConfiguration = new AdUnitConfiguration(); adUnitConfiguration.setConfigId(configId); @@ -119,14 +120,14 @@ public RewardedAdUnit(Context context, String configId) { @Override public void loadAd() { super.loadAd(); - mUserReward = null; + userReward = null; } @Override public void destroy() { super.destroy(); - if (mEventHandler != null) { - mEventHandler.destroy(); + if (eventHandler != null) { + eventHandler.destroy(); } } @@ -134,12 +135,12 @@ public void destroy() { public void setRewardedAdUnitListener( @Nullable RewardedAdUnitListener rewardedAdUnitListener) { - mRewardedAdUnitListener = rewardedAdUnitListener; + this.rewardedAdUnitListener = rewardedAdUnitListener; } @Nullable public Object getUserReward() { - return mUserReward; + return userReward; } //endregion ==================== getters and setters @@ -147,44 +148,47 @@ public Object getUserReward() { void requestAdWithBid( @Nullable Bid bid) { - mEventHandler.requestAdWithBid(bid); + eventHandler.requestAdWithBid(bid); } @Override void showGamAd() { - mEventHandler.show(); + eventHandler.show(); } @Override void notifyAdEventListener(AdListenerEvent adListenerEvent) { - if (mRewardedAdUnitListener == null) { - LogUtil.debug(TAG, "notifyAdEventListener: Failed. AdUnitListener is null. Passed listener event: " + adListenerEvent); + if (rewardedAdUnitListener == null) { + LogUtil.debug( + TAG, + "notifyAdEventListener: Failed. AdUnitListener is null. Passed listener event: " + adListenerEvent + ); return; } switch (adListenerEvent) { case AD_CLOSE: - mRewardedAdUnitListener.onAdClosed(RewardedAdUnit.this); + rewardedAdUnitListener.onAdClosed(RewardedAdUnit.this); break; case AD_LOADED: - mRewardedAdUnitListener.onAdLoaded(RewardedAdUnit.this); + rewardedAdUnitListener.onAdLoaded(RewardedAdUnit.this); break; case AD_DISPLAYED: - mRewardedAdUnitListener.onAdDisplayed(RewardedAdUnit.this); + rewardedAdUnitListener.onAdDisplayed(RewardedAdUnit.this); break; case AD_CLICKED: - mRewardedAdUnitListener.onAdClicked(RewardedAdUnit.this); + rewardedAdUnitListener.onAdClicked(RewardedAdUnit.this); break; case USER_RECEIVED_PREBID_REWARD: - mRewardedAdUnitListener.onUserEarnedReward(RewardedAdUnit.this); + rewardedAdUnitListener.onUserEarnedReward(RewardedAdUnit.this); break; } } @Override void notifyErrorListener(AdException exception) { - if (mRewardedAdUnitListener != null) { - mRewardedAdUnitListener.onAdFailed(RewardedAdUnit.this, exception); + if (rewardedAdUnitListener != null) { + rewardedAdUnitListener.onAdFailed(RewardedAdUnit.this, exception); } } } diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/AdUnitSuccessorTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/AdUnitSuccessorTest.java index ee9c61db5..158448045 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/AdUnitSuccessorTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/AdUnitSuccessorTest.java @@ -31,7 +31,7 @@ import org.robolectric.annotation.Config; import java.util.Arrays; -import java.util.Collections; +import java.util.EnumSet; import java.util.List; import static junit.framework.Assert.assertEquals; @@ -73,7 +73,7 @@ public void testBannerAdUnitCreation() { assertEquals(1, configuration.getSizes().size()); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.BANNER), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.BANNER), configuration.getAdFormats()); assertEquals(0, adUnit.configuration.getAutoRefreshDelay()); adUnit.setAutoRefreshInterval(30); @@ -113,7 +113,7 @@ public void testInterstitialAdUnitCreation() throws Exception { InterstitialAdUnit adUnit = new InterstitialAdUnit(testConfigId); AdUnitConfiguration configuration = adUnit.getConfiguration(); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.INTERSTITIAL), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.INTERSTITIAL), configuration.getAdFormats()); } @@ -122,7 +122,7 @@ public void testAdvancedInterstitialAdUnitCreation() { InterstitialAdUnit adUnit = new InterstitialAdUnit(testConfigId, height, 70); AdUnitConfiguration configuration = (AdUnitConfiguration) adUnit.getConfiguration(); - assertEquals(Collections.singletonList(AdFormat.INTERSTITIAL), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.INTERSTITIAL), configuration.getAdFormats()); assertEquals(testConfigId, configuration.getConfigId()); assertEquals(height, configuration.getMinSizePercentage().getWidth()); assertEquals(70, configuration.getMinSizePercentage().getHeight()); @@ -137,7 +137,7 @@ public void testVideoAdUnitCreation() { assertEquals(width, size.getWidth()); assertEquals(height, size.getHeight()); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.VAST), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.VAST), configuration.getAdFormats()); } @Test @@ -146,7 +146,7 @@ public void testVideoInterstitialAdUnitCreation() { AdUnitConfiguration configuration = (AdUnitConfiguration) adUnit.getConfiguration(); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.VAST), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.VAST), configuration.getAdFormats()); } @Test @@ -154,7 +154,7 @@ public void testRewardedVideoAdUnitCreation() { RewardedVideoAdUnit adUnit = new RewardedVideoAdUnit(testConfigId); AdUnitConfiguration configuration = adUnit.getConfiguration(); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.VAST), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.VAST), configuration.getAdFormats()); } @Test diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/NativeAdUnitTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/NativeAdUnitTest.java index fc9a2a9af..d57cd1dc0 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/NativeAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/NativeAdUnitTest.java @@ -12,7 +12,7 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; -import java.util.Collections; +import java.util.EnumSet; import static junit.framework.Assert.*; @@ -33,7 +33,7 @@ public void testNativeAdUnitCreation() throws Exception { assertNotNull(nativeUnit); assertEquals(PBS_CONFIG_ID_NATIVE_APPNEXUS, configuration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.NATIVE), configuration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.NATIVE), configuration.getAdFormats()); assertNotNull(configuration.getNativeConfiguration()); } diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationBannerAdUnitTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationBannerAdUnitTest.java index bc32b83d5..dfa455b88 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationBannerAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationBannerAdUnitTest.java @@ -37,7 +37,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import java.util.Collections; +import java.util.EnumSet; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -77,7 +77,7 @@ public void whenInitAdConfig_PrepareAdConfigForBanner() { mMediationBannerAdUnit.initAdConfig("config", adSize); AdUnitConfiguration adConfiguration = mMediationBannerAdUnit.mAdUnitConfig; assertEquals("config", adConfiguration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.BANNER), adConfiguration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.BANNER), adConfiguration.getAdFormats()); assertTrue(adConfiguration.getSizes().contains(adSize)); } diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationInterstitialAdUnitTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationInterstitialAdUnitTest.java index 11799b634..9eb350e0a 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationInterstitialAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationInterstitialAdUnitTest.java @@ -32,7 +32,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import java.util.Collections; +import java.util.EnumSet; import static org.junit.Assert.assertEquals; @@ -61,13 +61,18 @@ public void whenInitAdConfig_PrepareAdConfigForInterstitial() { mMediationInterstitialAdUnit.initAdConfig("config", adSize); AdUnitConfiguration adConfiguration = mMediationInterstitialAdUnit.mAdUnitConfig; assertEquals("config", adConfiguration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.INTERSTITIAL), adConfiguration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.INTERSTITIAL), adConfiguration.getAdFormats()); assertEquals(adSize, adConfiguration.getMinSizePercentage()); } @Test public void whenConstructorAndAdUnitFormatVideo_AdUnitIdentifierTypeVideo() { - mMediationInterstitialAdUnit = new MediationInterstitialAdUnit(mContext, "config", AdUnitFormat.VIDEO, new MockMediationUtils()); - assertEquals(Collections.singletonList(AdFormat.VAST), mMediationInterstitialAdUnit.mAdUnitConfig.getAdFormats()); + mMediationInterstitialAdUnit = new MediationInterstitialAdUnit( + mContext, + "config", + EnumSet.of(AdUnitFormat.VIDEO), + new MockMediationUtils() + ); + assertEquals(EnumSet.of(AdFormat.VAST), mMediationInterstitialAdUnit.mAdUnitConfig.getAdFormats()); } } \ No newline at end of file diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationRewardedVideoAdUnitTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationRewardedVideoAdUnitTest.java index 2b9cd45bb..3ada45051 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationRewardedVideoAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/MediationRewardedVideoAdUnitTest.java @@ -32,7 +32,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; -import java.util.Collections; +import java.util.EnumSet; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -63,7 +63,7 @@ public void whenInitAdConfig_PrepareAdConfigForInterstitial() { mMopubRewardedAdUnit.initAdConfig("config", null); AdUnitConfiguration adConfiguration = mMopubRewardedAdUnit.mAdUnitConfig; assertEquals("config", adConfiguration.getConfigId()); - assertEquals(Collections.singletonList(AdFormat.VAST), adConfiguration.getAdFormats()); + assertEquals(EnumSet.of(AdFormat.VAST), adConfiguration.getAdFormats()); assertTrue(adConfiguration.isRewarded()); } diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnitTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnitTest.java index 22c6b3c75..f342a93e5 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BaseInterstitialAdUnitTest.java @@ -179,7 +179,8 @@ public void loadAdWithError_BidResponseIsNull() { private BidRequesterListener getBidRequesterListener() { try { - return (BidRequesterListener) WhiteBox.field(BaseInterstitialAdUnit.class, "mBidRequesterListener").get(mBaseInterstitialAdUnit); + return (BidRequesterListener) WhiteBox.field(BaseInterstitialAdUnit.class, "bidRequesterListener") + .get(mBaseInterstitialAdUnit); } catch (IllegalAccessException e) { e.printStackTrace(); diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnitTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnitTest.java index eb5c8ef89..a6feb2dab 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnitTest.java @@ -41,6 +41,8 @@ import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import java.util.EnumSet; + import static org.junit.Assert.*; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -70,11 +72,12 @@ public void setup() { mContext = Robolectric.buildActivity(Activity.class).create().get(); - mInterstitialAdUnit = new InterstitialAdUnit(mContext, CONFIGURATION_ID, AD_SIZE, mMockInterstitialEventHandler); + mInterstitialAdUnit = new InterstitialAdUnit(mContext, CONFIGURATION_ID, mMockInterstitialEventHandler); + mInterstitialAdUnit.setMinSizePercentage(AD_SIZE); mInterstitialAdUnit.setInterstitialAdUnitListener(mMockInterstitialAdUnitListener); - WhiteBox.setInternalState(mInterstitialAdUnit, "mBidLoader", mMockBidLoader); - WhiteBox.setInternalState(mInterstitialAdUnit, "mInterstitialController", mMockInterstitialController); + WhiteBox.setInternalState(mInterstitialAdUnit, "bidLoader", mMockBidLoader); + WhiteBox.setInternalState(mInterstitialAdUnit, "interstitialController", mMockInterstitialController); final AdUnitConfiguration adUnitConfig = mInterstitialAdUnit.configuration; assertEquals(AdPosition.FULLSCREEN.getValue(), adUnitConfig.getAdPositionValue()); @@ -82,10 +85,14 @@ public void setup() { @Test public void createInterstitialAdUnitNoEventHandler_InstanceCreatedStandaloneEventHandlerProvidedBidLoaderIsNotNull() { - InterstitialAdUnit interstitialAdUnit = new InterstitialAdUnit(mContext, CONFIGURATION_ID, AdUnitFormat.VIDEO); + InterstitialAdUnit interstitialAdUnit = new InterstitialAdUnit( + mContext, + CONFIGURATION_ID, + EnumSet.of(AdUnitFormat.VIDEO) + ); - Object eventHandler = WhiteBox.getInternalState(interstitialAdUnit, "mEventHandler"); - BidLoader bidLoader = ((BidLoader) WhiteBox.getInternalState(interstitialAdUnit, "mBidLoader")); + Object eventHandler = WhiteBox.getInternalState(interstitialAdUnit, "eventHandler"); + BidLoader bidLoader = ((BidLoader) WhiteBox.getInternalState(interstitialAdUnit, "bidLoader")); assertNotNull(interstitialAdUnit); assertTrue(eventHandler instanceof StandaloneInterstitialEventHandler); @@ -94,7 +101,7 @@ public void createInterstitialAdUnitNoEventHandler_InstanceCreatedStandaloneEven @Test public void loadAdWithNullBidLoader_NoExceptionIsThrown() { - WhiteBox.setInternalState(mInterstitialAdUnit, "mBidLoader", null); + WhiteBox.setInternalState(mInterstitialAdUnit, "bidLoader", null); mInterstitialAdUnit.loadAd(); } @@ -147,7 +154,7 @@ public void showWhenAuctionWinnerIsPrebid_ShowPrebid() { changeInterstitialState(READY_TO_DISPLAY_PREBID); - WhiteBox.setInternalState(mInterstitialAdUnit, "mInterstitialController", mockInterstitialController); + WhiteBox.setInternalState(mInterstitialAdUnit, "interstitialController", mockInterstitialController); mInterstitialAdUnit.show(); verify(mockInterstitialController, times(1)).show(); @@ -247,8 +254,8 @@ public void onFailedAndWithWinnerBid_ExecuteInterstitialControllerLoadAd() { final InterstitialEventListener spyEventListener = spy(getEventListener()); when(mockBidResponse.getWinningBid()).thenReturn(mockBid); - WhiteBox.setInternalState(mInterstitialAdUnit, "mBidResponse", mockBidResponse); - WhiteBox.setInternalState(mInterstitialAdUnit, "mInterstitialController", mockInterstitialController); + WhiteBox.setInternalState(mInterstitialAdUnit, "bidResponse", mockBidResponse); + WhiteBox.setInternalState(mInterstitialAdUnit, "interstitialController", mockInterstitialController); spyEventListener.onAdFailed(new AdException(AdException.INTERNAL_ERROR, "Test")); @@ -266,14 +273,14 @@ public void onAdClosed_NotifyAdClosedListener() { //endregion ================= EventListener tests private BidRequesterListener getBidRequesterListener() { - return (BidRequesterListener) WhiteBox.getInternalState(mInterstitialAdUnit, "mBidRequesterListener"); + return (BidRequesterListener) WhiteBox.getInternalState(mInterstitialAdUnit, "bidRequesterListener"); } private InterstitialEventListener getEventListener() { - return (InterstitialEventListener) WhiteBox.getInternalState(mInterstitialAdUnit, "mInterstitialEventListener"); + return (InterstitialEventListener) WhiteBox.getInternalState(mInterstitialAdUnit, "interstitialEventListener"); } private void changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState adUnitState) { - WhiteBox.setInternalState(mInterstitialAdUnit, "mInterstitialAdUnitState", adUnitState); + WhiteBox.setInternalState(mInterstitialAdUnit, "interstitialAdUnitState", adUnitState); } } \ No newline at end of file diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnitTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnitTest.java index 570ca8b0c..a3dfcf613 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnitTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/RewardedAdUnitTest.java @@ -71,8 +71,8 @@ public void setup() { mRewardedAdUnit.setRewardedAdUnitListener(mMockRewardedAdUnitListener); - WhiteBox.setInternalState(mRewardedAdUnit, "mBidLoader", mMockBidLoader); - WhiteBox.setInternalState(mRewardedAdUnit, "mInterstitialController", mMockInterstitialController); + WhiteBox.setInternalState(mRewardedAdUnit, "bidLoader", mMockBidLoader); + WhiteBox.setInternalState(mRewardedAdUnit, "interstitialController", mMockInterstitialController); final AdUnitConfiguration adUnitConfig = mRewardedAdUnit.configuration; assertEquals(AdPosition.FULLSCREEN.getValue(), adUnitConfig.getAdPositionValue()); @@ -82,8 +82,8 @@ public void setup() { public void createRewardedAdUnitNoEventHandler_InstanceCreatedStandaloneEventHandlerProvidedBidLoaderIsNotNull() { RewardedAdUnit rewardedAdUnit = new RewardedAdUnit(mContext, CONFIGURATION_ID); - Object eventHandler = WhiteBox.getInternalState(rewardedAdUnit, "mEventHandler"); - BidLoader bidLoader = ((BidLoader) WhiteBox.getInternalState(rewardedAdUnit, "mBidLoader")); + Object eventHandler = WhiteBox.getInternalState(rewardedAdUnit, "eventHandler"); + BidLoader bidLoader = ((BidLoader) WhiteBox.getInternalState(rewardedAdUnit, "bidLoader")); assertNotNull(rewardedAdUnit); assertTrue(eventHandler instanceof StandaloneRewardedVideoEventHandler); @@ -92,7 +92,7 @@ public void createRewardedAdUnitNoEventHandler_InstanceCreatedStandaloneEventHan @Test public void loadAdWithNullBidLoader_NoExceptionIsThrown() { - WhiteBox.setInternalState(mRewardedAdUnit, "mBidLoader", null); + WhiteBox.setInternalState(mRewardedAdUnit, "bidLoader", null); mRewardedAdUnit.loadAd(); } @@ -145,7 +145,7 @@ public void showWhenAuctionWinnerIsPrebid_ShowPrebid() { changeInterstitialState(READY_TO_DISPLAY_PREBID); - WhiteBox.setInternalState(mRewardedAdUnit, "mInterstitialController", mockInterstitialController); + WhiteBox.setInternalState(mRewardedAdUnit, "interstitialController", mockInterstitialController); mRewardedAdUnit.show(); verify(mockInterstitialController, times(1)).show(); @@ -246,8 +246,8 @@ public void onFailedAndWithWinnerBid_ExecuteInterstitialControllerLoadAd() final RewardedVideoEventListener spyEventListener = spy(getEventListener()); when(mockBidResponse.getWinningBid()).thenReturn(mockBid); - WhiteBox.setInternalState(mRewardedAdUnit, "mBidResponse", mockBidResponse); - WhiteBox.setInternalState(mRewardedAdUnit, "mInterstitialController", mockInterstitialController); + WhiteBox.setInternalState(mRewardedAdUnit, "bidResponse", mockBidResponse); + WhiteBox.setInternalState(mRewardedAdUnit, "interstitialController", mockInterstitialController); spyEventListener.onAdFailed(new AdException(AdException.INTERNAL_ERROR, "Test")); @@ -273,14 +273,14 @@ public void onAdClosed_NotifyAdClosedListener() { //endregion ================= EventListener tests private BidRequesterListener getBidRequesterListener() { - return (BidRequesterListener) WhiteBox.getInternalState(mRewardedAdUnit, "mBidRequesterListener"); + return (BidRequesterListener) WhiteBox.getInternalState(mRewardedAdUnit, "bidRequesterListener"); } private RewardedVideoEventListener getEventListener() { - return (RewardedVideoEventListener) WhiteBox.getInternalState(mRewardedAdUnit, "mEventListener"); + return (RewardedVideoEventListener) WhiteBox.getInternalState(mRewardedAdUnit, "eventListener"); } private void changeInterstitialState(BaseInterstitialAdUnit.InterstitialAdUnitState adUnitState) { - WhiteBox.setInternalState(mRewardedAdUnit, "mInterstitialAdUnitState", adUnitState); + WhiteBox.setInternalState(mRewardedAdUnit, "interstitialAdUnitState", adUnitState); } } \ No newline at end of file diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/models/HTMLCreativeTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/models/HTMLCreativeTest.java index 68cc6efa3..5caf27184 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/models/HTMLCreativeTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/models/HTMLCreativeTest.java @@ -50,7 +50,7 @@ import org.robolectric.annotation.Config; import java.lang.ref.WeakReference; -import java.util.ArrayList; +import java.util.EnumSet; import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -137,14 +137,7 @@ public void loadTest() throws Exception { } mHtmlCreative = new HTMLCreative(mContext, mMockModel, mMockOmAdSessionManager, mMockInterstitialManager); - // Test null adType - try { - mHtmlCreative.load(); - fail("AdException was NOT thrown"); - } catch (AdException e) { - } - - ArrayList result = new ArrayList<>(); + EnumSet result = EnumSet.noneOf(AdFormat.class); result.add(AdFormat.BANNER); // Test empty html try { @@ -172,7 +165,7 @@ public void displayTest() throws Exception { WhiteBox.setInternalState(prebidWebViewBase, "mWebView", mock(WebViewBase.class)); when(mMockPrebidWebView.getWebView()).thenReturn(mock(WebViewBase.class)); - ArrayList result = new ArrayList<>(); + EnumSet result = EnumSet.noneOf(AdFormat.class); result.add(AdFormat.BANNER); when(mMockConfig.getAdFormats()).thenReturn(result);