Skip to content

Commit 14372ad

Browse files
anuraagatrasklaurit
authored
Migrate Guava tests to Java (#5668)
* Migrate Guava tests to Java * Update instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/ListenableFutureTest.java Co-authored-by: Lauri Tulmin <[email protected]> * Workaround inline mock issue Co-authored-by: Trask Stalnaker <[email protected]> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 7a46953 commit 14372ad

File tree

32 files changed

+461
-559
lines changed

32 files changed

+461
-559
lines changed

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,13 @@ testing {
137137
runtimeOnly("org.junit.jupiter:junit-jupiter-engine")
138138
runtimeOnly("org.junit.vintage:junit-vintage-engine")
139139

140+
141+
implementation("org.assertj:assertj-core")
142+
implementation("org.awaitility:awaitility")
143+
implementation("org.mockito:mockito-core")
144+
implementation("org.mockito:mockito-inline")
145+
implementation("org.mockito:mockito-junit-jupiter")
146+
140147
implementation("org.objenesis:objenesis")
141148
implementation("org.spockframework:spock-core") {
142149
with (this as ExternalDependency) {

instrumentation-api-annotation-support/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ dependencies {
1717
annotationProcessor("com.google.auto.value:auto-value")
1818

1919
testImplementation(project(":testing-common"))
20-
testImplementation("org.mockito:mockito-core")
21-
testImplementation("org.mockito:mockito-junit-jupiter")
22-
testImplementation("org.assertj:assertj-core")
23-
testImplementation("org.awaitility:awaitility")
2420
testImplementation("io.opentelemetry:opentelemetry-sdk-metrics")
2521
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
2622
}

instrumentation-api/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ dependencies {
2121
annotationProcessor("com.google.auto.value:auto-value")
2222

2323
testImplementation(project(":testing-common"))
24-
testImplementation("org.mockito:mockito-core")
25-
testImplementation("org.mockito:mockito-junit-jupiter")
26-
testImplementation("org.assertj:assertj-core")
27-
testImplementation("org.awaitility:awaitility")
2824
testImplementation("io.opentelemetry:opentelemetry-sdk-metrics")
2925
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
3026
}

instrumentation-appender-api-internal/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,4 @@ group = "io.opentelemetry.instrumentation"
1010

1111
dependencies {
1212
api("io.opentelemetry:opentelemetry-api")
13-
14-
testImplementation("org.assertj:assertj-core")
15-
testImplementation("org.mockito:mockito-core")
1613
}

instrumentation/apache-camel-2.20/javaagent-unit-tests/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ dependencies {
1212

1313
testImplementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
1414
testImplementation("io.opentelemetry:opentelemetry-extension-aws")
15-
testImplementation("org.assertj:assertj-core")
1615
}

instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,5 @@ dependencies {
2727
testImplementation("com.google.guava:guava")
2828

2929
testImplementation(project(":instrumentation:aws-lambda:aws-lambda-core-1.0:testing"))
30-
testImplementation("org.mockito:mockito-core")
31-
testImplementation("org.assertj:assertj-core")
3230
testImplementation("uk.org.webcompere:system-stubs-jupiter")
3331
}

instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,5 @@ dependencies {
3535
testImplementation("com.google.guava:guava")
3636

3737
testImplementation(project(":instrumentation:aws-lambda:aws-lambda-events-2.2:testing"))
38-
testImplementation("org.mockito:mockito-core")
39-
testImplementation("org.assertj:assertj-core")
4038
testImplementation("uk.org.webcompere:system-stubs-jupiter")
4139
}

instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ dependencies {
88

99
testImplementation("com.amazonaws:aws-java-sdk-core:1.11.0")
1010
testImplementation("com.amazonaws:aws-java-sdk-sqs:1.11.106")
11-
12-
testImplementation("org.assertj:assertj-core")
1311
}

instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ dependencies {
1010

1111
testImplementation(project(":instrumentation:aws-sdk:aws-sdk-2.2:testing"))
1212

13-
testImplementation("org.assertj:assertj-core")
14-
testImplementation("org.mockito:mockito-core")
15-
1613
latestDepTestLibrary("software.amazon.awssdk:aws-core:+")
1714
latestDepTestLibrary("software.amazon.awssdk:aws-json-protocol:+")
1815
latestDepTestLibrary("software.amazon.awssdk:dynamodb:+")

instrumentation/grpc-1.6/library/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@ dependencies {
1313
testLibrary("io.grpc:grpc-services:$grpcVersion")
1414
testLibrary("io.grpc:grpc-stub:$grpcVersion")
1515

16-
testImplementation("org.assertj:assertj-core")
1716
testImplementation(project(":instrumentation:grpc-1.6:testing"))
1817
}

0 commit comments

Comments
 (0)