Mockito 5

Signed-off-by: David Venable <[email protected]>
opensearch-project · Jul 8, 2024 · 5023df5 · 5023df5
1 parent 39c74db
commit 5023df5
Show file tree

Hide file tree

Showing 47 changed files with 6 additions and 90 deletions.
diff --git a/data-prepper-core/build.gradle b/data-prepper-core/build.gradle
@@ -60,7 +60,6 @@ dependencies {
     implementation 'software.amazon.awssdk:servicediscovery'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
     testImplementation testLibs.junit.vintage
-    testImplementation testLibs.mockito.inline
     testImplementation libs.commons.lang3
     testImplementation project(':data-prepper-test-event')
     testImplementation project(':data-prepper-test-common')

diff --git a/...prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineConnectorTest.java b/...prepper-core/src/test/java/org/opensearch/dataprepper/pipeline/PipelineConnectorTest.java
@@ -23,7 +23,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
 

diff --git a/...epper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/FutureHelperTest.java b/...epper-core/src/test/java/org/opensearch/dataprepper/pipeline/common/FutureHelperTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Arrays;
 import java.util.concurrent.ExecutionException;

diff --git a/.../java/org/opensearch/dataprepper/pipeline/server/CloudWatchMeterRegistryProviderTest.java b/.../java/org/opensearch/dataprepper/pipeline/server/CloudWatchMeterRegistryProviderTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
 
 import static org.hamcrest.CoreMatchers.notNullValue;

diff --git a/data-prepper-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/data-prepper-core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-expression/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/data-prepper-expression/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-logstash-configuration/build.gradle b/data-prepper-logstash-configuration/build.gradle
@@ -25,7 +25,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation libs.commons.lang3
     testImplementation testLibs.slf4j.simple
-    testImplementation testLibs.mockito.inline
 }
 
 generateGrammarSource {

diff --git a/data-prepper-pipeline-parser/build.gradle b/data-prepper-pipeline-parser/build.gradle
@@ -30,12 +30,7 @@ dependencies {
     testImplementation testLibs.bundles.junit
     testImplementation testLibs.bundles.mockito
     testImplementation testLibs.hamcrest
-    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
-    testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
     testImplementation 'org.assertj:assertj-core:3.20.2'
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
-    testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
     compileOnly 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
 }
diff --git a/...er/src/test/java/org/opensearch/dataprepper/pipeline/parser/EventKeyDeserializerTest.java b/...er/src/test/java/org/opensearch/dataprepper/pipeline/parser/EventKeyDeserializerTest.java
@@ -30,8 +30,8 @@
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 class EventKeyDeserializerTest {

diff --git a/data-prepper-plugin-framework/build.gradle b/data-prepper-plugin-framework/build.gradle
@@ -24,5 +24,4 @@ dependencies {
     }
     implementation libs.reflections.core
     implementation 'com.fasterxml.jackson.core:jackson-databind'
-    testImplementation testLibs.mockito.inline
 }
diff --git a/data-prepper-plugins/aggregate-processor/build.gradle b/data-prepper-plugins/aggregate-processor/build.gradle
@@ -19,7 +19,6 @@ dependencies {
     implementation libs.opentelemetry.proto
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'io.micrometer:micrometer-core'
-    testImplementation testLibs.mockito.inline
 }
 
 jacocoTestCoverageVerification {

diff --git a/...lugins/armeria-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...lugins/armeria-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/...er-plugins/aws-plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...er-plugins/aws-plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/cloudwatch-logs/build.gradle b/data-prepper-plugins/cloudwatch-logs/build.gradle
@@ -16,7 +16,6 @@ dependencies {
     implementation 'org.projectlombok:lombok:1.18.26'
     implementation 'org.hibernate.validator:hibernate-validator:8.0.0.Final'
     testImplementation project(path: ':data-prepper-test-common')
-    testImplementation testLibs.mockito.inline
     compileOnly 'org.projectlombok:lombok:1.18.24'
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
 }

diff --git a/...dwatch-metrics-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...dwatch-metrics-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/common/build.gradle b/data-prepper-plugins/common/build.gradle
@@ -24,7 +24,6 @@ dependencies {
     testImplementation project(':data-prepper-plugins:blocking-buffer')
     testImplementation project(':data-prepper-test-event')
     testImplementation libs.commons.io
-    testImplementation testLibs.mockito.inline
 }
 
 jacocoTestCoverageVerification {

diff --git a/data-prepper-plugins/decompress-processor/build.gradle b/data-prepper-plugins/decompress-processor/build.gradle
@@ -9,5 +9,4 @@ dependencies {
     implementation project(':data-prepper-plugins:common')
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'io.micrometer:micrometer-core'
-    testImplementation testLibs.mockito.inline
 }
diff --git a/data-prepper-plugins/dynamodb-source-coordination-store/build.gradle b/data-prepper-plugins/dynamodb-source-coordination-store/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     implementation 'software.amazon.awssdk:dynamodb'
     implementation 'software.amazon.awssdk:dynamodb-enhanced'
     implementation 'software.amazon.awssdk:sts'
-    testImplementation testLibs.mockito.inline
 }
 
 test {

diff --git a/data-prepper-plugins/dynamodb-source/build.gradle b/data-prepper-plugins/dynamodb-source/build.gradle
@@ -25,6 +25,5 @@ dependencies {
     implementation project(path: ':data-prepper-plugins:buffer-common')
 
 
-    testImplementation testLibs.mockito.inline
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 }
diff --git a/...ugins/geoip-processor/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...ugins/geoip-processor/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/grok-processor/build.gradle b/data-prepper-plugins/grok-processor/build.gradle
@@ -12,7 +12,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation "io.krakens:java-grok:0.1.9"
     implementation 'io.micrometer:micrometer-core'
-    testImplementation testLibs.mockito.inline
     testImplementation project(':data-prepper-test-common')
 }
 

diff --git a/data-prepper-plugins/http-common/build.gradle b/data-prepper-plugins/http-common/build.gradle
@@ -6,7 +6,6 @@
 dependencies {
     implementation 'org.apache.httpcomponents:httpcore:4.4.16'
     testImplementation testLibs.bundles.junit
-    testImplementation testLibs.mockito.inline
 }
 
 jacocoTestCoverageVerification {

diff --git a/...per-plugins/http-sink/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...per-plugins/http-sink/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/...ns/http-source-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...ns/http-source-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/...r-plugins/http-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...r-plugins/http-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/kafka-plugins/build.gradle b/data-prepper-plugins/kafka-plugins/build.gradle
@@ -53,7 +53,6 @@ dependencies {
     implementation 'software.amazon.awssdk:s3'
     implementation 'software.amazon.awssdk:apache-client'
 
-    testImplementation testLibs.mockito.inline
     testImplementation 'org.yaml:snakeyaml:2.2'
     testImplementation testLibs.spring.test
     testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
@@ -62,12 +61,10 @@ dependencies {
     testImplementation project(':data-prepper-core')
     testImplementation project(':data-prepper-plugin-framework')
     testImplementation project(':data-prepper-pipeline-parser')
-    testImplementation testLibs.mockito.inline
     testImplementation 'org.apache.kafka:kafka_2.13:3.6.1'
     testImplementation 'org.apache.kafka:kafka_2.13:3.6.1:test'
     testImplementation 'org.apache.curator:curator-test:5.5.0'
     testImplementation('com.kjetland:mbknor-jackson-jsonschema_2.13:1.0.39')
-    testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.9'
     testImplementation project(':data-prepper-plugins:otel-metrics-source')
     testImplementation project(':data-prepper-plugins:otel-proto-common')
     testImplementation libs.opentelemetry.proto

diff --git a/...repper-plugins/lambda/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...repper-plugins/lambda/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/mongodb/build.gradle b/data-prepper-plugins/mongodb/build.gradle
@@ -16,7 +16,6 @@ dependencies {
     implementation project(path: ':data-prepper-plugins:common')
 
 
-    testImplementation testLibs.mockito.inline
     testImplementation testLibs.bundles.junit
     testImplementation testLibs.slf4j.simple
     testImplementation project(path: ':data-prepper-test-common')

diff --git a/data-prepper-plugins/opensearch/build.gradle b/data-prepper-plugins/opensearch/build.gradle
@@ -44,7 +44,6 @@ dependencies {
     testImplementation 'net.bytebuddy:byte-buddy:1.14.12'
     testImplementation 'net.bytebuddy:byte-buddy-agent:1.14.12'
     testImplementation testLibs.slf4j.simple
-    testImplementation testLibs.mockito.inline
 }
 
 sourceSets {

diff --git a/...er-plugins/opensearch/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...er-plugins/opensearch/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/otel-logs-source/build.gradle b/data-prepper-plugins/otel-logs-source/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     implementation libs.bouncycastle.bcprov
     implementation libs.bouncycastle.bcpkix
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation testLibs.mockito.inline
     testImplementation libs.commons.io
 }
 

diff --git a/...gins/otel-logs-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...gins/otel-logs-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/otel-metrics-raw-processor/build.gradle b/data-prepper-plugins/otel-metrics-raw-processor/build.gradle
@@ -22,7 +22,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     implementation libs.guava.core
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation testLibs.mockito.inline
 }
 
 jacocoTestCoverageVerification {

diff --git a/data-prepper-plugins/otel-metrics-source/build.gradle b/data-prepper-plugins/otel-metrics-source/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     implementation libs.bouncycastle.bcprov
     implementation libs.bouncycastle.bcpkix
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation testLibs.mockito.inline
     testImplementation libs.commons.io
 }
 

diff --git a/...s/otel-metrics-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...s/otel-metrics-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/...trace-group-processor/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...trace-group-processor/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/otel-trace-raw-processor/build.gradle b/data-prepper-plugins/otel-trace-raw-processor/build.gradle
@@ -20,7 +20,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     implementation libs.caffeine
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation testLibs.mockito.inline
 }
 
 jacocoTestCoverageVerification {

diff --git a/data-prepper-plugins/otel-trace-source/build.gradle b/data-prepper-plugins/otel-trace-source/build.gradle
@@ -29,7 +29,6 @@ dependencies {
     implementation libs.bouncycastle.bcprov
     implementation libs.bouncycastle.bcpkix
     testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation testLibs.mockito.inline
     testImplementation testLibs.slf4j.simple
     testImplementation libs.commons.io
 }

diff --git a/...ins/otel-trace-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...ins/otel-trace-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/...ugins/prometheus-sink/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...ugins/prometheus-sink/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/rds-source/build.gradle b/data-prepper-plugins/rds-source/build.gradle
@@ -20,7 +20,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-core'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
 
-    testImplementation testLibs.mockito.inline
     testImplementation project(path: ':data-prepper-test-common')
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
 }
diff --git a/...epper-plugins/s3-sink/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...epper-plugins/s3-sink/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/...per-plugins/s3-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...per-plugins/s3-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/data-prepper-plugins/service-map-stateful/build.gradle b/data-prepper-plugins/service-map-stateful/build.gradle
@@ -19,7 +19,6 @@ dependencies {
         exclude group: 'com.google.protobuf', module: 'protobuf-java'
     }
     implementation libs.protobuf.core
-    testImplementation testLibs.mockito.inline
 }
 
 jacocoTestCoverageVerification {

diff --git a/...pper-plugins/sns-sink/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...pper-plugins/sns-sink/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/...er-plugins/sqs-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/...er-plugins/sqs-source/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
diff --git a/settings.gradle b/settings.gradle
@@ -74,7 +74,7 @@ dependencyResolutionManagement {
         }
         testLibs {
             version('junit', '5.8.2')
-            version('mockito', '3.11.2')
+            version('mockito', '5.12.0')
             version('hamcrest', '2.2')
             version('awaitility', '4.2.0')
             version('spring', '5.3.28')