From 5a1ebc85b5d26657a00aa3ea4d1d1095b8821def Mon Sep 17 00:00:00 2001 From: Valentin Petrovych Date: Thu, 24 Mar 2022 17:34:46 +0200 Subject: [PATCH] feat: make ad format as array #393 --- .../mobile/admob/PrebidBannerAdapter.java | 2 +- .../main/java/org/prebid/mobile/AdUnit.java | 2 +- .../display/InterstitialController.java | 2 +- .../display/MediationBannerAdUnit.java | 2 +- .../display/MediationInterstitialAdUnit.java | 6 +-- .../display/MediationRewardedVideoAdUnit.java | 2 +- .../bidding/parallel/BannerView.java | 4 +- .../bidding/parallel/InterstitialAdUnit.java | 2 +- .../bidding/parallel/RewardedAdUnit.java | 2 +- .../rendering/loading/CreativeFactory.java | 42 ++++++++----------- .../models/CreativeModelMakerBids.java | 2 +- .../models/CreativeModelsMakerVast.java | 2 +- .../mobile/rendering/models/HTMLCreative.java | 15 ++++--- .../mobile/rendering/views/AdViewManager.java | 4 +- .../configuration/AdUnitConfiguration.java | 15 +++---- .../prebid/mobile/AdUnitSuccessorTest.java | 13 +++--- .../org/prebid/mobile/JsonUserDataTest.java | 2 +- .../org/prebid/mobile/NativeAdUnitTest.java | 3 +- .../bidding/display/DisplayViewTest.java | 2 +- .../display/MediationBannerAdUnitTest.java | 4 +- .../MediationInterstitialAdUnitTest.java | 6 ++- .../MediationRewardedVideoAdUnitTest.java | 4 +- .../bidding/parallel/BannerViewTest.java | 2 +- .../loading/CreativeFactoryTest.java | 4 +- .../models/CreativeModelMakerBidsTest.java | 4 +- .../rendering/models/HTMLCreativeTest.java | 17 ++++---- .../parameters/BasicParameterBuilderTest.java | 22 +++++----- .../mopub/mobileads/PrebidBannerAdapter.java | 2 +- 28 files changed, 99 insertions(+), 90 deletions(-) diff --git a/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/PrebidBannerAdapter.java b/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/PrebidBannerAdapter.java index 551cde710..82a6fc1d5 100644 --- a/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/PrebidBannerAdapter.java +++ b/PrebidMobile/PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/PrebidBannerAdapter.java @@ -68,7 +68,7 @@ public void requestBannerAd( } AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); DisplayViewListener listener = getListener(adMobListener); adView = new DisplayView( context, diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java index d4b4e9740..26fd4547b 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/AdUnit.java @@ -50,7 +50,7 @@ public abstract class AdUnit { AdUnit(@NonNull String configId, @NonNull AdFormat adType) { configuration.setConfigId(configId); - configuration.setAdUnitIdentifierType(adType); + configuration.setAdFormat(adType); } /** diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialController.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialController.java index 8e440825f..0d8463d98 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialController.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/InterstitialController.java @@ -99,7 +99,7 @@ public void loadAd(AdUnitConfiguration adUnitConfiguration, BidResponse bidRespo mAdUnitIdentifierType = bidResponse.isVideo() ? AdFormat.VAST : AdFormat.INTERSTITIAL; - adUnitConfiguration.setAdUnitIdentifierType(mAdUnitIdentifierType); + adUnitConfiguration.setAdFormat(mAdUnitIdentifierType); mBidInterstitialView.loadAd(adUnitConfiguration, bidResponse); }); } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationBannerAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationBannerAdUnit.java index 66f476ddd..36f3b65df 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationBannerAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationBannerAdUnit.java @@ -42,7 +42,7 @@ public MediationBannerAdUnit(Context context, String configId, AdSize size, Preb protected final void initAdConfig(String configId, AdSize adSize) { mAdUnitConfig.addSize(adSize); mAdUnitConfig.setConfigId(configId); - mAdUnitConfig.setAdUnitIdentifierType(AdFormat.BANNER); + mAdUnitConfig.setAdFormat(AdFormat.BANNER); } @Override diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationInterstitialAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationInterstitialAdUnit.java index 86f57cb3b..cfe61a1d3 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationInterstitialAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationInterstitialAdUnit.java @@ -56,17 +56,17 @@ public final void fetchDemand( protected final void initAdConfig(String configId, AdSize minSizePercentage) { mAdUnitConfig.setMinSizePercentage(minSizePercentage); mAdUnitConfig.setConfigId(configId); - mAdUnitConfig.setAdUnitIdentifierType(AdFormat.INTERSTITIAL); + mAdUnitConfig.setAdFormat(AdFormat.INTERSTITIAL); mAdUnitConfig.setAdPosition(AdPosition.FULLSCREEN); } private void setAdUnitType(AdUnitFormat adUnitFormat) { switch (adUnitFormat) { case DISPLAY: - mAdUnitConfig.setAdUnitIdentifierType(AdFormat.INTERSTITIAL); + mAdUnitConfig.setAdFormat(AdFormat.INTERSTITIAL); break; case VIDEO: - mAdUnitConfig.setAdUnitIdentifierType(AdFormat.VAST); + mAdUnitConfig.setAdFormat(AdFormat.VAST); break; } } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationRewardedVideoAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationRewardedVideoAdUnit.java index fdb87ab83..fc5985ac6 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationRewardedVideoAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/display/MediationRewardedVideoAdUnit.java @@ -41,7 +41,7 @@ public void fetchDemand(@NonNull OnFetchCompleteListener listener) { @Override protected final void initAdConfig(String configId, AdSize adSize) { mAdUnitConfig.setConfigId(configId); - mAdUnitConfig.setAdUnitIdentifierType(AdFormat.VAST); + mAdUnitConfig.setAdFormat(AdFormat.VAST); mAdUnitConfig.setRewarded(true); mAdUnitConfig.setAdPosition(AdPosition.FULLSCREEN); } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BannerView.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BannerView.java index 16acf662c..13a779231 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BannerView.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/BannerView.java @@ -302,7 +302,7 @@ public void setBannerListener(BannerViewListener bannerListener) { } public void setVideoPlacementType(VideoPlacementType videoPlacement) { - mAdUnitConfig.setAdUnitIdentifierType(AdFormat.VAST); + mAdUnitConfig.setAdFormat(AdFormat.VAST); final PlacementType placementType = VideoPlacementType.mapToPlacementType(videoPlacement); mAdUnitConfig.setPlacementType(placementType); @@ -438,7 +438,7 @@ private void initAdConfiguration() { mAdUnitConfig.setConfigId(mConfigId); mAdUnitConfig.setAutoRefreshDelay(mRefreshIntervalSec); mEventHandler.setBannerEventListener(mBannerEventListener); - mAdUnitConfig.setAdUnitIdentifierType(AdFormat.BANNER); + mAdUnitConfig.setAdFormat(AdFormat.BANNER); mAdUnitConfig.addSizes(mEventHandler.getAdSizeArray()); } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnit.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnit.java index 4d54f521d..7f702f097 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnit.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/bidding/parallel/InterstitialAdUnit.java @@ -134,7 +134,7 @@ private InterstitialAdUnit(Context context, String configId, AdUnitConfiguration adUnitConfiguration = new AdUnitConfiguration(); adUnitConfiguration.setConfigId(configId); adUnitConfiguration.setMinSizePercentage(minSizePercentage); - adUnitConfiguration.setAdUnitIdentifierType(mapPrebidAdUnitTypeToAdConfigAdUnitType(adUnitFormat)); + adUnitConfiguration.setAdFormat(mapPrebidAdUnitTypeToAdConfigAdUnitType(adUnitFormat)); init(adUnitConfiguration); } 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 7218dab36..1bd3b5101 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 @@ -106,7 +106,7 @@ public RewardedAdUnit(Context context, String configId, RewardedEventHandler eve AdUnitConfiguration adUnitConfiguration = new AdUnitConfiguration(); adUnitConfiguration.setConfigId(configId); - adUnitConfiguration.setAdUnitIdentifierType(AdFormat.VAST); + adUnitConfiguration.setAdFormat(AdFormat.VAST); adUnitConfiguration.setRewarded(true); init(adUnitConfiguration); diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/loading/CreativeFactory.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/loading/CreativeFactory.java index aa7c77139..eb2c34a0c 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/loading/CreativeFactory.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/loading/CreativeFactory.java @@ -37,6 +37,7 @@ import org.prebid.mobile.rendering.video.vast.VASTErrorCodes; import org.prebid.mobile.rendering.views.interstitial.InterstitialManager; import org.prebid.mobile.units.configuration.AdFormat; +import org.prebid.mobile.units.configuration.AdUnitConfiguration; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -63,7 +64,7 @@ public CreativeFactory(Context context, Listener listener, OmAdSessionManager omAdSessionManager, InterstitialManager interstitialManager) - throws AdException { + throws AdException { if (context == null) { throw new AdException(AdException.INTERNAL_ERROR, "Context is null"); } @@ -85,25 +86,19 @@ public CreativeFactory(Context context, public void start() { try { - AdFormat adUnitIdentifierType = mCreativeModel.getAdConfiguration().getAdUnitIdentifierType(); - switch (adUnitIdentifierType) { - case BANNER: - case INTERSTITIAL: - attemptAuidCreative(); - break; - case VAST: - attemptVastCreative(); - break; - default: - String msg = "Unable to start creativeFactory. adConfig.adUnitIdentifierType doesn't match supported types" - + "adConfig.adUnitIdentifierType: " + adUnitIdentifierType; - LogUtil.error(TAG, msg); - AdException adException = new AdException(AdException.INTERNAL_ERROR, msg); - mListener.onFailure(adException); - break; + AdUnitConfiguration configuration = mCreativeModel.getAdConfiguration(); + + if (configuration.isAdType(AdFormat.BANNER) || configuration.isAdType(AdFormat.INTERSTITIAL)) { + attemptAuidCreative(); + } else if (configuration.isAdType(AdFormat.VAST)) { + attemptVastCreative(); + } else { + String msg = "Unable to start creativeFactory. adConfig.adUnitIdentifierType doesn't match supported types adConfig.adFormat: " + configuration.getAdFormats(); + LogUtil.error(TAG, msg); + AdException adException = new AdException(AdException.INTERNAL_ERROR, msg); + mListener.onFailure(adException); } - } - catch (Exception exception) { + } catch (Exception exception) { String message = "Creative Factory failed: " + exception.getMessage(); LogUtil.error(TAG, message + Log.getStackTraceString(exception)); AdException adException = new AdException(AdException.INTERNAL_ERROR, message); @@ -142,8 +137,7 @@ private void attemptAuidCreative() throws Exception { rcUrls.add(mCreativeModel.getClickUrl()); mCreativeModel.registerTrackingEvent(TrackingEvent.Events.CLICK, rcUrls); } - } - else { + } else { mListener.onFailure(new AdException(AdException.INTERNAL_ERROR, "Tracking info not found")); } markWorkStart(BANNER_TIMEOUT); @@ -167,8 +161,7 @@ private void attemptVastCreative() { try { if (mCreativeModel.getAdConfiguration().isRewarded()) { newCreative = new RewardedVideoCreative(mContextReference.get(), videoCreativeModel, mOmAdSessionManager, mInterstitialManager); - } - else { + } else { newCreative = new VideoCreative(mContextReference.get(), videoCreativeModel, mOmAdSessionManager, mInterstitialManager); } @@ -176,8 +169,7 @@ private void attemptVastCreative() { mCreative = newCreative; markWorkStart(VAST_TIMEOUT); newCreative.load(); - } - catch (Exception exception) { + } catch (Exception exception) { LogUtil.error(TAG, "VideoCreative creation failed: " + Log.getStackTraceString(exception)); mListener.onFailure(new AdException(AdException.INTERNAL_ERROR, "VideoCreative creation failed: " + exception.getMessage())); } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/CreativeModelMakerBids.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/CreativeModelMakerBids.java index 4a1ad5835..89c166365 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/CreativeModelMakerBids.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/CreativeModelMakerBids.java @@ -73,7 +73,7 @@ public void makeModels(AdUnitConfiguration adConfiguration, BidResponse bidRespo public void makeVideoModels(AdUnitConfiguration adConfiguration, String vast) { mAdConfiguration = adConfiguration; - mAdConfiguration.setAdUnitIdentifierType(AdFormat.VAST); + mAdConfiguration.setAdFormat(AdFormat.VAST); mParserExtractor.extract(vast); } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/CreativeModelsMakerVast.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/CreativeModelsMakerVast.java index 75bdcd1bf..ef94e5dae 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/CreativeModelsMakerVast.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/CreativeModelsMakerVast.java @@ -200,7 +200,7 @@ private void makeModelsContinued() { endCardModel.setWidth(Integer.parseInt(companionAd.getWidth())); endCardModel.setHeight(Integer.parseInt(companionAd.getHeight())); endCardModel.setAdConfiguration(new AdUnitConfiguration()); - endCardModel.getAdConfiguration().setAdUnitIdentifierType(AdFormat.INTERSTITIAL); + endCardModel.getAdConfiguration().setAdFormat(AdFormat.INTERSTITIAL); endCardModel.setRequireImpressionUrl(false); result.creativeModels.add(endCardModel); diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/HTMLCreative.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/HTMLCreative.java index a3287b265..f32b0b9d6 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/HTMLCreative.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/models/HTMLCreative.java @@ -42,6 +42,8 @@ import org.prebid.mobile.units.configuration.AdFormat; import org.prebid.mobile.units.configuration.AdUnitConfiguration; +import java.util.ArrayList; + public class HTMLCreative extends AbstractCreative implements WebViewDelegate, InterstitialManagerDisplayDelegate, Comparable { @@ -77,15 +79,18 @@ public void load() throws AdException { throw new AdException(AdException.INTERNAL_ERROR, "Context is null. Could not load adHtml"); } CreativeModel model = getCreativeModel(); - AdFormat adType = model.getAdConfiguration().getAdUnitIdentifierType(); + + ArrayList adFormats = model.getAdConfiguration().getAdFormats(); + if (adFormats.isEmpty()) { + throw new AdException(AdException.INTERNAL_ERROR, "Can't create a WebView for a null adtype"); + } + + AdFormat adType = adFormats.get(0); + if (model.getAdConfiguration().isBuiltInVideo()) { adType = AdFormat.BANNER; } - if (adType == null) { - throw new AdException(AdException.INTERNAL_ERROR, "Can't create a WebView for a null adtype"); - } - //create a webview here PrebidWebViewBase prebidWebView = null; if (adType == AdFormat.BANNER) { //do all banner diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/views/AdViewManager.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/views/AdViewManager.java index e982d4e33..e57fe6d2d 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/views/AdViewManager.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/rendering/views/AdViewManager.java @@ -211,7 +211,7 @@ public AdUnitConfiguration getAdConfiguration() { } public boolean isAutoDisplayOnLoad() { - return mAdConfiguration.getAdUnitIdentifierType() == AdFormat.BANNER; + return mAdConfiguration.isAdType(AdFormat.BANNER); } public void destroy() { @@ -388,7 +388,7 @@ private void handleCreativeDisplay() { return; } - if (mAdConfiguration.getAdUnitIdentifierType() == AdFormat.BANNER) { + if (mAdConfiguration.isAdType(AdFormat.BANNER)) { if (!mCurrentCreative.equals(mLastCreativeShown)) { displayCreative(creativeView); } diff --git a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java index 9d05e9571..b1f0e92e2 100644 --- a/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java +++ b/PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/units/configuration/AdUnitConfiguration.java @@ -29,7 +29,7 @@ public class AdUnitConfiguration { private String pbAdSlot; private String interstitialSize; - private AdFormat adFormat; + private ArrayList adFormats = new ArrayList<>(); private AdSize minSizePercentage; private PlacementType placementType; private AdPosition adPosition; @@ -217,20 +217,21 @@ public int getVideoSkipOffset() { return videoSkipOffset; } - public void setAdUnitIdentifierType(@Nullable AdFormat adFormat) { + public void setAdFormat(@Nullable AdFormat adFormat) { if (adFormat == AdFormat.NATIVE) { nativeConfiguration = new NativeAdUnitConfiguration(); } - this.adFormat = adFormat; + adFormats.clear(); + adFormats.add(adFormat); } - @Nullable - public AdFormat getAdUnitIdentifierType() { - return adFormat; + @NonNull + public ArrayList getAdFormats() { + return adFormats; } public boolean isAdType(AdFormat type) { - return adFormat == type; + return adFormats.contains(type); } public void setRewarded(boolean rewarded) { 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 95b8548f7..ee9c61db5 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,6 +31,7 @@ import org.robolectric.annotation.Config; import java.util.Arrays; +import java.util.Collections; import java.util.List; import static junit.framework.Assert.assertEquals; @@ -72,7 +73,7 @@ public void testBannerAdUnitCreation() { assertEquals(1, configuration.getSizes().size()); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(AdFormat.BANNER, configuration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.BANNER), configuration.getAdFormats()); assertEquals(0, adUnit.configuration.getAutoRefreshDelay()); adUnit.setAutoRefreshInterval(30); @@ -112,7 +113,7 @@ public void testInterstitialAdUnitCreation() throws Exception { InterstitialAdUnit adUnit = new InterstitialAdUnit(testConfigId); AdUnitConfiguration configuration = adUnit.getConfiguration(); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(AdFormat.INTERSTITIAL, configuration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.INTERSTITIAL), configuration.getAdFormats()); } @@ -121,7 +122,7 @@ public void testAdvancedInterstitialAdUnitCreation() { InterstitialAdUnit adUnit = new InterstitialAdUnit(testConfigId, height, 70); AdUnitConfiguration configuration = (AdUnitConfiguration) adUnit.getConfiguration(); - assertEquals(AdFormat.INTERSTITIAL, configuration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.INTERSTITIAL), configuration.getAdFormats()); assertEquals(testConfigId, configuration.getConfigId()); assertEquals(height, configuration.getMinSizePercentage().getWidth()); assertEquals(70, configuration.getMinSizePercentage().getHeight()); @@ -136,7 +137,7 @@ public void testVideoAdUnitCreation() { assertEquals(width, size.getWidth()); assertEquals(height, size.getHeight()); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(AdFormat.VAST, configuration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.VAST), configuration.getAdFormats()); } @Test @@ -145,7 +146,7 @@ public void testVideoInterstitialAdUnitCreation() { AdUnitConfiguration configuration = (AdUnitConfiguration) adUnit.getConfiguration(); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(AdFormat.VAST, configuration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.VAST), configuration.getAdFormats()); } @Test @@ -153,7 +154,7 @@ public void testRewardedVideoAdUnitCreation() { RewardedVideoAdUnit adUnit = new RewardedVideoAdUnit(testConfigId); AdUnitConfiguration configuration = adUnit.getConfiguration(); assertEquals(testConfigId, configuration.getConfigId()); - assertEquals(AdFormat.VAST, configuration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.VAST), configuration.getAdFormats()); } @Test diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/JsonUserDataTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/JsonUserDataTest.java index ac95a058d..95c622044 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/JsonUserDataTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/JsonUserDataTest.java @@ -28,7 +28,7 @@ public void putUsersDataListToRequestParams_addElementsToOutsideList_elementsAdd AdUnitConfiguration configuration = new AdUnitConfiguration(); configuration.setConfigId("configId"); - configuration.setAdUnitIdentifierType(AdFormat.BANNER); + configuration.setAdFormat(AdFormat.BANNER); for (DataObject data : userDataObjects) { configuration.addUserData(data); } 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 cf02f4cd1..fc9a2a9af 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,6 +12,7 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; +import java.util.Collections; import static junit.framework.Assert.*; @@ -32,7 +33,7 @@ public void testNativeAdUnitCreation() throws Exception { assertNotNull(nativeUnit); assertEquals(PBS_CONFIG_ID_NATIVE_APPNEXUS, configuration.getConfigId()); - assertEquals(AdFormat.NATIVE, configuration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.NATIVE), configuration.getAdFormats()); assertNotNull(configuration.getNativeConfiguration()); } diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/DisplayViewTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/DisplayViewTest.java index 95664aa0b..3c9c18047 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/DisplayViewTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/display/DisplayViewTest.java @@ -63,7 +63,7 @@ public void setup() throws Exception { mContext = Robolectric.buildActivity(Activity.class).create().get(); mAdUnitConfiguration = new AdUnitConfiguration(); - mAdUnitConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + mAdUnitConfiguration.setAdFormat(AdFormat.BANNER); BidResponse mockResponse = mock(BidResponse.class); Bid mockBid = mock(Bid.class); 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 fec7173d9..bc32b83d5 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,6 +37,8 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; +import java.util.Collections; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; @@ -75,7 +77,7 @@ public void whenInitAdConfig_PrepareAdConfigForBanner() { mMediationBannerAdUnit.initAdConfig("config", adSize); AdUnitConfiguration adConfiguration = mMediationBannerAdUnit.mAdUnitConfig; assertEquals("config", adConfiguration.getConfigId()); - assertEquals(AdFormat.BANNER, adConfiguration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(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 2d91986de..11799b634 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,6 +32,8 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; +import java.util.Collections; + import static org.junit.Assert.assertEquals; @RunWith(RobolectricTestRunner.class) @@ -59,13 +61,13 @@ public void whenInitAdConfig_PrepareAdConfigForInterstitial() { mMediationInterstitialAdUnit.initAdConfig("config", adSize); AdUnitConfiguration adConfiguration = mMediationInterstitialAdUnit.mAdUnitConfig; assertEquals("config", adConfiguration.getConfigId()); - assertEquals(AdFormat.INTERSTITIAL, adConfiguration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.INTERSTITIAL), adConfiguration.getAdFormats()); assertEquals(adSize, adConfiguration.getMinSizePercentage()); } @Test public void whenConstructorAndAdUnitFormatVideo_AdUnitIdentifierTypeVideo() { mMediationInterstitialAdUnit = new MediationInterstitialAdUnit(mContext, "config", AdUnitFormat.VIDEO, new MockMediationUtils()); - assertEquals(AdFormat.VAST, mMediationInterstitialAdUnit.mAdUnitConfig.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(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 1c55ba8c0..2b9cd45bb 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,6 +32,8 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; +import java.util.Collections; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -61,7 +63,7 @@ public void whenInitAdConfig_PrepareAdConfigForInterstitial() { mMopubRewardedAdUnit.initAdConfig("config", null); AdUnitConfiguration adConfiguration = mMopubRewardedAdUnit.mAdUnitConfig; assertEquals("config", adConfiguration.getConfigId()); - assertEquals(AdFormat.VAST, adConfiguration.getAdUnitIdentifierType()); + assertEquals(Collections.singletonList(AdFormat.VAST), adConfiguration.getAdFormats()); assertTrue(adConfiguration.isRewarded()); } diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BannerViewTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BannerViewTest.java index f32b2eea7..9ac9e646c 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BannerViewTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/bidding/parallel/BannerViewTest.java @@ -192,7 +192,7 @@ public void setVideoPlacementType_AdUnitIdentifierTypeIsVASTAndVideoPlacementIsU mBannerView.setVideoPlacementType(videoPlacement); verify(mockAdConfiguration, times(1)).setPlacementType(eq(VideoPlacementType.mapToPlacementType(videoPlacement))); - verify(mockAdConfiguration, times(1)).setAdUnitIdentifierType(eq(AdFormat.VAST)); + verify(mockAdConfiguration, times(1)).setAdFormat(eq(AdFormat.VAST)); } @Test diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/loading/CreativeFactoryTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/loading/CreativeFactoryTest.java index fc1e3aeaa..5195c0630 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/loading/CreativeFactoryTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/loading/CreativeFactoryTest.java @@ -107,7 +107,7 @@ public void testCreativeFactory() throws Exception { @Test public void testAttemptAuidCreative() throws Exception { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); Handler mockHandler = mock(Handler.class); when(mMockModel.getAdConfiguration()).thenReturn(adConfiguration); when(mMockModel.getName()).thenReturn(HTML_CREATIVE_TAG); @@ -130,7 +130,7 @@ public void testAttemptVastCreative() throws Exception { VideoCreativeModel mockVideoModel = mock(VideoCreativeModel.class); AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); Handler mockHandler = mock(Handler.class); - adConfiguration.setAdUnitIdentifierType(AdFormat.VAST); + adConfiguration.setAdFormat(AdFormat.VAST); HashMap> videoEventsUrls = new HashMap<>(); videoEventsUrls.put(VideoAdEvent.Event.AD_EXPAND, new ArrayList<>(Arrays.asList("AD_EXPAND"))); diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/models/CreativeModelMakerBidsTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/models/CreativeModelMakerBidsTest.java index d894faf48..4e8a9b9e8 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/models/CreativeModelMakerBidsTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/models/CreativeModelMakerBidsTest.java @@ -83,7 +83,7 @@ public void whenMakeModelsAndBidResponseWithError_CallErrorListener() { @Test public void whenMakeModelsAndBidRequestContainsAcjAd_CreateAcjModel() throws IOException { AdUnitConfiguration configuration = new AdUnitConfiguration(); - configuration.setAdUnitIdentifierType(AdFormat.BANNER); + configuration.setAdFormat(AdFormat.BANNER); String responseString = ResourceUtils.convertResourceToString("bidding_response_obj.json"); BidResponse bidResponse = new BidResponse(responseString); @@ -108,7 +108,7 @@ public void makeVideoModels_ExecuteVastParserExtractor() { mModelMakerBids.makeVideoModels(mockConfig, vast); - verify(mockConfig).setAdUnitIdentifierType(eq(AdFormat.VAST)); + verify(mockConfig).setAdFormat(eq(AdFormat.VAST)); verify(mMockExtractor).extract(eq(vast)); } 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 ac6520cfd..68cc6efa3 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,6 +50,7 @@ import org.robolectric.annotation.Config; import java.lang.ref.WeakReference; +import java.util.ArrayList; import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -140,22 +141,22 @@ public void loadTest() throws Exception { try { mHtmlCreative.load(); fail("AdException was NOT thrown"); - } - catch (AdException e) { + } catch (AdException e) { } + ArrayList result = new ArrayList<>(); + result.add(AdFormat.BANNER); // Test empty html try { - when(mMockConfig.getAdUnitIdentifierType()).thenReturn(AdFormat.BANNER); + when(mMockConfig.getAdFormats()).thenReturn(result); mHtmlCreative = new HTMLCreative(mContext, mMockModel, mMockOmAdSessionManager, mMockInterstitialManager); mHtmlCreative.load(); fail("AdException was NOT thrown"); - } - catch (AdException e) { + } catch (AdException e) { } // Test non-empty html - when(mMockConfig.getAdUnitIdentifierType()).thenReturn(AdFormat.BANNER); + when(mMockConfig.getAdFormats()).thenReturn(result); when(mMockModel.getHtml()).thenReturn("foo"); mHtmlCreative = new HTMLCreative(mContext, mMockModel, mMockOmAdSessionManager, mMockInterstitialManager); @@ -171,7 +172,9 @@ public void displayTest() throws Exception { WhiteBox.setInternalState(prebidWebViewBase, "mWebView", mock(WebViewBase.class)); when(mMockPrebidWebView.getWebView()).thenReturn(mock(WebViewBase.class)); - when(mMockConfig.getAdUnitIdentifierType()).thenReturn(AdFormat.BANNER); + ArrayList result = new ArrayList<>(); + result.add(AdFormat.BANNER); + when(mMockConfig.getAdFormats()).thenReturn(result); mHtmlCreative.display(); verify(mMockModel, never()).trackDisplayAdEvent(TrackingEvent.Events.IMPRESSION); diff --git a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/networking/parameters/BasicParameterBuilderTest.java b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/networking/parameters/BasicParameterBuilderTest.java index ca940cb16..ab278f52e 100644 --- a/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/networking/parameters/BasicParameterBuilderTest.java +++ b/PrebidMobile/PrebidMobile-core/src/test/java/org/prebid/mobile/rendering/networking/parameters/BasicParameterBuilderTest.java @@ -102,7 +102,7 @@ public void cleanup() throws Exception { @Test public void whenAppendParametersAndBannerType_ImpWithValidBannerObject() throws JSONException { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); adConfiguration.addSize(new AdSize(320, 50)); adConfiguration.setPbAdSlot("12345"); PrebidMobile.addStoredBidResponse("bidderTest", "123456"); @@ -128,7 +128,7 @@ public void whenAppendParametersAndBannerType_ImpWithValidBannerObject() throws public void whenAppendParametersAndBInterstitialType_ImpWithValidBannerObject() throws JSONException { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.INTERSTITIAL); + adConfiguration.setAdFormat(AdFormat.INTERSTITIAL); adConfiguration.setAdPosition(AdPosition.FULLSCREEN); BasicParameterBuilder builder = new BasicParameterBuilder(adConfiguration, mContext.getResources(), mBrowserActivityAvailable); @@ -152,7 +152,7 @@ public void whenAppendParametersAndBInterstitialType_ImpWithValidBannerObject() public void whenAppendParametersAndVastWithoutPlacementType_ImpWithValidVideoObject() throws JSONException { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.VAST); + adConfiguration.setAdFormat(AdFormat.VAST); adConfiguration.setAdPosition(AdPosition.FULLSCREEN); BasicParameterBuilder builder = new BasicParameterBuilder(adConfiguration, mContext.getResources(), mBrowserActivityAvailable); @@ -177,7 +177,7 @@ public void whenAppendParametersAndVastWithoutPlacementType_ImpWithValidVideoObj public void whenAppendParametersAndVastWithPlacementType_ImpWithValidVideoObject() throws JSONException { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.VAST); + adConfiguration.setAdFormat(AdFormat.VAST); adConfiguration.setPlacementType(PlacementType.IN_BANNER); adConfiguration.setAdPosition(AdPosition.FULLSCREEN); adConfiguration.addSize(new AdSize(300, 250)); @@ -203,7 +203,7 @@ public void whenAppendParametersAndVastWithPlacementType_ImpWithValidVideoObject @Test public void whenAppendParametersAndCoppaTrue_CoppaEqualsOne() { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); adConfiguration.addSize(new AdSize(320, 50)); PrebidMobile.isCoppaEnabled = true; @@ -219,7 +219,7 @@ public void whenAppendParametersAndCoppaTrue_CoppaEqualsOne() { @Test public void whenAppendParametersAndCoppaFalse_CoppaNull() { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); adConfiguration.addSize(new AdSize(320, 50)); BasicParameterBuilder builder = new BasicParameterBuilder(adConfiguration, mContext.getResources(), mBrowserActivityAvailable); @@ -234,7 +234,7 @@ public void whenAppendParametersAndCoppaFalse_CoppaNull() { public void whenAppendParametersAndTargetingParamsWereSet_TargetingParamsWereAppend() throws JSONException { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); adConfiguration.addSize(new AdSize(320, 50)); TargetingParams.setUserId(USER_ID); @@ -258,7 +258,7 @@ public void whenAppendParametersAndTargetingParamsWereSet_TargetingParamsWereApp @Test public void whenAppendParametersAndSendMraidSupportParamsFalse_NoMraidApi() { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); adConfiguration.addSize(new AdSize(320, 50)); PrebidMobile.sendMraidSupportParams = false; @@ -274,7 +274,7 @@ public void whenAppendParametersAndSendMraidSupportParamsFalse_NoMraidApi() { @Test public void whenAppendParametersAndUseExternalBrowserFalseAndBrowserActivityAvailable_ClickBrowserEqualsZero() { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); adConfiguration.addSize(new AdSize(320, 50)); PrebidMobile.useExternalBrowser = false; @@ -290,7 +290,7 @@ public void whenAppendParametersAndUseExternalBrowserFalseAndBrowserActivityAvai @Test public void whenAppendParametersAndUseExternalBrowserTrueAndBrowserActivityAvailable_ClickBrowserEqualsOne() { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); adConfiguration.addSize(new AdSize(320, 50)); PrebidMobile.useExternalBrowser = true; @@ -306,7 +306,7 @@ public void whenAppendParametersAndUseExternalBrowserTrueAndBrowserActivityAvail @Test public void whenAppendParametersAndUseExternalBrowserFalseAndBrowserActivityNotAvailable_ClickBrowserEqualsOne() { AdUnitConfiguration adConfiguration = new AdUnitConfiguration(); - adConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adConfiguration.setAdFormat(AdFormat.BANNER); adConfiguration.addSize(new AdSize(320, 50)); PrebidMobile.useExternalBrowser = false; diff --git a/PrebidMobile/PrebidMobile-mopubAdapters/src/main/java/com/mopub/mobileads/PrebidBannerAdapter.java b/PrebidMobile/PrebidMobile-mopubAdapters/src/main/java/com/mopub/mobileads/PrebidBannerAdapter.java index 758402016..2ff930e62 100644 --- a/PrebidMobile/PrebidMobile-mopubAdapters/src/main/java/com/mopub/mobileads/PrebidBannerAdapter.java +++ b/PrebidMobile/PrebidMobile-mopubAdapters/src/main/java/com/mopub/mobileads/PrebidBannerAdapter.java @@ -121,7 +121,7 @@ protected void onInvalidate() { private void initDisplayView(Context context, String responseId) { try { AdUnitConfiguration adUnitConfiguration = new AdUnitConfiguration(); - adUnitConfiguration.setAdUnitIdentifierType(AdFormat.BANNER); + adUnitConfiguration.setAdFormat(AdFormat.BANNER); mDisplayView = new DisplayView(context, mDisplayViewListener, adUnitConfiguration, responseId); } catch (AdException e) {