Refactor how common test dependencies are defined (#86)

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

build.gradle.kts

@@ -13,6 +13,11 @@ allprojects {
     }
 }
 
+val testDependencies by configurations.creating {
+    extendsFrom(configurations.testImplementation.get())
+    extendsFrom(configurations.testRuntimeOnly.get())
+}
+
 subprojects {
     group = "org.hypertrace.agent"
     description = "Hypertrace OpenTelemetry Javaagent"
@@ -39,9 +44,9 @@ subprojects {
     }
 
     dependencies {
-        testImplementation("org.mockito:mockito-core:3.3.3")
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
-        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.6.2")
+        testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
+        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+        testImplementation("org.junit-pioneer:junit-pioneer:1.0.0")
     }
 
     tasks {

instrumentation/grpc-1.5/src/test/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/GrpcBodyTest.java

@@ -48,6 +48,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.ClearSystemProperty;
 
 public class GrpcBodyTest extends AbstractInstrumenterTest {
 
@@ -108,7 +109,6 @@ public static void close() {
 
   @AfterEach
   public void afterEach() {
-    System.clearProperty(EnvironmentConfig.CAPTURE_HTTP_BODY_PREFIX + "request");
     HypertraceConfig.reset();
   }
 
@@ -168,6 +168,7 @@ public void serverRequestBlocking() throws TimeoutException, InterruptedExceptio
   }
 
   @Test
+  @ClearSystemProperty(key = EnvironmentConfig.CAPTURE_HTTP_HEADERS_PREFIX + "request")
   public void disabledInstrumentation_dynamicConfig()
       throws TimeoutException, InterruptedException {
     System.setProperty(EnvironmentConfig.CAPTURE_HTTP_BODY_PREFIX + "request", "false");

javaagent-core/build.gradle.kts

@@ -28,6 +28,4 @@ dependencies {
     api("com.google.protobuf:protobuf-java-util:3.13.0")
     // convert yaml to json, since java protobuf impl supports only json
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.3")
-
-    testImplementation("org.junit-pioneer:junit-pioneer:1.0.0")
 }

testing-common/build.gradle.kts

@@ -3,10 +3,11 @@ plugins {
     id("net.bytebuddy.byte-buddy-gradle-plugin") version "1.10.10"
 }
 
-dependencies {
-    implementation("org.junit.jupiter:junit-jupiter-api:5.6.2")
-    implementation("org.junit.jupiter:junit-jupiter-engine:5.6.2")
+configurations {
+    implementation.get().extendsFrom(project(":").configurations["testDependencies"])
+}
 
+dependencies {
     api("io.opentelemetry:opentelemetry-sdk:0.9.1")
     implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.9.0")
     implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.9.0")