Unit tests revision - part 2

Author: andreacastello

extra/modules/wurfl-devicedetection/src/test/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/v1/OrtbDeviceUpdaterTest.java

@@ -19,7 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mock.Strictness.LENIENT;
-import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 public class OrtbDeviceUpdaterTest {
@@ -251,7 +250,7 @@ public void updateShouldReturnNullWhenMobileTypeIsUnknown() {
         final BidRequest bidRequest = BidRequest.builder().device(device).build();
         final OrtbDeviceUpdater target = new OrtbDeviceUpdater(wurflDevice, staticCaps, virtualCaps, true, mapper);
         // when
-        when(payload.bidRequest()).thenReturn(bidRequest);
+        given(payload.bidRequest()).willReturn(bidRequest);
         final AuctionRequestPayload result = target.apply(payload);
         // then
         final Device resultDevice = result.bidRequest().getDevice();
@@ -272,7 +271,7 @@ public void updateShouldHandlePersonalComputerDeviceType() {
         given(wurflDevice.getVirtualCapability("form_factor")).willReturn("Desktop");
         final OrtbDeviceUpdater target = new OrtbDeviceUpdater(wurflDevice, staticCaps, virtualCaps, true, mapper);
         // when
-        when(payload.bidRequest()).thenReturn(bidRequest);
+        given(payload.bidRequest()).willReturn(bidRequest);
         final AuctionRequestPayload result = target.apply(payload);
 
         // then

extra/modules/wurfl-devicedetection/src/test/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/v1/WURFLDeviceDetectionEntrypointHookTest.java

@@ -14,7 +14,7 @@
 import org.prebid.server.model.CaseInsensitiveMultiMap;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
+import static org.mockito.BDDMockito.given;
 
 @ExtendWith(MockitoExtension.class)
 public class WURFLDeviceDetectionEntrypointHookTest {
@@ -45,7 +45,7 @@ public void callShouldReturnSuccessWithNoAction() {
         final CaseInsensitiveMultiMap headers = CaseInsensitiveMultiMap.builder()
                 .add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Test")
                 .build();
-        when(payload.headers()).thenReturn(headers);
+        given(payload.headers()).willReturn(headers);
 
         // when
         final Future<InvocationResult<EntrypointPayload>> result = target.call(payload, context);
@@ -65,7 +65,7 @@ public void callShouldHandleNullHeaders() {
         final WURFLDeviceDetectionEntrypointHook target = new WURFLDeviceDetectionEntrypointHook();
 
         // when
-        when(payload.headers()).thenReturn(null);
+        given(payload.headers()).willReturn(null);
         final Future<InvocationResult<EntrypointPayload>> result = target.call(payload, context);
 
         // then

extra/modules/wurfl-devicedetection/src/test/java/org/prebid/server/hooks/modules/com/scientiamobile/wurfl/devicedetection/v1/WURFLServiceTest.java

@@ -20,7 +20,6 @@
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 import static org.mockito.Mock.Strictness.LENIENT;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.doReturn;
@@ -87,7 +86,7 @@ public void lookupDeviceShouldReturnDeviceWhenEngineIsNotNull() {
         headers.put("User-Agent", "test-user-agent");
 
         final Device expectedDevice = mock(Device.class);
-        when(wurflEngine.getDeviceForRequest(headers)).thenReturn(expectedDevice);
+        given(wurflEngine.getDeviceForRequest(headers)).willReturn(expectedDevice);
 
         // when
         final Optional<Device> result = wurflService.lookupDevice(headers);
@@ -115,7 +114,7 @@ public void lookupDeviceShouldReturnEmptyWhenEngineIsNull() {
     public void getAllCapabilitiesShouldReturnCapabilitiesWhenEngineIsNotNull() {
         // given
         final Set<String> expectedCapabilities = Set.of("capability1", "capability2");
-        when(wurflEngine.getAllCapabilities()).thenReturn(expectedCapabilities);
+        given(wurflEngine.getAllCapabilities()).willReturn(expectedCapabilities);
 
         // when
         final Set<String> result = wurflService.getAllCapabilities();
@@ -141,7 +140,7 @@ public void getAllCapabilitiesShouldReturnEmptySetWhenEngineIsNull() {
     public void getAllVirtualCapabilitiesShouldReturnCapabilitiesWhenEngineIsNotNull() {
         // given
         final Set<String> expectedCapabilities = Set.of("virtualCapability1", "virtualCapability2");
-        when(wurflEngine.getAllVirtualCapabilities()).thenReturn(expectedCapabilities);
+        given(wurflEngine.getAllVirtualCapabilities()).willReturn(expectedCapabilities);
 
         // when
         final Set<String> result = wurflService.getAllVirtualCapabilities();