Skip to content

Commit e0242cf

Browse files
fix(core): Fix test name uniqueness (#8410)
1 parent ebdbdd4 commit e0242cf

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

dd-trace-core/src/test/groovy/datadog/trace/core/monitor/CounterTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import datadog.communication.monitor.Counter
44
import datadog.communication.monitor.Monitoring
55
import datadog.communication.monitor.NoOpCounter
66
import datadog.trace.api.StatsDClient
7-
import datadog.trace.test.util.DDSpecification
7+
import spock.lang.Specification
88

99
import static java.util.concurrent.TimeUnit.MILLISECONDS
1010

11-
class CounterTest extends DDSpecification {
11+
class CounterTest extends Specification {
1212

1313
def "counter counts stuff"() {
1414
StatsDClient statsd = Mock(StatsDClient)

dd-trace-core/src/test/groovy/datadog/trace/core/monitor/HealthMetricsTest.groovy

+4-8
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import datadog.trace.api.sampling.PrioritySampling
55
import datadog.trace.bootstrap.instrumentation.api.ScopeSource
66
import datadog.trace.common.writer.RemoteApi
77
import datadog.trace.common.writer.RemoteWriter
8-
import datadog.trace.test.util.DDSpecification
98
import spock.lang.Ignore
9+
import spock.lang.Specification
1010
import spock.lang.Subject
1111

1212
import java.util.concurrent.CountDownLatch
1313
import java.util.concurrent.ThreadLocalRandom
1414
import java.util.concurrent.TimeUnit
1515

1616

17-
class HealthMetricsTest extends DDSpecification {
17+
class HealthMetricsTest extends Specification {
1818
def statsD = Mock(StatsDClient)
1919

2020
@Subject
@@ -25,16 +25,14 @@ class HealthMetricsTest extends DDSpecification {
2525
def "test onStart"() {
2626
setup:
2727
def writer = Mock(RemoteWriter)
28+
def capacity = ThreadLocalRandom.current().nextInt()
2829

2930
when:
3031
healthMetrics.onStart(writer)
3132

3233
then:
3334
1 * writer.getCapacity() >> capacity
3435
0 * _
35-
36-
where:
37-
capacity = ThreadLocalRandom.current().nextInt()
3836
}
3937

4038
def "test onShutdown"() {
@@ -150,6 +148,7 @@ class HealthMetricsTest extends DDSpecification {
150148
setup:
151149
def latch = new CountDownLatch(1)
152150
def healthMetrics = new TracerHealthMetrics(new Latched(statsD, latch), 100, TimeUnit.MILLISECONDS)
151+
def bytes = ThreadLocalRandom.current().nextInt(10000)
153152
healthMetrics.start()
154153

155154
when:
@@ -162,9 +161,6 @@ class HealthMetricsTest extends DDSpecification {
162161

163162
cleanup:
164163
healthMetrics.close()
165-
166-
where:
167-
bytes = ThreadLocalRandom.current().nextInt(10000)
168164
}
169165

170166
def "test onFailedSerialize"() {

dd-trace-core/src/test/groovy/datadog/trace/core/monitor/TimingTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import datadog.communication.monitor.Monitoring
44
import datadog.communication.monitor.NoOpRecording
55
import datadog.communication.monitor.Recording
66
import datadog.trace.api.StatsDClient
7-
import datadog.trace.test.util.DDSpecification
87
import org.junit.jupiter.api.Assertions
8+
import spock.lang.Specification
99

1010
import static java.util.concurrent.TimeUnit.MILLISECONDS
1111

12-
class TimingTest extends DDSpecification {
12+
class TimingTest extends Specification {
1313

1414
def "timer times stuff"() {
1515
setup:

0 commit comments

Comments
 (0)