Skip to content

Commit d9ec9f1

Browse files
committed
fix review10: fix test device w/o user agent
1 parent 8ca1d7b commit d9ec9f1

File tree

2 files changed

+37
-11
lines changed

2 files changed

+37
-11
lines changed

extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/util/TestBidRequestProvider.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ public static Device givenDevice(UnaryOperator<Device.DeviceBuilder> deviceCusto
7474
return deviceCustomizer.apply(Device.builder().ua(userAgent).ip("151.101.194.216")).build();
7575
}
7676

77+
public static Device givenDeviceWithoutUserAgent(UnaryOperator<Device.DeviceBuilder> deviceCustomizer) {
78+
return deviceCustomizer.apply(Device.builder().ip("151.101.194.216")).build();
79+
}
80+
7781
public static Banner givenBanner() {
7882
final Format format = Format.builder()
7983
.w(320)

extra/modules/greenbids-real-time-data/src/test/java/org/prebid/server/hooks/modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenBanner;
6767
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenBidRequest;
6868
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenDevice;
69+
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenDeviceWithoutUserAgent;
6970
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenImpExt;
7071
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenSite;
7172

@@ -181,6 +182,13 @@ public void callShouldNotFilterBiddersAndReturnAnalyticsTagWhenExploration() thr
181182
final InvocationResult<AuctionRequestPayload> result = future.result();
182183

183184
// then
185+
final ActivityImpl activity = (ActivityImpl) result.analyticsTags().activities().getFirst();
186+
final ResultImpl resultImpl = (ResultImpl) activity.results().getFirst();
187+
final String fingerprint = resultImpl.values()
188+
.get("adunitcodevalue")
189+
.get("greenbids")
190+
.get("fingerprint").asText();
191+
184192
assertThat(future).isNotNull();
185193
assertThat(future.succeeded()).isTrue();
186194
assertThat(result).isNotNull();
@@ -194,6 +202,7 @@ public void callShouldNotFilterBiddersAndReturnAnalyticsTagWhenExploration() thr
194202
+ ".adunitcodevalue._children"
195203
+ ".greenbids._children.fingerprint")
196204
.isEqualTo(toAnalyticsTags(List.of(expectedAnalyticsResult)));
205+
assertThat(fingerprint).isNotNull();
197206
}
198207

199208
@Test
@@ -208,8 +217,9 @@ public void callShouldFilterBiddersBasedOnModelWhenAnyFeatureNotAvailable() thro
208217
.build();
209218

210219
final Double explorationRate = 0.0001;
220+
final Device device = givenDeviceWithoutUserAgent(identity());
211221
final ExtRequest extRequest = givenExtRequest(explorationRate);
212-
final BidRequest bidRequest = givenBidRequest(request -> request, List.of(imp), null, extRequest);
222+
final BidRequest bidRequest = givenBidRequest(request -> request, List.of(imp), device, extRequest);
213223
final AuctionContext auctionContext = givenAuctionContext(bidRequest, context -> context);
214224
final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(auctionContext);
215225
when(invocationContext.auctionContext()).thenReturn(auctionContext);
@@ -218,8 +228,7 @@ public void callShouldFilterBiddersBasedOnModelWhenAnyFeatureNotAvailable() thro
218228
when(thresholdsCacheWithExpiration.getIfPresent("throttlingThresholds_test-pbuid"))
219229
.thenReturn(givenThrottlingThresholds());
220230

221-
final BidRequest expectedBidRequest = expectedUpdatedBidRequest(
222-
request -> request, explorationRate);
231+
final BidRequest expectedBidRequest = expectedUpdatedBidRequest(request -> request, explorationRate, device);
223232
final AnalyticsResult expectedAnalyticsResult = expectedAnalyticsResult(false, false);
224233

225234
// when
@@ -232,6 +241,13 @@ public void callShouldFilterBiddersBasedOnModelWhenAnyFeatureNotAvailable() thro
232241
.bidRequest();
233242

234243
// then
244+
final ActivityImpl activity = (ActivityImpl) result.analyticsTags().activities().getFirst();
245+
final ResultImpl resultImpl = (ResultImpl) activity.results().getFirst();
246+
final String fingerprint = resultImpl.values()
247+
.get("adunitcodevalue")
248+
.get("greenbids")
249+
.get("fingerprint").asText();
250+
235251
assertThat(future).isNotNull();
236252
assertThat(future.succeeded()).isTrue();
237253
assertThat(result).isNotNull();
@@ -245,10 +261,8 @@ public void callShouldFilterBiddersBasedOnModelWhenAnyFeatureNotAvailable() thro
245261
+ ".adunitcodevalue._children"
246262
+ ".greenbids._children.fingerprint")
247263
.isEqualTo(toAnalyticsTags(List.of(expectedAnalyticsResult)));
248-
assertThat(resultBidRequest).usingRecursiveComparison()
249-
.ignoringFields("imp.ext._children.tid", "device")
250-
.isEqualTo(expectedBidRequest);
251-
assertThat(resultBidRequest.getDevice()).isNull();
264+
assertThat(fingerprint).isNotNull();
265+
assertThat(resultBidRequest).usingRecursiveComparison().isEqualTo(expectedBidRequest);
252266
}
253267

254268
@Test
@@ -275,7 +289,7 @@ public void callShouldFilterBiddersBasedOnModelResults() throws OrtException, IO
275289
.thenReturn(givenThrottlingThresholds());
276290

277291
final BidRequest expectedBidRequest = expectedUpdatedBidRequest(
278-
request -> request, explorationRate);
292+
request -> request, explorationRate, device);
279293
final AnalyticsResult expectedAnalyticsResult = expectedAnalyticsResult(false, false);
280294

281295
// when
@@ -288,6 +302,13 @@ public void callShouldFilterBiddersBasedOnModelResults() throws OrtException, IO
288302
.bidRequest();
289303

290304
// then
305+
final ActivityImpl activityImpl = (ActivityImpl) result.analyticsTags().activities().getFirst();
306+
final ResultImpl resultImpl = (ResultImpl) activityImpl.results().getFirst();
307+
final String fingerprint = resultImpl.values()
308+
.get("adunitcodevalue")
309+
.get("greenbids")
310+
.get("fingerprint").asText();
311+
291312
assertThat(future).isNotNull();
292313
assertThat(future.succeeded()).isTrue();
293314
assertThat(result).isNotNull();
@@ -301,8 +322,8 @@ public void callShouldFilterBiddersBasedOnModelResults() throws OrtException, IO
301322
+ ".adunitcodevalue._children"
302323
+ ".greenbids._children.fingerprint")
303324
.isEqualTo(toAnalyticsTags(List.of(expectedAnalyticsResult)));
325+
assertThat(fingerprint).isNotNull();
304326
assertThat(resultBidRequest).usingRecursiveComparison()
305-
.ignoringFields("imp.ext._children.tid")
306327
.isEqualTo(expectedBidRequest);
307328
}
308329

@@ -354,7 +375,8 @@ private ThrottlingThresholds givenThrottlingThresholds() throws IOException {
354375

355376
private BidRequest expectedUpdatedBidRequest(
356377
UnaryOperator<BidRequest.BidRequestBuilder> bidRequestCustomizer,
357-
Double explorationRate) {
378+
Double explorationRate,
379+
Device device) {
358380

359381
final Banner banner = givenBanner();
360382

@@ -376,7 +398,7 @@ private BidRequest expectedUpdatedBidRequest(
376398
.id("request")
377399
.imp(List.of(imp))
378400
.site(givenSite(site -> site))
379-
.device(givenDevice(device -> device))
401+
.device(device)
380402
.ext(givenExtRequest(explorationRate))).build();
381403
}
382404

0 commit comments

Comments
 (0)