Skip to content

Commit 36fb475

Browse files
smolasmola
authored
Fix test name uniqueness (#8023)
1 parent 7c67b63 commit 36fb475

File tree

10 files changed

+41
-65
lines changed

10 files changed

+41
-65
lines changed

‎dd-java-agent/instrumentation/hibernate/core-3.3/src/test/groovy/IastQueryInstrumentationTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class IastQueryInstrumentationTest extends AbstractHibernateTest {
2525
session.close()
2626
}
2727

28-
void 'test sql query'() {
28+
void 'test sql query [#iterationIndex] #queryString'() {
2929
given:
3030
final module = Mock(SqlInjectionModule)
3131
InstrumentationBridge.registerIastModule(module)
@@ -48,7 +48,7 @@ class IastQueryInstrumentationTest extends AbstractHibernateTest {
4848
'select * from value' | { Query query -> query.scroll(ScrollMode.FORWARD_ONLY) }
4949
}
5050

51-
void 'test hql query'() {
51+
void 'test hql query [#iterationIndex] #queryString'() {
5252
given:
5353
final module = Mock(SqlInjectionModule)
5454
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/IastQueryInstrumentationTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class IastQueryInstrumentationTest extends AbstractHibernateTest {
2525
session.close()
2626
}
2727

28-
void 'test sql query'() {
28+
void 'test sql query [#iterationIndex] #queryString'() {
2929
given:
3030
final module = Mock(SqlInjectionModule)
3131
InstrumentationBridge.registerIastModule(module)
@@ -48,7 +48,7 @@ class IastQueryInstrumentationTest extends AbstractHibernateTest {
4848
'select * from value' | { Query query -> query.scroll(ScrollMode.FORWARD_ONLY) }
4949
}
5050

51-
void 'test hql query'() {
51+
void 'test hql query [#iterationIndex] #queryString'() {
5252
given:
5353
final module = Mock(SqlInjectionModule)
5454
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/jackson-core/jackson-core-2.12/src/test/groovy/datadog/trace/instrumentation/jackson212/core/JsonParserInstrumentationTest.groovy‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
2121

2222
void 'test json parsing (tainted)'() {
2323
given:
24+
final target = JSON_STRING
2425
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
2526
final module = Mock(PropagationModule)
2627
InstrumentationBridge.registerIastModule(module)
@@ -38,13 +39,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
3839
1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
3940
1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
4041
0 * _
41-
42-
where:
43-
target << [JSON_STRING]
4442
}
4543
4644
void 'test json parsing (tainted but field names)'() {
4745
given:
46+
final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))
4847
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
4948
final module = Mock(PropagationModule)
5049
InstrumentationBridge.registerIastModule(module)
@@ -60,12 +59,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
6059
_ * module.taintObjectIfTainted(_, _)
6160
_ * module.findSource(_) >> source
6261
0 * _
63-
64-
where:
65-
target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))]
6662
}
6763
68-
void 'test json parsing (not tainted)'() {
64+
void 'test json parsing (not tainted) #iterationIndex'() {
6965
given:
7066
final module = Mock(PropagationModule)
7167
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/jackson-core/jackson-core-2.16/src/test/groovy/datadog/trace/instrumentation/jackson216/core/JsonParserInstrumentationTest.groovy‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
2121

2222
void 'test json parsing (tainted)'() {
2323
given:
24+
final target = JSON_STRING
2425
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
2526
final module = Mock(PropagationModule)
2627
InstrumentationBridge.registerIastModule(module)
@@ -39,13 +40,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
3940
1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
4041
1 * module.taintString(_, 'nested_array', source.origin, 'nested_array', JSON_STRING)
4142
0 * _
42-
43-
where:
44-
target << [JSON_STRING]
4543
}
4644
4745
void 'test json parsing (tainted but field names)'() {
4846
given:
47+
final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))
4948
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
5049
final module = Mock(PropagationModule)
5150
InstrumentationBridge.registerIastModule(module)
@@ -61,12 +60,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
6160
_ * module.taintObjectIfTainted(_, _)
6261
_ * module.findSource(_) >> source
6362
0 * _
64-
65-
where:
66-
target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))]
6763
}
6864
69-
void 'test json parsing (not tainted)'() {
65+
void 'test json parsing (not tainted) #iterationIndex'() {
7066
given:
7167
final module = Mock(PropagationModule)
7268
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/jackson-core/jackson-core-2.6/src/test/groovy/datadog/trace/instrumentation/jackson26/core/JsonParserInstrumentationTest.groovy‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
2121

2222
void 'test json parsing (tainted)'() {
2323
given:
24+
final target = JSON_STRING
2425
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
2526
final module = Mock(PropagationModule)
2627
InstrumentationBridge.registerIastModule(module)
@@ -38,13 +39,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
3839
1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
3940
1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
4041
0 * _
41-
42-
where:
43-
target << [JSON_STRING]
4442
}
4543
4644
void 'test json parsing (tainted but field names)'() {
4745
given:
46+
final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))
4847
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
4948
final module = Mock(PropagationModule)
5049
InstrumentationBridge.registerIastModule(module)
@@ -60,12 +59,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
6059
_ * module.taintObjectIfTainted(_, _)
6160
_ * module.findSource(_) >> source
6261
0 * _
63-
64-
where:
65-
target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))]
6662
}
6763
68-
void 'test json parsing (not tainted)'() {
64+
void 'test json parsing (not tainted) #iterationIndex'() {
6965
given:
7066
final module = Mock(PropagationModule)
7167
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/jackson-core/jackson-core-2.8/src/test/groovy/datadog/trace/instrumentation/jackson28/core/JsonParserInstrumentationTest.groovy‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
2121

2222
void 'test json parsing (tainted)'() {
2323
given:
24+
final target = JSON_STRING
2425
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
2526
final module = Mock(PropagationModule)
2627
InstrumentationBridge.registerIastModule(module)
@@ -38,13 +39,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
3839
1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
3940
1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
4041
0 * _
41-
42-
where:
43-
target << [JSON_STRING]
4442
}
4543
4644
void 'test json parsing (tainted but field names)'() {
4745
given:
46+
final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))
4847
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
4948
final module = Mock(PropagationModule)
5049
InstrumentationBridge.registerIastModule(module)
@@ -60,12 +59,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
6059
_ * module.taintObjectIfTainted(_, _)
6160
_ * module.findSource(_) >> source
6261
0 * _
63-
64-
where:
65-
target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))]
6662
}
6763
68-
void 'test json parsing (not tainted)'() {
64+
void 'test json parsing (not tainted) #iterationIndex'() {
6965
given:
7066
final module = Mock(PropagationModule)
7167
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/jackson-core/jackson-core-2/src/test/groovy/datadog/trace/instrumentation/jackson2/core/JsonParserInstrumentationTest.groovy‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
2121

2222
void 'test json parsing (tainted)'() {
2323
given:
24+
final target = JSON_STRING
2425
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
2526
final module = Mock(PropagationModule)
2627
InstrumentationBridge.registerIastModule(module)
@@ -38,13 +39,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
3839
1 * module.taintString(_, 'root', source.origin, 'root', JSON_STRING)
3940
1 * module.taintString(_, 'nested', source.origin, 'nested', JSON_STRING)
4041
0 * _
41-
42-
where:
43-
target << [JSON_STRING]
4442
}
4543
4644
void 'test json parsing (tainted but field names)'() {
4745
given:
46+
final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))
4847
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
4948
final module = Mock(PropagationModule)
5049
InstrumentationBridge.registerIastModule(module)
@@ -60,12 +59,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
6059
_ * module.taintObjectIfTainted(_, _)
6160
_ * module.findSource(_) >> source
6261
0 * _
63-
64-
where:
65-
target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))]
6662
}
6763
68-
void 'test json parsing (not tainted)'() {
64+
void 'test json parsing (not tainted) #iterationIndex'() {
6965
given:
7066
final module = Mock(PropagationModule)
7167
InstrumentationBridge.registerIastModule(module)

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
1919

2020
void 'test json parsing (tainted)'() {
2121
given:
22+
final target = JSON_STRING
2223
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
2324
final module = Mock(PropagationModule)
2425
InstrumentationBridge.registerIastModule(module)
@@ -37,13 +38,11 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
3738
1 * module.taintString(_, 'array_0', source.origin, _, JSON_STRING)
3839
1 * module.taintString(_, 'array_1', source.origin, _, JSON_STRING)
3940
0 * _
40-
41-
where:
42-
target << [JSON_STRING]
4341
}
4442
4543
void 'test json parsing (tainted but field names)'() {
4644
given:
45+
final target = new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))
4746
final source = new SourceImpl(origin: SourceTypes.REQUEST_BODY, name: 'body', value: JSON_STRING)
4847
final module = Mock(PropagationModule)
4948
InstrumentationBridge.registerIastModule(module)
@@ -62,12 +61,9 @@ class JsonParserInstrumentationTest extends AgentTestRunner {
6261
1 * module.taintString(_, 'array_0', source.origin, _, JSON_STRING)
6362
1 * module.taintString(_, 'array_1', source.origin, _, JSON_STRING)
6463
0 * _
65-
66-
where:
67-
target << [new ByteArrayInputStream(JSON_STRING.getBytes(Charset.defaultCharset()))]
6864
}
6965
70-
void 'test json parsing (not tainted)'() {
66+
void 'test json parsing (not tainted) #iterationIndex'() {
7167
given:
7268
final module = Mock(PropagationModule)
7369
InstrumentationBridge.registerIastModule(module)

‎dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class StringConcatFactoryCallSiteTest extends AgentTestRunner {
163163
0 * _
164164
}
165165

166-
void 'test string concat factory with primitives'() {
166+
void 'test string concat factory with primitives #iterationIndex'() {
167167
setup:
168168
final iastModule = Mock(StringModule)
169169
InstrumentationBridge.registerIastModule(iastModule)

0 commit comments

Comments
 (0)