diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java index c940565629c..1cc6da0b40e 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java +++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java @@ -1,15 +1,17 @@ package datadog.trace.agent.test.assertions; -import static datadog.trace.agent.test.assertions.Matchers.assertValue; -import static datadog.trace.agent.test.assertions.Matchers.is; import static datadog.trace.bootstrap.instrumentation.api.AgentSpanLink.DEFAULT_FLAGS; import static datadog.trace.bootstrap.instrumentation.api.SpanAttributes.EMPTY; +import static datadog.trace.junit.utils.assertions.Matchers.assertValue; +import static datadog.trace.junit.utils.assertions.Matchers.is; import datadog.trace.api.DDTraceId; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink; import datadog.trace.bootstrap.instrumentation.api.SpanAttributes; import datadog.trace.core.DDSpan; +import datadog.trace.junit.utils.assertions.Matcher; +import datadog.trace.junit.utils.assertions.Matchers; /** * Provides matchers for span links based on their properties such as trace and span IDs links refer diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java index 22aacb5d0df..5bd90e6e856 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java +++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanMatcher.java @@ -1,14 +1,14 @@ package datadog.trace.agent.test.assertions; -import static datadog.trace.agent.test.assertions.Matchers.assertValue; -import static datadog.trace.agent.test.assertions.Matchers.is; -import static datadog.trace.agent.test.assertions.Matchers.isFalse; -import static datadog.trace.agent.test.assertions.Matchers.isNonNull; -import static datadog.trace.agent.test.assertions.Matchers.isNull; -import static datadog.trace.agent.test.assertions.Matchers.isTrue; -import static datadog.trace.agent.test.assertions.Matchers.matches; -import static datadog.trace.agent.test.assertions.Matchers.validates; import static datadog.trace.core.DDSpanAccessor.spanLinks; +import static datadog.trace.junit.utils.assertions.Matchers.assertValue; +import static datadog.trace.junit.utils.assertions.Matchers.is; +import static datadog.trace.junit.utils.assertions.Matchers.isFalse; +import static datadog.trace.junit.utils.assertions.Matchers.isNonNull; +import static datadog.trace.junit.utils.assertions.Matchers.isNull; +import static datadog.trace.junit.utils.assertions.Matchers.isTrue; +import static datadog.trace.junit.utils.assertions.Matchers.matches; +import static datadog.trace.junit.utils.assertions.Matchers.validates; import static java.time.Duration.ofNanos; import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure; @@ -16,6 +16,10 @@ import datadog.trace.api.TagMap; import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink; import datadog.trace.core.DDSpan; +import datadog.trace.junit.utils.assertions.Any; +import datadog.trace.junit.utils.assertions.IsNull; +import datadog.trace.junit.utils.assertions.Matcher; +import datadog.trace.junit.utils.assertions.Matchers; import java.time.Duration; import java.util.ArrayList; import java.util.Collection; @@ -45,6 +49,8 @@ * #durationLongerThan(Duration)} *
  • span type with {@link #type(String)} *
  • span error status with {@link #error()} and {@link #error(boolean)} + *
  • span measured status with {@link #measured()} and {@link #measured(boolean)} + *
  • span top-level status with {@link #topLevel()} and {@link #topLevel(boolean)} *
  • span tags with {@link #tags(TagsMatcher...)} *
  • span links with {@link #links(SpanLinkMatcher...)} * @@ -60,6 +66,8 @@ public final class SpanMatcher { private Matcher durationMatcher; private Matcher typeMatcher; private Matcher errorMatcher; + private Matcher measuredMatcher; + private Matcher topLevelMatcher; private TagsMatcher[] tagMatchers; private SpanLinkMatcher[] linkMatchers; @@ -300,6 +308,50 @@ public SpanMatcher error(boolean errored) { return this; } + /** + * Checks the span is measured. + * + * @return The current {@link SpanMatcher} instance updated with the specified measured + * constraint. + */ + public SpanMatcher measured() { + return measured(true); + } + + /** + * Checks the span measured status matches the given value. + * + * @param measured The expected measured status. + * @return The current {@link SpanMatcher} instance updated with the specified measured + * constraint. + */ + public SpanMatcher measured(boolean measured) { + this.measuredMatcher = measured ? isTrue() : isFalse(); + return this; + } + + /** + * Checks the span is a top-level span. + * + * @return The current {@link SpanMatcher} instance updated with the specified top-level + * constraint. + */ + public SpanMatcher topLevel() { + return topLevel(true); + } + + /** + * Checks the span top-level status matches the given value. + * + * @param topLevel The expected top-level status. + * @return The current {@link SpanMatcher} instance updated with the specified top-level + * constraint. + */ + public SpanMatcher topLevel(boolean topLevel) { + this.topLevelMatcher = topLevel ? isTrue() : isFalse(); + return this; + } + public SpanMatcher tags(TagsMatcher... matchers) { this.tagMatchers = matchers; return this; @@ -341,6 +393,8 @@ else if (this.parentIdMatcher == CHILD_OF_PREVIOUS_MATCHER) { assertValue(this.durationMatcher, ofNanos(span.getDurationNano()), "Unexpected duration"); assertValue(this.typeMatcher, span.getSpanType(), "Unexpected span type"); assertValue(this.errorMatcher, span.isError(), "Unexpected error status"); + assertValue(this.measuredMatcher, span.isMeasured(), "Unexpected measured status"); + assertValue(this.topLevelMatcher, span.isTopLevel(), "Unexpected top-level status"); assertSpanTags(span.getTags()); assertSpanLinks(spanLinks(span)); } @@ -399,7 +453,7 @@ private void assertSpanLinks(List links) { .buildAndThrow(); } for (int i = 0; i < expectedLinkCount; i++) { - SpanLinkMatcher linkMatcher = this.linkMatchers[expectedLinkCount]; + SpanLinkMatcher linkMatcher = this.linkMatchers[i]; AgentSpanLink link = links.get(i); linkMatcher.assertLink(link); } diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java index b9d439d0259..bfc1b0a2398 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java +++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/TagsMatcher.java @@ -1,8 +1,5 @@ package datadog.trace.agent.test.assertions; -import static datadog.trace.agent.test.assertions.Matchers.any; -import static datadog.trace.agent.test.assertions.Matchers.is; -import static datadog.trace.agent.test.assertions.Matchers.isNonNull; import static datadog.trace.api.DDTags.BASE_SERVICE; import static datadog.trace.api.DDTags.DD_INTEGRATION; import static datadog.trace.api.DDTags.DJM_ENABLED; @@ -24,7 +21,13 @@ import static datadog.trace.api.DDTags.TRACER_HOST; import static datadog.trace.common.sampling.RateByServiceTraceSampler.SAMPLING_AGENT_RATE; import static datadog.trace.common.writer.ddagent.TraceMapper.SAMPLING_PRIORITY_KEY; +import static datadog.trace.core.DDSpanContext.SAMPLE_RATE_KEY; +import static datadog.trace.junit.utils.assertions.Matchers.any; +import static datadog.trace.junit.utils.assertions.Matchers.is; +import static datadog.trace.junit.utils.assertions.Matchers.isNonNull; +import datadog.trace.junit.utils.assertions.Matcher; +import datadog.trace.junit.utils.assertions.Matchers; import java.util.HashMap; import java.util.Map; @@ -43,7 +46,7 @@ public static TagsMatcher defaultTags() { tagMatchers.put(LANGUAGE_TAG_KEY, any()); tagMatchers.put(SAMPLING_AGENT_RATE, any()); tagMatchers.put(SAMPLING_PRIORITY_KEY.toString(), any()); - tagMatchers.put("_sample_rate", any()); + tagMatchers.put(SAMPLE_RATE_KEY, any()); tagMatchers.put(PID_TAG, any()); tagMatchers.put(SCHEMA_VERSION_TAG_KEY, any()); tagMatchers.put(PROFILING_ENABLED, any()); diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java index 27234ffe7dd..ea600cb3682 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14ConventionsTest.java @@ -1,6 +1,5 @@ package opentelemetry14; -import static datadog.trace.agent.test.assertions.Matchers.is; import static datadog.trace.agent.test.assertions.SpanMatcher.span; import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; import static datadog.trace.agent.test.assertions.TagsMatcher.tag; @@ -9,6 +8,7 @@ import static datadog.trace.api.DDTags.DD_SVC_SRC; import static datadog.trace.bootstrap.instrumentation.api.Tags.HTTP_STATUS; import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND; +import static datadog.trace.junit.utils.assertions.Matchers.is; import static io.opentelemetry.api.common.AttributeKey.longKey; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.api.trace.SpanKind.CLIENT; @@ -20,10 +20,10 @@ import static org.junit.jupiter.params.provider.Arguments.arguments; import datadog.opentelemetry.shim.trace.OtelConventions; -import datadog.trace.agent.test.assertions.Matcher; -import datadog.trace.agent.test.assertions.Matchers; import datadog.trace.agent.test.assertions.TagsMatcher; import datadog.trace.bootstrap.instrumentation.api.ServiceNameSources; +import datadog.trace.junit.utils.assertions.Matcher; +import datadog.trace.junit.utils.assertions.Matchers; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanBuilder; import io.opentelemetry.api.trace.SpanKind; diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java index 9115cd1d046..77e657b21f1 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java @@ -1,8 +1,6 @@ package opentelemetry14; import static datadog.opentelemetry.shim.trace.OtelSpanEventTestHelper.stringifyErrorStack; -import static datadog.trace.agent.test.assertions.Matchers.any; -import static datadog.trace.agent.test.assertions.Matchers.is; import static datadog.trace.agent.test.assertions.SpanMatcher.span; import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; import static datadog.trace.agent.test.assertions.TagsMatcher.tag; @@ -17,6 +15,8 @@ import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_CONSUMER; import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_PRODUCER; import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_SERVER; +import static datadog.trace.junit.utils.assertions.Matchers.any; +import static datadog.trace.junit.utils.assertions.Matchers.is; import static io.opentelemetry.api.common.AttributeKey.booleanArrayKey; import static io.opentelemetry.api.common.AttributeKey.doubleArrayKey; import static io.opentelemetry.api.common.AttributeKey.longArrayKey; @@ -43,8 +43,6 @@ import static org.junit.jupiter.params.provider.Arguments.arguments; import datadog.opentelemetry.shim.trace.OtelSpanEvent; -import datadog.trace.agent.test.assertions.Matcher; -import datadog.trace.agent.test.assertions.Matchers; import datadog.trace.agent.test.assertions.TagsMatcher; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTags; @@ -52,6 +50,8 @@ import datadog.trace.api.time.ControllableTimeSource; import datadog.trace.bootstrap.instrumentation.api.WithAgentSpan; import datadog.trace.core.DDSpan; +import datadog.trace.junit.utils.assertions.Matcher; +import datadog.trace.junit.utils.assertions.Matchers; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Span; diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java index 14ddd2f1f7b..b412769d9e9 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3InteropTest.java @@ -1,11 +1,11 @@ package testdog.trace.instrumentation.rxjava3; -import static datadog.trace.agent.test.assertions.Matchers.validates; import static datadog.trace.agent.test.assertions.SpanMatcher.span; import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; import static datadog.trace.agent.test.assertions.TagsMatcher.tag; import static datadog.trace.agent.test.assertions.TraceMatcher.SORT_BY_START_TIME; import static datadog.trace.agent.test.assertions.TraceMatcher.trace; +import static datadog.trace.junit.utils.assertions.Matchers.validates; import static org.junit.jupiter.api.Assertions.assertEquals; import datadog.trace.agent.test.AbstractInstrumentationTest; diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java index 27d76f80c1b..ffcad826b9f 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3ResultExtensionTest.java @@ -1,11 +1,11 @@ package testdog.trace.instrumentation.rxjava3; -import static datadog.trace.agent.test.assertions.Matchers.validates; import static datadog.trace.agent.test.assertions.SpanMatcher.span; import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; import static datadog.trace.agent.test.assertions.TagsMatcher.error; import static datadog.trace.agent.test.assertions.TagsMatcher.tag; import static datadog.trace.agent.test.assertions.TraceMatcher.trace; +import static datadog.trace.junit.utils.assertions.Matchers.validates; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java index e9bef9e2068..e9845db4910 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/src/test/java/testdog/trace/instrumentation/rxjava3/RxJava3Test.java @@ -1,6 +1,5 @@ package testdog.trace.instrumentation.rxjava3; -import static datadog.trace.agent.test.assertions.Matchers.validates; import static datadog.trace.agent.test.assertions.SpanMatcher.span; import static datadog.trace.agent.test.assertions.TagsMatcher.defaultTags; import static datadog.trace.agent.test.assertions.TagsMatcher.error; @@ -10,6 +9,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.junit.utils.assertions.Matchers.validates; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle index 4343576e181..59018a6973b 100644 --- a/dd-trace-core/build.gradle +++ b/dd-trace-core/build.gradle @@ -119,7 +119,8 @@ dependencies { testImplementation group: 'com.amazonaws', name: 'aws-lambda-java-events', version:'3.11.0' testImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.14.0' testImplementation libs.testcontainers - testImplementation project(':utils:junit-utils') + testImplementation project(':utils:test-junit-utils') + testImplementation project(':utils:test-junit-converter-utils') traceAgentTestImplementation libs.testcontainers } diff --git a/dd-trace-ot/build.gradle.kts b/dd-trace-ot/build.gradle.kts index 4305ffd6ff3..1df2d46087b 100644 --- a/dd-trace-ot/build.gradle.kts +++ b/dd-trace-ot/build.gradle.kts @@ -64,11 +64,14 @@ dependencies { implementation(project(":dd-trace-ot:correlation-id-injection")) testImplementation(project(":dd-java-agent:testing")) - testImplementation(project(":utils:junit-utils")) + testImplementation(project(":utils:test-junit-utils")) + testImplementation(project(":utils:test-junit-converter-utils")) testImplementation(libs.bundles.mockito) - add("ot31CompatibilityTestImplementation", project(":utils:junit-utils")) - add("ot33CompatibilityTestImplementation", project(":utils:junit-utils")) + add("ot31CompatibilityTestImplementation", project(":utils:test-junit-utils")) + add("ot31CompatibilityTestImplementation", project(":utils:test-junit-converter-utils")) + add("ot33CompatibilityTestImplementation", project(":utils:test-junit-utils")) + add("ot33CompatibilityTestImplementation", project(":utils:test-junit-converter-utils")) // Kotlin accessors not generated if not coming from plugin add("ot33CompatibilityTestImplementation", "io.opentracing:opentracing-api") { diff --git a/docs/how_to_test_with_junit.md b/docs/how_to_test_with_junit.md index c5043824e0f..9fe264afb6a 100644 --- a/docs/how_to_test_with_junit.md +++ b/docs/how_to_test_with_junit.md @@ -108,7 +108,7 @@ When a cell references a symbolic constant like `Long.MAX_VALUE` or `DDSpanId.MA Prefer a shared class so converters are reused across tests: ```java -// utils/junit-utils - shared across modules +// utils/test-junit-converter-utils - shared across modules public final class TableTestTypeConverters { @TypeConverter public static long toLong(String value) { diff --git a/settings.gradle.kts b/settings.gradle.kts index 36b1d9b95df..77dde73fb10 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -169,7 +169,8 @@ include( ":dd-java-agent:testing", ":utils:config-utils", ":utils:container-utils", - ":utils:junit-utils", + ":utils:test-junit-utils", + ":utils:test-junit-converter-utils", ":utils:filesystem-utils", ":utils:flare-utils", ":utils:logging-utils", diff --git a/utils/junit-utils/build.gradle.kts b/utils/test-junit-converter-utils/build.gradle.kts similarity index 77% rename from utils/junit-utils/build.gradle.kts rename to utils/test-junit-converter-utils/build.gradle.kts index f8ec71577bb..cdcdc3e735c 100644 --- a/utils/junit-utils/build.gradle.kts +++ b/utils/test-junit-converter-utils/build.gradle.kts @@ -5,9 +5,6 @@ plugins { apply(from = "$rootDir/gradle/java.gradle") dependencies { - api(libs.forbiddenapis) - api(project(":components:environment")) - implementation(project(":dd-trace-api")) implementation(project(":internal-api")) diff --git a/utils/junit-utils/gradle.lockfile b/utils/test-junit-converter-utils/gradle.lockfile similarity index 95% rename from utils/junit-utils/gradle.lockfile rename to utils/test-junit-converter-utils/gradle.lockfile index bd2ad4c9f2f..797bae1540f 100644 --- a/utils/junit-utils/gradle.lockfile +++ b/utils/test-junit-converter-utils/gradle.lockfile @@ -1,7 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -# To regenerate this file, run: ./gradlew :utils:junit-utils:dependencies --write-locks +# To regenerate this file, run: ./gradlew :utils:test-junit-converter-utils:dependencies --write-locks ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -14,7 +14,7 @@ com.google.code.gson:gson:2.13.2=spotbugs com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.thoughtworks.qdox:qdox:1.12.1=codenarc commons-io:commons-io:2.20.0=spotbugs -de.thetaphi:forbiddenapis:3.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs net.bytebuddy:byte-buddy-agent:1.12.8=testRuntimeClasspath @@ -27,7 +27,7 @@ org.apache.commons:commons-lang3:3.19.0=spotbugs org.apache.commons:commons-text:1.14.0=spotbugs org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apiguardian:apiguardian-api:1.1.2=compileClasspath,testCompileClasspath +org.apiguardian:apiguardian-api:1.1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.groovy:groovy-ant:3.0.23=codenarc org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/ConfigDefaultsConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/ConfigDefaultsConverter.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/ConfigDefaultsConverter.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/ConfigDefaultsConverter.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/DDSpanTypesConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/DDSpanTypesConverter.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/DDSpanTypesConverter.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/DDSpanTypesConverter.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/PrioritySamplingConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/PrioritySamplingConverter.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/PrioritySamplingConverter.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/PrioritySamplingConverter.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/ProductTraceSourceConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/ProductTraceSourceConverter.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/ProductTraceSourceConverter.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/ProductTraceSourceConverter.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/TagsConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/TagsConverter.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/TagsConverter.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/TagsConverter.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/TraceIdConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/TraceIdConverter.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/TraceIdConverter.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/converter/TraceIdConverter.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/ConfigValueConverter.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/tabletest/ConfigValueConverter.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/ConfigValueConverter.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/tabletest/ConfigValueConverter.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/TableTestTypeConverters.java b/utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/tabletest/TableTestTypeConverters.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/tabletest/TableTestTypeConverters.java rename to utils/test-junit-converter-utils/src/main/java/datadog/trace/junit/utils/tabletest/TableTestTypeConverters.java diff --git a/utils/test-junit-utils/build.gradle.kts b/utils/test-junit-utils/build.gradle.kts new file mode 100644 index 00000000000..73e8010578e --- /dev/null +++ b/utils/test-junit-utils/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + `java-library` +} + +apply(from = "$rootDir/gradle/java.gradle") + +dependencies { + api(libs.forbiddenapis) + api(project(":components:environment")) + + compileOnly(libs.junit.jupiter) +} diff --git a/utils/test-junit-utils/gradle.lockfile b/utils/test-junit-utils/gradle.lockfile new file mode 100644 index 00000000000..55a3a965657 --- /dev/null +++ b/utils/test-junit-utils/gradle.lockfile @@ -0,0 +1,75 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :utils:test-junit-utils:dependencies --write-locks +ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath +com.github.javaparser:javaparser-core:3.25.6=codenarc +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.9.8=spotbugs +com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.2=spotbugs +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.thoughtworks.qdox:qdox:1.12.1=codenarc +commons-io:commons-io:2.20.0=spotbugs +de.thetaphi:forbiddenapis:3.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath +jaxen:jaxen:2.0.0=spotbugs +net.bytebuddy:byte-buddy-agent:1.12.8=testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.8=testRuntimeClasspath +net.sf.saxon:Saxon-HE:12.9=spotbugs +org.apache.ant:ant-antlr:1.10.14=codenarc +org.apache.ant:ant-junit:1.10.14=codenarc +org.apache.bcel:bcel:6.11.0=spotbugs +org.apache.commons:commons-lang3:3.19.0=spotbugs +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apiguardian:apiguardian-api:1.1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-ant:3.0.23=codenarc +org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc +org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc +org.codehaus.groovy:groovy-json:3.0.23=codenarc +org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-templates:3.0.23=codenarc +org.codehaus.groovy:groovy-xml:3.0.23=codenarc +org.codehaus.groovy:groovy:3.0.23=codenarc +org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath +org.codenarc:CodeNarc:3.7.0=codenarc +org.dom4j:dom4j:2.2.0=spotbugs +org.gmetrics:GMetrics:2.1.0=codenarc +org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath +org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt +org.jacoco:org.jacoco.core:0.8.14=jacocoAnt +org.jacoco:org.jacoco.report:0.8.14=jacocoAnt +org.junit.jupiter:junit-jupiter-api:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath +org.junit:junit-bom:5.14.0=spotbugs +org.junit:junit-bom:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=testRuntimeClasspath +org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.9=spotbugs +org.ow2.asm:asm-commons:9.9=jacocoAnt,spotbugs +org.ow2.asm:asm-tree:9.9=jacocoAnt,spotbugs +org.ow2.asm:asm-util:9.9=spotbugs +org.ow2.asm:asm:9.9=jacocoAnt,spotbugs +org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j +org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j +org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-junit:1.2.1=testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=spotbugs +empty=annotationProcessor,spotbugsPlugins,testAnnotationProcessor diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Any.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Any.java similarity index 93% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Any.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Any.java index 4c1c981e07e..3f18ee27402 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Any.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Any.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Is.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Is.java similarity index 93% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Is.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Is.java index f142ba1b742..a7d70e7b465 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Is.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Is.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsFalse.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsFalse.java similarity index 90% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsFalse.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsFalse.java index 5e1f2f3f8ab..dde4b8ecd66 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsFalse.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsFalse.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsNonNull.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsNonNull.java similarity index 91% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsNonNull.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsNonNull.java index 0e0f37a159e..895115c3dd1 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsNonNull.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsNonNull.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsNull.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsNull.java similarity index 91% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsNull.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsNull.java index 38cf1b07ba2..68cabbe1ccc 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsNull.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsNull.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsTrue.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsTrue.java similarity index 90% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsTrue.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsTrue.java index b7529bc697a..ba123c4fb6b 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/IsTrue.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/IsTrue.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matcher.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matcher.java similarity index 93% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matcher.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matcher.java index facbc29f5ba..8397ee9eaca 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matcher.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matcher.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; import java.util.function.Predicate; diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matchers.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matchers.java similarity index 96% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matchers.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matchers.java index 973338bd1f1..0e7652def48 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matchers.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matchers.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure; @@ -101,7 +101,7 @@ public static Matcher any() { return new Any<>(); } - static void assertValue(Matcher matcher, T value, String message) { + public static void assertValue(Matcher matcher, T value, String message) { if (matcher != null && !matcher.test(value)) { Optional expected = matcher.expected(); assertionFailure() diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matches.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matches.java similarity index 93% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matches.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matches.java index edc71e446a8..9aaf4b88053 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Matches.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Matches.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; import java.util.regex.Pattern; diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Validates.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Validates.java similarity index 94% rename from dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Validates.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Validates.java index 234bfde7a63..45a4f35c3d7 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/Validates.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/assertions/Validates.java @@ -1,4 +1,4 @@ -package datadog.trace.agent.test.assertions; +package datadog.trace.junit.utils.assertions; import java.util.Optional; import java.util.function.Predicate; diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfig.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfig.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfig.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfig.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java similarity index 99% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java index 6b9fe8a1039..0955d019087 100644 --- a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java +++ b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigExtension.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.annotation.Nonnull; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; @@ -267,7 +266,7 @@ public static class TestEnvironmentVariables } @Override - public String get(@Nonnull String name) { + public String get(String name) { return env.get(name); } diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigs.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigs.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigs.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/config/WithConfigs.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/context/AllowContextTesting.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/context/AllowContextTesting.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/context/AllowContextTesting.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/context/AllowContextTesting.java diff --git a/utils/junit-utils/src/main/java/datadog/trace/junit/utils/context/AllowContextTestingExtension.java b/utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/context/AllowContextTestingExtension.java similarity index 100% rename from utils/junit-utils/src/main/java/datadog/trace/junit/utils/context/AllowContextTestingExtension.java rename to utils/test-junit-utils/src/main/java/datadog/trace/junit/utils/context/AllowContextTestingExtension.java diff --git a/utils/test-utils/build.gradle.kts b/utils/test-utils/build.gradle.kts index 5c29628ef4d..a7d58365c2a 100644 --- a/utils/test-utils/build.gradle.kts +++ b/utils/test-utils/build.gradle.kts @@ -32,7 +32,8 @@ dependencies { api(project(":components:environment")) api(project(":utils:config-utils")) - api(project(":utils:junit-utils")) + api(project(":utils:test-junit-utils")) + api(project(":utils:test-junit-converter-utils")) api(group = "commons-fileupload", name = "commons-fileupload", version = "1.5") compileOnly(project(":components:annotations"))