Skip to content

Commit

Permalink
feat(logging): use full names in logging methods #382
Browse files Browse the repository at this point in the history
  • Loading branch information
@ValentinPostindustria
ValentinPostindustria committed Mar 23, 2022
1 parent e89f9e5 commit 9723674
Show file tree
Hide file tree
Showing 135 changed files with 599 additions and 704 deletions.
26 changes: 7 additions & 19 deletions Example/PrebidDemoJava/src/androidTest/java/org/prebid/mobile/app/AdManagerComplexTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,46 +20,34 @@
import android.os.Bundle;
import android.view.View;
import android.widget.FrameLayout;

import androidx.annotation.NonNull;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;

import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdSize;
import com.google.android.gms.ads.LoadAdError;
import com.google.android.gms.ads.admanager.AdManagerAdRequest;
import com.google.android.gms.ads.admanager.AdManagerAdView;

import okhttp3.HttpUrl;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.prebid.mobile.AdUnit;
import org.prebid.mobile.BannerAdUnit;
import org.prebid.mobile.Host;
import org.prebid.mobile.LogUtil;
import org.prebid.mobile.OnCompleteListener;
import org.prebid.mobile.OnCompleteListener2;
import org.prebid.mobile.PrebidMobile;
import org.prebid.mobile.ResultCode;
import org.prebid.mobile.*;
import org.prebid.mobile.addendum.AdViewUtils;
import org.prebid.mobile.addendum.PbFindSizeError;

import javax.annotation.Nullable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;

import javax.annotation.Nullable;

import okhttp3.HttpUrl;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

Expand Down Expand Up @@ -606,7 +594,7 @@ public void run() {

@Override
public void failure(PbFindSizeError error) {
LogUtil.w("failure:" + error.getDescription());
LogUtil.warning("failure:" + error.getDescription());
update(false);
}
});
Expand All @@ -624,7 +612,7 @@ public void failure(PbFindSizeError error) {

@Override
public void onAdFailedToLoad(@NonNull LoadAdError loadAdError) {
LogUtil.w("onAdFailedToLoad:" + loadAdError);
LogUtil.warning("onAdFailedToLoad:" + loadAdError);

update(false);
}
Expand Down
56 changes: 17 additions & 39 deletions Example/PrebidDemoJava/src/androidTest/java/org/prebid/mobile/app/ExtraTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,19 @@
import android.os.Handler;
import android.os.Looper;
import android.widget.FrameLayout;

import androidx.test.espresso.Espresso;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;
import androidx.test.rule.GrantPermissionRule;

import com.google.android.gms.ads.AdSize;
import com.google.android.gms.ads.admanager.AdManagerAdRequest;
import com.google.android.gms.ads.admanager.AdManagerAdView;
import com.mopub.mobileads.MoPubInterstitial;
import com.mopub.mobileads.MoPubView;

import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.After;
Expand All @@ -39,47 +40,24 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.prebid.mobile.AdUnit;
import org.prebid.mobile.BannerAdUnit;
import org.prebid.mobile.Host;
import org.prebid.mobile.InterstitialAdUnit;
import org.prebid.mobile.LogUtil;
import org.prebid.mobile.OnCompleteListener;
import org.prebid.mobile.PrebidMobile;
import org.prebid.mobile.ResultCode;
import org.prebid.mobile.TargetingParams;
import org.prebid.mobile.*;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.ArrayList;

import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;

import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withParent;
import static androidx.test.espresso.matcher.ViewMatchers.*;
import static androidx.test.espresso.web.assertion.WebViewAssertions.webContent;
import static androidx.test.espresso.web.assertion.WebViewAssertions.webMatches;
import static androidx.test.espresso.web.matcher.DomMatchers.containingTextInBody;
import static androidx.test.espresso.web.model.Atoms.getCurrentUrl;
import static androidx.test.espresso.web.sugar.Web.onWebView;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;

@RunWith(AndroidJUnit4.class)
public class ExtraTests {
Expand Down Expand Up @@ -419,35 +397,35 @@ public void onComplete(ResultCode resultCode) {
if (ResultCode.SUCCESS.equals(resultCode.getValue())) {
onWebView(withParent(withId(1))).check(webContent(containingTextInBody("143135824")));
} else {
LogUtil.e("MultipleAdUnits", "For test 0, actual result code is " + resultCode.getValue());
LogUtil.error("MultipleAdUnits", "For test 0, actual result code is " + resultCode.getValue());
}
ArgumentCaptor<ResultCode> resultCode1 = ArgumentCaptor.forClass(ResultCode.class);
verify(spies.get(1), times(1)).onComplete(resultCode1.capture());
if (ResultCode.SUCCESS.equals(resultCode1.getValue())) {
onWebView(withParent(withId(2))).check(webContent(containingTextInBody("143208584")));
} else {
LogUtil.e("MultipleAdUnits", "For test 1, actual result code is " + resultCode1.getValue());
LogUtil.error("MultipleAdUnits", "For test 1, actual result code is " + resultCode1.getValue());
}
ArgumentCaptor<ResultCode> resultCode2 = ArgumentCaptor.forClass(ResultCode.class);
verify(spies.get(2), times(1)).onComplete(resultCode2.capture());
if (ResultCode.SUCCESS.equals(resultCode2.getValue())) {
onWebView(withParent(withId(3))).check(webContent(containingTextInBody("143208598")));
} else {
LogUtil.e("MultipleAdUnits", "For test 2, actual result code is " + resultCode2.getValue());
LogUtil.error("MultipleAdUnits", "For test 2, actual result code is " + resultCode2.getValue());
}
ArgumentCaptor<ResultCode> resultCode3 = ArgumentCaptor.forClass(ResultCode.class);
verify(spies.get(3), times(1)).onComplete(resultCode3.capture());
if (ResultCode.SUCCESS.equals(resultCode3.getValue())) {
onWebView(withParent(withId(4))).check(webContent(containingTextInBody("143208640")));
} else {
LogUtil.e("MultipleAdUnits", "For test 3, actual result code is " + resultCode3.getValue());
LogUtil.error("MultipleAdUnits", "For test 3, actual result code is " + resultCode3.getValue());
}
ArgumentCaptor<ResultCode> resultCode4 = ArgumentCaptor.forClass(ResultCode.class);
verify(spies.get(4), times(1)).onComplete(resultCode4.capture());
if (ResultCode.SUCCESS.equals(resultCode4.getValue())) {
onWebView(withParent(withId(5))).check(webContent(containingTextInBody("ucTag.renderAd")));
} else {
LogUtil.e("MultipleAdUnits", "For test 4, actual result code is " + resultCode4.getValue());
LogUtil.error("MultipleAdUnits", "For test 4, actual result code is " + resultCode4.getValue());
}
ArgumentCaptor<ResultCode> resultCode5 = ArgumentCaptor.forClass(ResultCode.class);
verify(spies.get(5), times(1)).onComplete(resultCode5.capture());
Expand All @@ -458,7 +436,7 @@ public void onComplete(ResultCode resultCode) {
onWebView().check(webContent(containingTextInBody("ucTag.renderAd")));
Espresso.pressBack();
} else {
LogUtil.e("MultipleAdUnits", "For test 5, actual result code is " + resultCode5.getValue());
LogUtil.error("MultipleAdUnits", "For test 5, actual result code is " + resultCode5.getValue());
}
ArgumentCaptor<ResultCode> resultCode6 = ArgumentCaptor.forClass(ResultCode.class);
verify(spies.get(6), times(1)).onComplete(resultCode6.capture());
Expand All @@ -469,7 +447,7 @@ public void onComplete(ResultCode resultCode) {
onWebView().check(webContent(containingTextInBody("143393807")));
Espresso.pressBack();
} else {
LogUtil.e("MultipleAdUnits", "For test 6, actual result code is " + resultCode6.getValue());
LogUtil.error("MultipleAdUnits", "For test 6, actual result code is " + resultCode6.getValue());
}
ArgumentCaptor<ResultCode> resultCode7 = ArgumentCaptor.forClass(ResultCode.class);
verify(spies.get(7), times(1)).onComplete(resultCode7.capture());
Expand All @@ -480,7 +458,7 @@ public void onComplete(ResultCode resultCode) {
onWebView().check(webContent(containingTextInBody("143393864")));
Espresso.pressBack();
} else {
LogUtil.e("MultipleAdUnits", "For test 7, actual result code is " + resultCode7.getValue());
LogUtil.error("MultipleAdUnits", "For test 7, actual result code is " + resultCode7.getValue());
}
}

Expand Down
15 changes: 2 additions & 13 deletions ...idDemoJava/src/main/java/org/prebid/mobile/app/RubiconRewardedVideoMoPubDemoActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package org.prebid.mobile.app;

import android.os.Bundle;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;

import com.mopub.common.MediationSettings;
import com.mopub.common.MoPub;
import com.mopub.common.MoPubReward;
Expand All @@ -14,17 +12,8 @@
import com.mopub.mobileads.MoPubRewardedVideoListener;
import com.mopub.mobileads.MoPubRewardedVideoManager;
import com.mopub.mobileads.MoPubRewardedVideos;

import org.prebid.mobile.AdUnit;
import org.prebid.mobile.Host;
import org.prebid.mobile.LogUtil;
import org.prebid.mobile.OnCompleteListener;
import org.prebid.mobile.PrebidMobile;
import org.prebid.mobile.ResultCode;
import org.prebid.mobile.RewardedVideoAdUnit;
import org.prebid.mobile.Signals;
import org.prebid.mobile.Util;
import org.prebid.mobile.VideoBaseAdUnit;
import org.prebid.mobile.*;

import java.util.Arrays;
import java.util.HashMap;
Expand Down Expand Up @@ -89,7 +78,7 @@ public void onRewardedVideoLoadSuccess(@NonNull String adUnitId) {

@Override
public void onRewardedVideoLoadFailure(@NonNull String adUnitId, @NonNull MoPubErrorCode errorCode) {
LogUtil.d("onRewardedVideoLoadFailure:" + errorCode);
LogUtil.debug("onRewardedVideoLoadFailure:" + errorCode);
}

@Override
Expand Down
32 changes: 6 additions & 26 deletions ...e/PrebidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInAppGAMDemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@

import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;

import android.widget.*;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;

import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdLoader;
import com.google.android.gms.ads.AdSize;
Expand All @@ -20,22 +14,8 @@
import com.google.android.gms.ads.formats.NativeCustomTemplateAd;
import com.google.android.gms.ads.formats.OnAdManagerAdViewLoadedListener;
import com.google.android.gms.ads.formats.UnifiedNativeAd;

import org.prebid.mobile.AdUnit;
import org.prebid.mobile.Host;
import org.prebid.mobile.LogUtil;
import org.prebid.mobile.NativeAdUnit;
import org.prebid.mobile.NativeDataAsset;
import org.prebid.mobile.NativeEventTracker;
import org.prebid.mobile.NativeImageAsset;
import org.prebid.mobile.NativeTitleAsset;
import org.prebid.mobile.OnCompleteListener;
import org.prebid.mobile.PrebidMobile;
import org.prebid.mobile.PrebidNativeAd;
import org.prebid.mobile.PrebidNativeAdEventListener;
import org.prebid.mobile.PrebidNativeAdListener;
import org.prebid.mobile.ResultCode;
import org.prebid.mobile.Util;
import org.prebid.mobile.*;
import org.prebid.mobile.addendum.AdViewUtils;

import java.util.ArrayList;
Expand Down Expand Up @@ -219,15 +199,15 @@ public void onAdManagerAdViewLoaded(AdManagerAdView adManagerAdView) {
.forUnifiedNativeAd(new UnifiedNativeAd.OnUnifiedNativeAdLoadedListener() {
@Override
public void onUnifiedNativeAdLoaded(UnifiedNativeAd unifiedNativeAd) {
LogUtil.d("Prebid", "native loaded");
LogUtil.debug("Prebid", "native loaded");
XandrNativeInAppGAMDemoActivity.this.unifiedNativeAd = unifiedNativeAd;
}
})
.forCustomTemplateAd("11963183", new NativeCustomTemplateAd.OnCustomTemplateAdLoadedListener() {

@Override
public void onCustomTemplateAdLoaded(NativeCustomTemplateAd nativeCustomTemplateAd) {
LogUtil.d("Prebid", "custom ad loaded");
LogUtil.debug("Prebid", "custom ad loaded");
AdViewUtils.findNative(nativeCustomTemplateAd, new PrebidNativeAdListener() {
@Override
public void onPrebidNativeLoaded(PrebidNativeAd ad) {
Expand All @@ -236,13 +216,13 @@ public void onPrebidNativeLoaded(PrebidNativeAd ad) {

@Override
public void onPrebidNativeNotFound() {
LogUtil.d("Prebid", "onPrebidNativeNotFound");
LogUtil.debug("Prebid", "onPrebidNativeNotFound");
// inflate nativeCustomTemplateAd
}

@Override
public void onPrebidNativeNotValid() {
LogUtil.d("Prebid", "onPrebidNativeNotFound");
LogUtil.debug("Prebid", "onPrebidNativeNotFound");
// show your own content
}
});
Expand Down
17 changes: 2 additions & 15 deletions ...rebidDemoJava/src/main/java/org/prebid/mobile/app/XandrNativeInBannerGamDemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,13 @@

import android.os.Bundle;
import android.widget.FrameLayout;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;

import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdSize;
import com.google.android.gms.ads.admanager.AdManagerAdRequest;
import com.google.android.gms.ads.admanager.AdManagerAdView;

import org.prebid.mobile.AdUnit;
import org.prebid.mobile.Host;
import org.prebid.mobile.LogUtil;
import org.prebid.mobile.NativeAdUnit;
import org.prebid.mobile.NativeDataAsset;
import org.prebid.mobile.NativeEventTracker;
import org.prebid.mobile.NativeImageAsset;
import org.prebid.mobile.NativeTitleAsset;
import org.prebid.mobile.OnCompleteListener;
import org.prebid.mobile.PrebidMobile;
import org.prebid.mobile.ResultCode;
import org.prebid.mobile.*;

import java.util.ArrayList;

Expand Down Expand Up @@ -51,7 +38,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
@Override
public void onAdLoaded() {
super.onAdLoaded();
LogUtil.d("ad loaded");
LogUtil.debug("ad loaded");
}
});
nativeAdView.setAdUnitId(Constants.DFP_IN_BANNER_NATIVE_ADUNIT_ID_APPNEXUS);
Expand Down
Loading

0 comments on commit 9723674

Please sign in to comment.