Tests: Migrate to Junit 5 (#3149)

prebid · Jul 12, 2024 · d557da7 · d557da7
1 parent d530495
commit d557da7
Show file tree

Hide file tree

Showing 742 changed files with 2,715 additions and 4,095 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -68,6 +68,7 @@
                         autovalue.shaded.com.google,
                         org.inferred.freebuilder.shaded.com.google,
                         org.apache.commons.lang"/>
+            <property name="illegalClasses" value="org.junit.Test" />
         </module>
         <module name="RedundantImport"/>
         <module name="UnusedImports">

diff --git a/...rc/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java b/...rc/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisClient.java
@@ -4,13 +4,13 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
-import org.prebid.server.log.Logger;
-import org.prebid.server.log.LoggerFactory;
 import io.vertx.redis.client.Redis;
 import io.vertx.redis.client.RedisAPI;
 import io.vertx.redis.client.RedisConnection;
 import io.vertx.redis.client.RedisOptions;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.RedisRetryConfig;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 
 public class RedisClient {
 

diff --git a/...rc/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java b/...rc/main/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParser.java
@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.prebid.server.log.Logger;
-import org.prebid.server.log.LoggerFactory;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.BidScanResult;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.RedisError;
+import org.prebid.server.log.Logger;
+import org.prebid.server.log.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/...java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapperTest.java b/...java/org/prebid/server/hooks/modules/com/confiant/adquality/core/AnalyticsMapperTest.java
@@ -1,6 +1,6 @@
 package org.prebid.server.hooks.modules.com.confiant.adquality.core;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.prebid.server.auction.model.BidderResponse;
 import org.prebid.server.hooks.modules.com.confiant.adquality.util.AdQualityModuleTestUtils;
 import org.prebid.server.hooks.modules.com.confiant.adquality.v1.model.analytics.ActivityImpl;

diff --git a/...test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapperTest.java b/...test/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsMapperTest.java
@@ -3,7 +3,7 @@
 import com.iab.openrtb.request.BidRequest;
 import com.iab.openrtb.request.Imp;
 import com.iab.openrtb.response.SeatBid;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.prebid.server.auction.model.BidderResponse;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.RedisBidResponseData;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.RedisBidsData;

diff --git a/.../java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanResultTest.java b/.../java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScanResultTest.java
@@ -1,7 +1,7 @@
 package org.prebid.server.hooks.modules.com.confiant.adquality.core;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.prebid.server.auction.model.BidderResponse;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.GroupByIssues;
 import org.prebid.server.hooks.modules.com.confiant.adquality.util.AdQualityModuleTestUtils;

diff --git a/...est/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScannerTest.java b/...est/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/BidsScannerTest.java
@@ -9,12 +9,11 @@
 import io.vertx.redis.client.RedisAPI;
 import io.vertx.redis.client.Response;
 import io.vertx.redis.client.ResponseType;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.auction.model.BidderResponse;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.GroupByIssues;
 import org.prebid.server.hooks.modules.com.confiant.adquality.model.RedisBidResponseData;
@@ -28,11 +27,9 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 public class BidsScannerTest {
 
-    @Rule
-    public final MockitoRule mockitoRule = MockitoJUnit.rule();
-
     @Mock
     private RedisClient writeRedisNode;
 
@@ -44,7 +41,7 @@ public class BidsScannerTest {
 
     private BidsScanner bidsScannerTest;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         bidsScannerTest = new BidsScanner(writeRedisNode, readRedisNode, "api-key", new ObjectMapper());
     }

diff --git a/...est/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParserTest.java b/...est/java/org/prebid/server/hooks/modules/com/confiant/adquality/core/RedisParserTest.java
@@ -1,7 +1,7 @@
 package org.prebid.server.hooks.modules.com.confiant.adquality.core;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...rg/prebid/server/hooks/modules/com/confiant/adquality/core/RedisScanStateCheckerTest.java b/...rg/prebid/server/hooks/modules/com/confiant/adquality/core/RedisScanStateCheckerTest.java
@@ -2,28 +2,25 @@
 
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 public class RedisScanStateCheckerTest {
 
-    @Rule
-    public final MockitoRule mockitoRule = MockitoJUnit.rule();
-
     @Mock
     private BidsScanner bidsScanner;
 
     private RedisScanStateChecker scanStateChecker;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         scanStateChecker = new RedisScanStateChecker(bidsScanner, 1000L, Vertx.vertx());
     }

diff --git a/...er/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHookTest.java b/...er/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityBidResponsesScanHookTest.java
@@ -6,12 +6,11 @@
 import com.iab.openrtb.request.Geo;
 import com.iab.openrtb.request.User;
 import io.vertx.core.Future;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.activity.infrastructure.ActivityInfrastructure;
 import org.prebid.server.auction.model.AuctionContext;
 import org.prebid.server.auction.model.BidderResponse;
@@ -43,11 +42,9 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 
+@ExtendWith(MockitoExtension.class)
 public class ConfiantAdQualityBidResponsesScanHookTest {
 
-    @Rule
-    public final MockitoRule mockitoRule = MockitoJUnit.rule();
-
     @Mock
     private BidsScanner bidsScanner;
 
@@ -67,7 +64,7 @@ public class ConfiantAdQualityBidResponsesScanHookTest {
 
     private final RedisParser redisParser = new RedisParser(new ObjectMapper());
 
-    @Before
+    @BeforeEach
     public void setUp() {
         target = new ConfiantAdQualityBidResponsesScanHook(bidsScanner, List.of(), userFpdActivityMask);
     }

diff --git a/...rg/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityModuleTest.java b/...rg/prebid/server/hooks/modules/com/confiant/adquality/v1/ConfiantAdQualityModuleTest.java
@@ -1,6 +1,6 @@
 package org.prebid.server.hooks.modules.com.confiant.adquality.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/.../prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilterTest.java b/.../prebid/server/hooks/modules/fiftyone/devicedetection/model/config/AccountFilterTest.java
@@ -1,6 +1,6 @@
 package org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 

diff --git a/...a/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileTest.java b/...a/org/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileTest.java
@@ -1,6 +1,6 @@
 package org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdateTest.java b/...prebid/server/hooks/modules/fiftyone/devicedetection/model/config/DataFileUpdateTest.java
@@ -1,6 +1,6 @@
 package org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...g/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfigTest.java b/...g/prebid/server/hooks/modules/fiftyone/devicedetection/model/config/ModuleConfigTest.java
@@ -1,6 +1,6 @@
 package org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 

diff --git a/...bid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfigTest.java b/...bid/server/hooks/modules/fiftyone/devicedetection/model/config/PerformanceConfigTest.java
@@ -1,6 +1,6 @@
 package org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...d/server/hooks/modules/fiftyone/devicedetection/v1/FiftyOneDeviceDetectionModuleTest.java b/...d/server/hooks/modules/fiftyone/devicedetection/v1/FiftyOneDeviceDetectionModuleTest.java
@@ -1,6 +1,6 @@
 package org.prebid.server.hooks.modules.fiftyone.devicedetection.v1;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.prebid.server.hooks.v1.Hook;
 import org.prebid.server.hooks.v1.InvocationContext;
 import org.prebid.server.hooks.v1.Module;

diff --git a/.../org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricherTest.java b/.../org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/DeviceEnricherTest.java
@@ -7,13 +7,12 @@
 import fiftyone.pipeline.core.flowelements.Pipeline;
 import fiftyone.pipeline.engines.data.AspectPropertyValue;
 import fiftyone.pipeline.engines.exceptions.NoValueException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.boundary.CollectedEvidence;
 import org.prebid.server.proto.openrtb.ext.request.ExtDevice;
 
@@ -25,27 +24,27 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mock.Strictness.LENIENT;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@ExtendWith(MockitoExtension.class)
 public class DeviceEnricherTest {
-    @Rule
-    public final MockitoRule mockitoRule = MockitoJUnit.rule();
 
-    @Mock
+    @Mock(strictness = LENIENT)
     private Pipeline pipeline;
 
-    @Mock
+    @Mock(strictness = LENIENT)
     private FlowData flowData;
 
-    @Mock
+    @Mock(strictness = LENIENT)
     private DeviceData deviceData;
 
     private DeviceEnricher target;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         when(pipeline.createFlowData()).thenReturn(flowData);
         when(flowData.get(DeviceData.class)).thenReturn(deviceData);

diff --git a/...org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/PipelineBuilderTest.java b/...org/prebid/server/hooks/modules/fiftyone/devicedetection/v1/core/PipelineBuilderTest.java
@@ -4,41 +4,41 @@
 import fiftyone.devicedetection.DeviceDetectionPipelineBuilder;
 import fiftyone.pipeline.core.flowelements.Pipeline;
 import fiftyone.pipeline.engines.Constants;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config.DataFile;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config.DataFileUpdate;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config.ModuleConfig;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.config.PerformanceConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mock.Strictness.LENIENT;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@ExtendWith(MockitoExtension.class)
 public class PipelineBuilderTest {
-    @Rule
-    public final MockitoRule mockitoRule = MockitoJUnit.rule();
 
     private ModuleConfig moduleConfig;
     private DataFileUpdate dataFileUpdate;
     private PerformanceConfig performanceConfig;
 
     @Mock
     private DeviceDetectionPipelineBuilder builderPrime;
-    @Mock
+    @Mock(strictness = LENIENT)
     private DeviceDetectionOnPremisePipelineBuilder builder;
     @Mock
     private Pipeline pipeline;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         dataFileUpdate = new DataFileUpdate();
         performanceConfig = new PerformanceConfig();
@@ -164,14 +164,15 @@ public void buildShouldAssignPollingInterval() throws Exception {
         assertThat(argumentCaptor.getAllValues()).containsExactly(dataFileUpdate.getPollingInterval());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void buildShouldThrowWhenProfileIsUnknown() throws Exception {
+    @Test
+    public void buildShouldThrowWhenProfileIsUnknown() {
         // given
         performanceConfig.setProfile("ghost");
 
         try {
             // when
-            new PipelineBuilder(moduleConfig).build(builderPrime);
+            assertThatThrownBy(() -> new PipelineBuilder(moduleConfig).build(builderPrime))
+                    .isInstanceOf(IllegalArgumentException.class);
         } finally {
             // then
             verify(builder, never()).setPerformanceProfile(any());

diff --git a/...bid/server/hooks/modules/fiftyone/devicedetection/v1/core/SecureHeadersRetrieverTest.java b/...bid/server/hooks/modules/fiftyone/devicedetection/v1/core/SecureHeadersRetrieverTest.java
@@ -2,7 +2,7 @@
 
 import com.iab.openrtb.request.BrandVersion;
 import com.iab.openrtb.request.UserAgent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;

diff --git a/.../modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionEntrypointHookTest.java b/.../modules/fiftyone/devicedetection/v1/hooks/FiftyOneDeviceDetectionEntrypointHookTest.java
@@ -1,11 +1,10 @@
 package org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.hooks;
 
 import io.vertx.core.Future;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.prebid.server.hooks.execution.v1.entrypoint.EntrypointPayloadImpl;
-import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.FiftyOneDeviceDetectionModule;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.model.boundary.CollectedEvidence;
+import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.FiftyOneDeviceDetectionModule;
 import org.prebid.server.hooks.modules.fiftyone.devicedetection.v1.model.ModuleContext;
 import org.prebid.server.hooks.v1.InvocationResult;
 import org.prebid.server.hooks.v1.entrypoint.EntrypointHook;
@@ -17,12 +16,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class FiftyOneDeviceDetectionEntrypointHookTest {
-    private EntrypointHook target;
 
-    @Before
-    public void setUp() {
-        target = new FiftyOneDeviceDetectionEntrypointHook();
-    }
+    private final EntrypointHook target = new FiftyOneDeviceDetectionEntrypointHook();
 
     @Test
     public void codeShouldStartWithModuleCode() {