Skip to content

Commit deee7b8

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
committed
Fix IAST tests
1 parent 4d6445f commit deee7b8

File tree

29 files changed

+55
-46
lines changed

29 files changed

+55
-46
lines changed

‎dd-java-agent/agent-iast/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import net.ltgt.gradle.errorprone.CheckSeverity
33
plugins {
44
id 'com.gradleup.shadow'
55
id 'me.champeau.jmh'
6-
id 'java-test-fixtures'
76
id 'com.google.protobuf' version '0.8.18'
87
id 'net.ltgt.errorprone' version '3.1.0'
98
}
@@ -52,8 +51,8 @@ dependencies {
5251
implementation libs.moshi
5352
implementation libs.bundles.asm
5453

55-
testFixturesApi project(':dd-java-agent:instrumentation-testing')
56-
testFixturesApi project(':utils:test-utils')
54+
testImplementation project(':utils:test-utils')
55+
testImplementation project(':dd-java-agent:agent-bootstrap')
5756
testImplementation libs.bytebuddy
5857
testImplementation('org.skyscreamer:jsonassert:1.5.1')
5958
testImplementation libs.groovy.yaml

‎dd-java-agent/agent-iast/iast-testing/build.gradle‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apply from: "$rootDir/gradle/java.gradle"
2+
apply from: "$rootDir/gradle/version.gradle"
3+
4+
dependencies {
5+
implementation project(':dd-java-agent:agent-iast')
6+
7+
api project(':dd-java-agent:instrumentation-testing')
8+
api project(':utils:test-utils')
9+
}

dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastAgentTestRunner.groovy renamed to dd-java-agent/agent-iast/iast-testing/src/main/groovy/com/datadog/iast/test/IastAgentTestRunner.groovy

File renamed without changes.

dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastHttpServerTest.groovy renamed to dd-java-agent/agent-iast/iast-testing/src/main/groovy/com/datadog/iast/test/IastHttpServerTest.groovy

File renamed without changes.

dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy renamed to dd-java-agent/agent-iast/iast-testing/src/main/groovy/com/datadog/iast/test/IastRequestContextPreparationTrait.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ trait IastRequestContextPreparationTrait {
4343
}
4444

4545
static void iastSystemCleanup() {
46-
get().getSubscriptionService(RequestContextSlot.IAST).reset()
46+
datadog.trace.bootstrap.instrumentation.api.AgentTracer.get().getSubscriptionService(RequestContextSlot.IAST).reset()
4747
InstrumentationBridge.clearIastModules()
4848
}
4949

@@ -75,8 +75,8 @@ trait IastRequestContextPreparationTrait {
7575

7676
private static Logger withLogger(final String name) {
7777
final logger = LoggerFactory.getLogger(name)
78-
if (logger instanceof ch.qos.logback.classic.Logger) {
79-
((ch.qos.logback.classic.Logger) logger).level = ch.qos.logback.classic.Level.DEBUG
78+
if (logger instanceof Logger) {
79+
((Logger) logger).level = ch.qos.logback.classic.Level.DEBUG
8080
}
8181
return logger
8282
}

dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastRequestTestRunner.groovy renamed to dd-java-agent/agent-iast/iast-testing/src/main/groovy/com/datadog/iast/test/IastRequestTestRunner.groovy

File renamed without changes.

dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/IastSourcesTest.groovy renamed to dd-java-agent/agent-iast/iast-testing/src/main/groovy/com/datadog/iast/test/IastSourcesTest.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ abstract class IastSourcesTest<SERVER> extends IastHttpServerTest<SERVER> {
1414
void 'test header source'() {
1515
when:
1616
final url = "${address}/iast/sources/header"
17-
final request = new Request.Builder().url(url).header('name', 'value').get().build()
17+
final request = new Builder().url(url).header('name', 'value').get().build()
1818
final response = client.newCall(request).execute()
1919

2020
then:
@@ -34,7 +34,7 @@ abstract class IastSourcesTest<SERVER> extends IastHttpServerTest<SERVER> {
3434
void 'test cookie source'() {
3535
when:
3636
final url = "${address}/iast/sources/cookie"
37-
final request = new Request.Builder().url(url).header('Cookie', 'name=value').get().build()
37+
final request = new Builder().url(url).header('Cookie', 'name=value').get().build()
3838
final response = client.newCall(request).execute()
3939

4040
then:
@@ -54,7 +54,7 @@ abstract class IastSourcesTest<SERVER> extends IastHttpServerTest<SERVER> {
5454
void 'test path source'() {
5555
when:
5656
final url = "${address}/iast/sources/path/value"
57-
final request = new Request.Builder().url(url).get().build()
57+
final request = new Builder().url(url).get().build()
5858
final response = client.newCall(request).execute()
5959

6060
then:
@@ -74,7 +74,7 @@ abstract class IastSourcesTest<SERVER> extends IastHttpServerTest<SERVER> {
7474
void 'test parameter source'() {
7575
when:
7676
final url = "${address}/iast/sources/parameter?name=value"
77-
final request = new Request.Builder().url(url).get().build()
77+
final request = new Builder().url(url).get().build()
7878
final response = client.newCall(request).execute()
7979

8080
then:
@@ -94,8 +94,8 @@ abstract class IastSourcesTest<SERVER> extends IastHttpServerTest<SERVER> {
9494
void 'test form source'() {
9595
when:
9696
final url = "${address}/iast/sources/form"
97-
final body = new FormBody.Builder().add('name', 'value').build()
98-
final request = new Request.Builder().url(url).post(body).build()
97+
final body = new Builder().add('name', 'value').build()
98+
final request = new Builder().url(url).post(body).build()
9999
final response = client.newCall(request).execute()
100100

101101
then:
@@ -116,7 +116,7 @@ abstract class IastSourcesTest<SERVER> extends IastHttpServerTest<SERVER> {
116116
when:
117117
final url = "${address}/iast/sources/body/string"
118118
final body = RequestBody.create(MediaType.get('text/plain'), 'string_body')
119-
final request = new Request.Builder().url(url).post(body).build()
119+
final request = new Builder().url(url).post(body).build()
120120
final response = client.newCall(request).execute()
121121

122122
then:
@@ -137,7 +137,7 @@ abstract class IastSourcesTest<SERVER> extends IastHttpServerTest<SERVER> {
137137
when:
138138
final url = "${address}/iast/sources/body/json"
139139
final body = RequestBody.create(MediaType.get('application/json'), '{ "name": "value" }')
140-
final request = new Request.Builder().url(url).post(body).build()
140+
final request = new Builder().url(url).post(body).build()
141141
final response = client.newCall(request).execute()
142142

143143
then:

dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/NoopOverheadController.groovy renamed to dd-java-agent/agent-iast/iast-testing/src/main/groovy/com/datadog/iast/test/NoopOverheadController.groovy

File renamed without changes.

dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/TaintMarkerHelpers.groovy renamed to dd-java-agent/agent-iast/iast-testing/src/main/groovy/com/datadog/iast/test/TaintMarkerHelpers.groovy

File renamed without changes.

dd-java-agent/agent-iast/src/testFixtures/groovy/com/datadog/iast/test/TaintedObjectCollection.groovy renamed to dd-java-agent/agent-iast/iast-testing/src/main/groovy/com/datadog/iast/test/TaintedObjectCollection.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@ class TaintedObjectCollection {
5454
} else if (obj instanceof Pattern) {
5555
valueMatcher = Matchers.matchesPattern(obj)
5656
} else {
57-
valueMatcher = equalTo(obj)
57+
valueMatcher = org.hamcrest.Matchers.equalTo(obj)
5858
}
5959
}
6060

6161
private static Matcher toMatcher(Object obj) {
6262
if (obj instanceof Matcher) {
6363
obj
6464
} else if (obj instanceof Pattern) {
65-
matchesPattern(obj)
65+
org.hamcrest.Matchers.matchesPattern(obj)
6666
} else if (obj == null) {
67-
nullValue()
67+
org.hamcrest.Matchers.nullValue()
6868
} else {
69-
equalTo(obj)
69+
org.hamcrest.Matchers.equalTo(obj)
7070
}
7171
}
7272

@@ -79,15 +79,15 @@ class TaintedObjectCollection {
7979
}
8080

8181
void range(int start, int length, SourceMatcher source) {
82-
ranges << new RangeMatcher(start, equalTo(length), source)
82+
ranges << new RangeMatcher(start, org.hamcrest.Matchers.equalTo(length), source)
8383
}
8484

8585
void range(int start, Matcher<Integer> length, SourceMatcher source) {
8686
ranges << new RangeMatcher(start, length, source)
8787
}
8888

8989
void range(SourceMatcher source) {
90-
ranges << new RangeMatcher(0, greaterThan(0), source)
90+
ranges << new RangeMatcher(0, org.hamcrest.Matchers.greaterThan(0), source)
9191
}
9292

9393
@Override

0 commit comments

Comments
 (0)