Skip to content

Commit 0ae0065

Browse files
committed
replace tabletest by valuesource for single param
1 parent b81b3d2 commit 0ae0065

File tree

4 files changed

+15
-23
lines changed

4 files changed

+15
-23
lines changed

.claude/skills/migrate-groovy-to-java/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ When converting Groovy code to Java code, make sure that:
2020
- `@TableTest` and `@MethodSource` may be combined on the same `@ParameterizedTest` when most cases are tabular but a few cases require programmatic setup.
2121
- In combined mode, keep table-friendly cases in `@TableTest`, and put only non-tabular/complex cases in `@MethodSource`.
2222
- If `@TableTest` is not viable for the test at all, use `@MethodSource` only.
23-
- If `@TableTest` was successfully used, `@ParameterizedTest` can then be removed as `@TableTest` replace it fully
23+
- If `@TableTest` was successfully used and if the `@ParameterizedTest` is not used to specify the test name, `@ParameterizedTest` can then be removed as `@TableTest` replace it fully.
2424
- For `@MethodSource`, name the arguments method `<testMethodName>Arguments` (camelCase, e.g. `testMethodArguments`) and return `Stream<Arguments>` using `Stream.of(...)` and `arguments(...)` with static import.
2525
- Ensure parameterized test names are human-readable (i.e. no hashcodes); instead add a description string as the first `Arguments.arguments(...)` value or index the test case
2626
- When converting tuples, create a light dedicated structure instead to keep the typing system

dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
package datadog.trace.core;
22

3+
import static datadog.trace.junit.utils.config.WithConfigExtension.injectSysConfig;
34
import static org.junit.jupiter.api.Assertions.assertEquals;
45
import static org.junit.jupiter.api.Assertions.assertFalse;
56
import static org.junit.jupiter.api.Assertions.assertTrue;
67

78
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
89
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
910
import datadog.trace.common.writer.ListWriter;
10-
import datadog.trace.junit.utils.config.WithConfigExtension;
1111
import java.util.Arrays;
1212
import java.util.Properties;
13-
import org.tabletest.junit.TableTest;
13+
import org.junit.jupiter.params.ParameterizedTest;
14+
import org.junit.jupiter.params.provider.ValueSource;
1415

1516
public class BlackholeSpanTest extends DDCoreJavaSpecification {
1617

17-
@TableTest({
18-
"scenario | moreBits",
19-
"128 bit traceid logging enabled | true ",
20-
"128 bit traceid logging disabled | false "
21-
})
22-
void shouldMuteTracing(String moreBits) throws Exception {
23-
WithConfigExtension.injectSysConfig("trace.128.bit.traceid.logging.enabled", moreBits);
18+
@ValueSource(strings = {"true", "false"})
19+
@ParameterizedTest
20+
void shouldMuteTracing(String use128bitTraceId) throws Exception {
21+
injectSysConfig("trace.128.bit.traceid.logging.enabled", use128bitTraceId);
2422
ListWriter writer = new ListWriter();
2523
Properties props = new Properties();
2624
CoreTracer tracer = tracerBuilder().withProperties(props).writer(writer).build();

dd-trace-core/src/test/java/datadog/trace/core/LongRunningTracesTrackerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,9 @@ void traceWithoutRightStateAreNotTracked() {
121121

122122
@Test
123123
void maxTrackedTracesIsEnforced() {
124-
for (int i = 0; i < MAX_TRACKED_TRACES; i++) {
124+
for (int i = 0; i < MAX_TRACKED_TRACES + 1; i++) {
125125
tracker.add(newTraceToTrack());
126126
}
127-
tracker.add(newTraceToTrack());
128127
assertEquals(MAX_TRACKED_TRACES, tracker.trackedCount());
129128
assertEquals(1, tracker.getDropped());
130129
}

dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
import datadog.trace.common.writer.ListWriter;
1111
import datadog.trace.junit.utils.config.WithConfigExtension;
1212
import org.junit.jupiter.api.Test;
13-
import org.tabletest.junit.TableTest;
13+
import org.junit.jupiter.params.ParameterizedTest;
14+
import org.junit.jupiter.params.provider.ValueSource;
1415

1516
public class TraceCorrelationTest extends DDCoreJavaSpecification {
1617

17-
@TableTest({
18-
"scenario | log128bTraceId",
19-
"128-bit enabled | true ",
20-
"128-bit disabled | false "
21-
})
18+
@ValueSource(booleans = {true, false})
19+
@ParameterizedTest
2220
void getTraceIdWithoutTrace(boolean log128bTraceId) {
2321
WithConfigExtension.injectSysConfig(
2422
TRACE_128_BIT_TRACEID_GENERATION_ENABLED, String.valueOf(log128bTraceId));
@@ -36,11 +34,8 @@ void getTraceIdWithoutTrace(boolean log128bTraceId) {
3634
tracer.close();
3735
}
3836

39-
@TableTest({
40-
"scenario | log128bTraceId",
41-
"128-bit enabled | true ",
42-
"128-bit disabled | false "
43-
})
37+
@ValueSource(booleans = {true, false})
38+
@ParameterizedTest
4439
void getTraceIdWithTrace(boolean log128bTraceId) {
4540
WithConfigExtension.injectSysConfig(
4641
TRACE_128_BIT_TRACEID_GENERATION_ENABLED, String.valueOf(log128bTraceId));

0 commit comments

Comments
 (0)