Skip to content

Commit 9113da7

Browse files
PerfectSlayerPerfectSlayer
authored
fix: Fix test name uniqueness (#8018)
1 parent b0bc9ed commit 9113da7

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

‎dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/EarlyFlakeDetectionSettingsSerializerTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import spock.lang.Specification
66

77
class EarlyFlakeDetectionSettingsSerializerTest extends Specification {
88

9-
def "test serialization: #settings"() {
9+
def "test serialization: #iterationIndex"() {
1010
when:
1111
Serializer s = new Serializer()
1212
EarlyFlakeDetectionSettingsSerializer.serialize(s, settings)

‎dd-java-agent/instrumentation/aws-java-sdk-2.2/src/payloadTaggingTest/groovy/PayloadTaggingTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class PayloadTaggingExpansionForkedTest extends AbstractPayloadTaggingTest {
184184
injectSysConfig(TracerConfig.TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING, "\$.MessageId,\$.SubscriptionArn,\$[*].phoneNumbers")
185185
}
186186

187-
def "support various types, embedded JSON in string and binary format"() {
187+
def "support various types, embedded JSON in string and binary format #expectedReqTag"() {
188188
setup:
189189
TEST_WRITER.clear()
190190

@@ -261,7 +261,7 @@ class PayloadTaggingMaxDepthForkedTest extends AbstractPayloadTaggingTest {
261261
injectSysConfig(TracerConfig.TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH, "4")
262262
}
263263

264-
def "generate tags up to the specified max depth"() {
264+
def "generate tags up to the specified max depth #expectedReqTag"() {
265265
setup:
266266
TEST_WRITER.clear()
267267

@@ -315,7 +315,7 @@ class PayloadTaggingMaxTagsForkedTest extends AbstractPayloadTaggingTest {
315315
injectSysConfig(TracerConfig.TRACE_CLOUD_PAYLOAD_TAGGING_MAX_TAGS, "5")
316316
}
317317

318-
def "generate tags up to the specified max number"() {
318+
def "generate tags up to the specified max number #iterationIndex"() {
319319
setup:
320320
TEST_WRITER.clear()
321321

‎dd-java-agent/instrumentation/commons-codec-1/src/test/groovy/datadog/trace/instrumentation/commonscodec/Base64CallSiteTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Base64CallSiteTest extends AgentTestRunner {
1515
injectSysConfig('dd.iast.enabled', 'true')
1616
}
1717

18-
void 'test encode base 64'() {
18+
void 'test encode base 64 #iterationIndex'() {
1919
given:
2020
final module = Mock(CodecModule)
2121
InstrumentationBridge.registerIastModule(module)
@@ -33,7 +33,7 @@ class Base64CallSiteTest extends AgentTestRunner {
3333
'encode' | ['Hello'.bytes, new Base64()]
3434
}
3535

36-
void 'test decode base 64'() {
36+
void 'test decode base 64 #iterationIndex'() {
3737
given:
3838
final module = Mock(CodecModule)
3939
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/jackson-core/jackson-core-1/src/test/groovy/Json1ParserInstrumentationTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner {
1717
injectSysConfig("dd.iast.enabled", "true")
1818
}
1919

20-
void 'test json parsing (tainted)'() {
20+
void 'test json parsing #iterationIndex (tainted)'() {
2121
given:
2222
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
2323
final module = Mock(PropagationModule)
@@ -45,7 +45,7 @@ class Json1ParserInstrumentationTest extends AgentTestRunner {
4545
target << testSuite()
4646
}
4747

48-
void 'test json parsing (not tainted)'() {
48+
void 'test json parsing #iterationIndex (not tainted)'() {
4949
given:
5050
final module = Mock(PropagationModule)
5151
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
3838
InstrumentationBridge.clearIastModules()
3939
}
4040

41-
void 'test getHeader'() {
41+
void 'test getHeader #iterationIndex'() {
4242
setup:
4343
final iastModule = Mock(PropagationModule)
4444
InstrumentationBridge.registerIastModule(iastModule)
@@ -58,7 +58,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
5858
suite << testSuite()
5959
}
6060

61-
void 'test getHeaders'() {
61+
void 'test getHeaders #iterationIndex'() {
6262
setup:
6363
final iastModule = Mock(PropagationModule)
6464
InstrumentationBridge.registerIastModule(iastModule)
@@ -79,7 +79,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
7979
suite << testSuite()
8080
}
8181

82-
void 'test getHeaderNames'() {
82+
void 'test getHeaderNames #iterationIndex'() {
8383
setup:
8484
final iastModule = Mock(PropagationModule)
8585
InstrumentationBridge.registerIastModule(iastModule)
@@ -100,7 +100,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
100100
suite << testSuite()
101101
}
102102

103-
void 'test getParameter'() {
103+
void 'test getParameter #iterationIndex'() {
104104
setup:
105105
final iastModule = Mock(PropagationModule)
106106
InstrumentationBridge.registerIastModule(iastModule)
@@ -120,7 +120,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
120120
suite << testSuite()
121121
}
122122

123-
void 'test getParameterValues'() {
123+
void 'test getParameterValues #iterationIndex'() {
124124
setup:
125125
final iastModule = Mock(PropagationModule)
126126
InstrumentationBridge.registerIastModule(iastModule)
@@ -141,7 +141,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
141141
suite << testSuite()
142142
}
143143

144-
void 'test getParameterMap'() {
144+
void 'test getParameterMap #iterationIndex'() {
145145
setup:
146146
final iastModule = Mock(PropagationModule)
147147
InstrumentationBridge.registerIastModule(iastModule)
@@ -168,7 +168,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
168168
}
169169

170170

171-
void 'test getParameterNames'() {
171+
void 'test getParameterNames #iterationIndex'() {
172172
setup:
173173
final iastModule = Mock(PropagationModule)
174174
InstrumentationBridge.registerIastModule(iastModule)
@@ -189,7 +189,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
189189
suite << testSuite()
190190
}
191191

192-
void 'test getCookies'() {
192+
void 'test getCookies #iterationIndex'() {
193193
setup:
194194
final iastModule = Mock(PropagationModule)
195195
InstrumentationBridge.registerIastModule(iastModule)
@@ -210,7 +210,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
210210
suite << testSuite()
211211
}
212212

213-
void 'test that get headers does not fail when servlet related code fails'() {
213+
void 'test that get headers does not fail when servlet related code fails #iterationIndex'() {
214214
setup:
215215
final iastModule = Mock(PropagationModule)
216216
InstrumentationBridge.registerIastModule(iastModule)
@@ -238,7 +238,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
238238
suite << testSuite()
239239
}
240240

241-
void 'test that get header names does not fail when servlet related code fails'() {
241+
void 'test that get header names does not fail when servlet related code fails #iterationIndex'() {
242242
setup:
243243
final iastModule = Mock(PropagationModule)
244244
InstrumentationBridge.registerIastModule(iastModule)
@@ -266,7 +266,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
266266
suite << testSuite()
267267
}
268268

269-
void 'test get query string'() {
269+
void 'test get query string #iterationIndex'() {
270270
setup:
271271
final iastModule = Mock(PropagationModule)
272272
InstrumentationBridge.registerIastModule(iastModule)
@@ -287,7 +287,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
287287
suite << testSuite()
288288
}
289289

290-
void 'test getInputStream'() {
290+
void 'test getInputStream #iterationIndex'() {
291291
setup:
292292
final iastModule = Mock(PropagationModule)
293293
InstrumentationBridge.registerIastModule(iastModule)
@@ -308,7 +308,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
308308
suite << testSuite()
309309
}
310310

311-
void 'test getReader'() {
311+
void 'test getReader #iterationIndex'() {
312312
setup:
313313
final iastModule = Mock(PropagationModule)
314314
InstrumentationBridge.registerIastModule(iastModule)
@@ -329,7 +329,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
329329
suite << testSuite()
330330
}
331331

332-
void 'test getRequestDispatcher'() {
332+
void 'test getRequestDispatcher #iterationIndex'() {
333333
setup:
334334
final iastModule = Mock(UnvalidatedRedirectModule)
335335
InstrumentationBridge.registerIastModule(iastModule)
@@ -351,7 +351,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
351351
suite << testSuite()
352352
}
353353

354-
void 'test getRequestURI'() {
354+
void 'test getRequestURI #iterationIndex'() {
355355
setup:
356356
final iastModule = Mock(PropagationModule)
357357
InstrumentationBridge.registerIastModule(iastModule)
@@ -372,7 +372,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
372372
suite << testSuiteCallSites()
373373
}
374374

375-
void 'test getPathInfo'() {
375+
void 'test getPathInfo #iterationIndex'() {
376376
setup:
377377
final iastModule = Mock(PropagationModule)
378378
InstrumentationBridge.registerIastModule(iastModule)
@@ -393,7 +393,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
393393
suite << testSuiteCallSites()
394394
}
395395

396-
void 'test getPathTranslated'() {
396+
void 'test getPathTranslated #iterationIndex'() {
397397
setup:
398398
final iastModule = Mock(PropagationModule)
399399
InstrumentationBridge.registerIastModule(iastModule)
@@ -414,7 +414,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
414414
suite << testSuiteCallSites()
415415
}
416416

417-
void 'test getRequestURL'() {
417+
void 'test getRequestURL #iterationIndex'() {
418418
setup:
419419
final iastModule = Mock(PropagationModule)
420420
InstrumentationBridge.registerIastModule(iastModule)
@@ -435,7 +435,7 @@ class JakartaHttpServletRequestInstrumentationTest extends AgentTestRunner {
435435
suite << testSuiteCallSites()
436436
}
437437

438-
void 'test getSession'() {
438+
void 'test getSession #iterationIndex'() {
439439
setup:
440440
final iastModule = Mock(ApplicationModule)
441441
InstrumentationBridge.registerIastModule(iastModule)

‎dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class AgentTestRunnerTest extends AgentTestRunner {
132132
noExceptionThrown()
133133
}
134134

135-
def "excluded classes are not instrumented"() {
135+
def "excluded classes are not instrumented #iterationIndex"() {
136136
when:
137137
runUnderTrace("parent") {
138138
subject.run()

‎dd-java-agent/testing/src/test/groovy/excludefilter/ExcludeFilterForkedTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import static excludefilter.ExcludeFilterTestInstrumentation.RunnableExcludedExe
1818

1919
class ExcludeFilterForkedTest extends AgentTestRunner {
2020

21-
def "test ExcludeFilter"() {
21+
def "test ExcludeFilter #runnable.class.name"() {
2222
expect:
2323
ExcludeFilter.exclude(RUNNABLE, runnable) == excluded
2424

0 commit comments

Comments
 (0)