Skip to content

Commit 4d76fed

Browse files
Fix test name uniqueness (#8020)
1 parent 36fb475 commit 4d76fed

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class LocalFSGitInfoExtractorTest extends DDSpecification {
5050
)
5151
}
5252

53-
def "test git info extraction for local fs"() {
53+
def "test git info extraction for local fs #gitFolder"() {
5454
setup:
5555
def sut = new LocalFSGitInfoExtractor()
5656

@@ -119,7 +119,7 @@ class LocalFSGitInfoExtractorTest extends DDSpecification {
119119
fullMessage == null
120120
}
121121

122-
def "test repository url with different remotes"() {
122+
def "test repository url with different remotes #gitFolder"() {
123123
setup:
124124
def sut = new LocalFSGitInfoExtractor()
125125

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ class SerializerTest extends Specification {
154154
this.b = b
155155
}
156156

157+
@Override
158+
String toString() {
159+
"$a / $b"
160+
}
161+
157162
boolean equals(o) {
158163
if (this.is(o)) {
159164
return true

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {
688688
}
689689

690690
private Date date(Source source = null, int mark = NOT_MARKED) {
691-
final result = new Date()
691+
final result = new Date(1234567890) // Use a fixed date
692692
if (source != null) {
693693
taintObject(result, source, mark)
694694
}

dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import datadog.trace.agent.test.AgentTestRunner
2+
import datadog.trace.agent.test.server.http.TestHttpServer
23
import datadog.trace.api.iast.InstrumentationBridge
34
import datadog.trace.api.iast.sink.SsrfModule
45
import org.apache.http.HttpHost
@@ -31,7 +32,7 @@ class IastHttpClientInstrumentationTest extends AgentTestRunner {
3132
}
3233
}
3334

34-
void 'test ssrf httpClient execute method with args #args expecting call module'() {
35+
void 'test ssrf httpClient execute method expecting call module #iterationIndex'() {
3536
given:
3637
final ssrf = Mock(SsrfModule)
3738
InstrumentationBridge.registerIastModule(ssrf)
@@ -68,7 +69,7 @@ class IastHttpClientInstrumentationTest extends AgentTestRunner {
6869
return new BasicHttpRequest("GET", server.address.toString())
6970
}
7071

71-
private static HttpHost getHttpHost(final server){
72+
private static HttpHost getHttpHost(final TestHttpServer server){
7273
return new HttpHost(server.address.host, server.address.port, server.address.scheme)
7374
}
7475
}

0 commit comments

Comments
 (0)