Skip to content

Commit 9aad755

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
authored
Refactored JUnit4.Assume to @IgnoreIf or JUnit5.Assumptions. (#9369)
1 parent 0c9e66b commit 9aad755

File tree

25 files changed

+94
-96
lines changed

25 files changed

+94
-96
lines changed

‎dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceRedactionTest.groovy

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ import com.datadog.iast.model.Source
55
import com.datadog.iast.model.Vulnerability
66
import com.datadog.iast.model.VulnerabilityBatch
77
import com.datadog.iast.model.VulnerabilityType
8-
import com.squareup.moshi.*
8+
import com.squareup.moshi.FromJson
9+
import com.squareup.moshi.JsonAdapter
10+
import com.squareup.moshi.JsonReader
11+
import com.squareup.moshi.JsonWriter
12+
import com.squareup.moshi.Moshi
13+
import com.squareup.moshi.ToJson
14+
import com.squareup.moshi.Types
915
import datadog.trace.api.config.IastConfig
1016
import datadog.trace.api.iast.SourceTypes
11-
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
1217
import datadog.trace.test.util.DDSpecification
1318
import groovy.json.JsonOutput
1419
import groovy.json.JsonSlurper
1520
import groovy.yaml.YamlSlurper
16-
import org.junit.Assume
1721
import org.skyscreamer.jsonassert.JSONAssert
1822
import org.skyscreamer.jsonassert.JSONCompareMode
1923
import spock.lang.Shared
@@ -26,7 +30,8 @@ import java.util.regex.Pattern
2630
import static com.datadog.iast.model.json.EvidenceAdapter.RedactedValuePart
2731
import static com.datadog.iast.model.json.EvidenceAdapter.StringValuePart
2832
import static com.datadog.iast.model.json.EvidenceAdapter.TaintedValuePart
29-
33+
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
34+
import static org.junit.jupiter.api.Assumptions.assumeFalse
3035

3136
class EvidenceRedactionTest extends DDSpecification {
3237

@@ -80,7 +85,7 @@ class EvidenceRedactionTest extends DDSpecification {
8085

8186
void 'test #suite'() {
8287
given:
83-
Assume.assumeFalse("Ignored test", suite.ignored)
88+
assumeFalse(suite.ignored, "Ignored test")
8489
final type = suite.type == Type.SOURCES ? Types.newParameterizedType(List, Source) : VulnerabilityBatch
8590
final adapter = VulnerabilityEncoding.MOSHI.adapter(type)
8691

@@ -99,7 +104,7 @@ class EvidenceRedactionTest extends DDSpecification {
99104

100105
void 'test secure_marks #suite'() {
101106
given:
102-
Assume.assumeFalse("Ignored test", suite.ignored)
107+
assumeFalse(suite.ignored, "Ignored test")
103108
final type = VulnerabilityBatch
104109
final adapter = VulnerabilityEncoding.MOSHI.adapter(type)
105110

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import datadog.trace.api.iast.Taintable
1212
import datadog.trace.api.iast.VulnerabilityMarks
1313
import datadog.trace.api.iast.propagation.PropagationModule
1414
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
15-
import org.junit.Assume
1615
import spock.lang.Shared
1716

1817
import java.lang.ref.Reference
1918

19+
import static org.junit.jupiter.api.Assumptions.assumeFalse
2020
import static com.datadog.iast.taint.Ranges.highestPriorityRange
2121
import static datadog.trace.api.iast.VulnerabilityMarks.NOT_MARKED
2222

@@ -271,7 +271,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {
271271
void 'test taintIfTainted keeping ranges with a mark'() {
272272
given:
273273
def (type, target, input) = suite
274-
Assume.assumeFalse(target instanceof Taintable) // taintable does not support multiple ranges or marks
274+
assumeFalse(target instanceof Taintable) // taintable does not support multiple ranges or marks
275275
final method = "taint${type}IfTainted"
276276
final source = taintedSource()
277277
final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
@@ -323,7 +323,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {
323323
void 'test taintIfTainted not keeping ranges with a mark'() {
324324
given:
325325
def (type, target, input) = suite
326-
Assume.assumeFalse(target instanceof Taintable) // taintable does not support marks
326+
assumeFalse(target instanceof Taintable) // taintable does not support marks
327327
final method = "taint${type}IfTainted"
328328
final source = taintedSource()
329329
final ranges = [new Range(0, 1, source, NOT_MARKED), new Range(1, 1, source, NOT_MARKED)] as Range[]
@@ -381,7 +381,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {
381381
void 'test taintIfAnyTainted keeping ranges with a mark'() {
382382
given:
383383
def (type, target, input) = suite
384-
Assume.assumeFalse(target instanceof Taintable) // taintable does not support multiple ranges or marks
384+
assumeFalse(target instanceof Taintable) // taintable does not support multiple ranges or marks
385385
final method = "taint${type}IfAnyTainted"
386386
final inputs = ['test', input].toArray()
387387
final source = taintedSource()
@@ -435,7 +435,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {
435435
void 'test taintIfAnyTainted not keeping ranges with a mark'() {
436436
given:
437437
def (type, target, input) = suite
438-
Assume.assumeFalse(target instanceof Taintable) // taintable does not support marks
438+
assumeFalse(target instanceof Taintable) // taintable does not support marks
439439
final method = "taint${type}IfAnyTainted"
440440
final inputs = ['test', input].toArray()
441441
final source = taintedSource()

‎dd-java-agent/appsec/src/testFixtures/groovy/com/datadog/appsec/AppSecInactiveHttpServerTest.groovy

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,16 @@ import okhttp3.FormBody
1313
import okhttp3.HttpUrl
1414
import okhttp3.MultipartBody
1515
import okhttp3.Request
16-
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.*
17-
import static org.junit.Assume.assumeTrue
16+
17+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
18+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_URLENCODED
19+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.FORWARDED
20+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.MATRIX_PARAM
21+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM
22+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
23+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
24+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
25+
import static org.junit.jupiter.api.Assumptions.assumeTrue
1826

1927
abstract class AppSecInactiveHttpServerTest extends WithHttpServer {
2028

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ import okhttp3.MultipartBody
88
import okhttp3.Request
99
import okhttp3.RequestBody
1010
import okhttp3.Response
11+
import spock.lang.IgnoreIf
1112
import spock.lang.Shared
1213

1314
import java.util.concurrent.atomic.AtomicInteger
1415

15-
import static datadog.trace.agent.test.base.HttpServerTest.IG_ASK_FOR_RESPONSE_HEADER_TAGS_HEADER
1616
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
1717
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
1818
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
19-
import static org.junit.Assume.assumeTrue
2019

2120
abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttpTestWebServer> {
2221

@@ -119,9 +118,9 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttp
119118
TEST_WRITER.waitForTraces(totalInvocations)
120119
}
121120

121+
@IgnoreIf({ !instance.testBodyMultipart() })
122122
def 'test instrumentation gateway multipart request body — strict variant'() {
123123
setup:
124-
assumeTrue(testBodyMultipart())
125124
def body = new MultipartBody.Builder()
126125
.setType(MultipartBody.FORM)
127126
.addFormDataPart('a', 'x')
@@ -151,9 +150,8 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttp
151150
}
152151
}
153152

153+
@IgnoreIf({ !instance.testBodyJson()})
154154
def 'test instrumentation gateway json request body — spray variant'() {
155-
assumeTrue(testBodyJson())
156-
157155
setup:
158156
def url = HttpUrl.get(BODY_JSON.resolve(address)).newBuilder()
159157
.encodedQuery('variant=spray')

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
1-
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
2-
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
3-
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
4-
import static org.junit.Assume.assumeTrue
5-
61
import datadog.trace.agent.test.base.HttpServer
72
import datadog.trace.agent.test.base.HttpServerTest
83
import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions
94
import datadog.trace.agent.test.utils.ThreadUtils
105
import datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator
116
import okhttp3.HttpUrl
7+
import okhttp3.MediaType
128
import okhttp3.MultipartBody
139
import okhttp3.Request
1410
import okhttp3.RequestBody
1511
import okhttp3.Response
12+
import spock.lang.IgnoreIf
1613
import spock.lang.Shared
1714

1815
import java.util.concurrent.atomic.AtomicInteger
1916

17+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_JSON
18+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.BODY_MULTIPART
19+
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
20+
2021
abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttpTestWebServer> {
2122

2223
@Override
@@ -117,9 +118,9 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttp
117118
TEST_WRITER.waitForTraces(totalInvocations)
118119
}
119120

121+
@IgnoreIf({ !instance.testBodyMultipart() })
120122
def 'test instrumentation gateway multipart request body — strict variant'() {
121123
setup:
122-
assumeTrue(testBodyMultipart())
123124
def body = new MultipartBody.Builder()
124125
.setType(MultipartBody.FORM)
125126
.addFormDataPart('a', 'x')
@@ -149,16 +150,15 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<AkkaHttp
149150
}
150151
}
151152

153+
@IgnoreIf({ !instance.testBodyJson() })
152154
def 'test instrumentation gateway json request body — spray variant'() {
153-
assumeTrue(testBodyJson())
154-
155155
setup:
156156
def url = HttpUrl.get(BODY_JSON.resolve(address)).newBuilder()
157157
.encodedQuery('variant=spray')
158158
.build()
159159
def request = new Request.Builder()
160160
.url(url)
161-
.method('POST', RequestBody.create(okhttp3.MediaType.get('application/json'), '{"a":"x"}\n'))
161+
.method('POST', RequestBody.create(MediaType.get('application/json'), '{"a":"x"}\n'))
162162
.build()
163163
def response = client.newCall(request).execute()
164164
if (isDataStreamsEnabled()) {

‎dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/ExecutorInstrumentationTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor
2626
import java.util.concurrent.ThreadPoolExecutor
2727
import java.util.concurrent.TimeUnit
2828

29-
import static org.junit.Assume.assumeTrue
29+
import static org.junit.jupiter.api.Assumptions.assumeTrue
3030

3131
abstract class ExecutorInstrumentationTest extends AgentTestRunner {
3232

@@ -412,7 +412,7 @@ abstract class ExecutorInstrumentationTest extends AgentTestRunner {
412412
throw e.getCause()
413413
}
414414
}
415-
} catch (RejectedExecutionException e) {
415+
} catch (RejectedExecutionException ignored) {
416416
}
417417

418418
for (Future f : jobFutures) {

‎dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import java.util.concurrent.Future
1717
import java.util.concurrent.RejectedExecutionException
1818
import java.util.concurrent.TimeUnit
1919

20-
import static org.junit.Assume.assumeTrue
20+
import static org.junit.jupiter.api.Assumptions.assumeTrue
2121

2222
class NettyExecutorInstrumentationTest extends AgentTestRunner {
2323

@@ -222,7 +222,7 @@ class NettyExecutorInstrumentationTest extends AgentTestRunner {
222222
throw e.getCause()
223223
}
224224
}
225-
} catch (RejectedExecutionException e) {
225+
} catch (RejectedExecutionException ignored) {
226226
}
227227

228228
for (Future f : jobFutures) {

‎dd-java-agent/instrumentation/jetty-util/src/test/groovy/JettyExecutorInstrumentationTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import java.util.concurrent.Callable
1010
import java.util.concurrent.ExecutorService
1111
import java.util.concurrent.Executors
1212

13-
import static org.junit.Assume.assumeTrue
13+
import static org.junit.jupiter.api.Assumptions.assumeTrue
1414

1515
class JettyExecutorInstrumentationTest extends AgentTestRunner {
1616

‎dd-java-agent/instrumentation/liberty-20/src/test/groovy/datadog/trace/instrumentation/liberty20/Liberty20Test.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import spock.lang.IgnoreIf
1414
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
1515
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
1616
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.TIMEOUT_ERROR
17-
import static org.junit.Assume.assumeTrue
1817

1918
abstract class Liberty20Test extends HttpServerTest<Server> {
2019

@@ -127,10 +126,9 @@ abstract class Liberty20Test extends HttpServerTest<Server> {
127126
true
128127
}
129128

129+
@IgnoreIf({ !instance.testBlockingOnResponse()})
130130
def 'test blocking on response with commit during the response'() {
131131
setup:
132-
assumeTrue(testBlockingOnResponse())
133-
134132
def request = request(SUCCESS, 'GET', null)
135133
.header(IG_BLOCK_RESPONSE_HEADER, 'json')
136134
.header('x-commit-during-response', 'true')

‎dd-java-agent/instrumentation/liberty-23/src/test/groovy/datadog/trace/instrumentation/liberty23/Liberty23Test.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import datadog.trace.core.DDSpan
99
import spock.lang.IgnoreIf
1010

1111
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
12-
import static org.junit.Assume.assumeTrue
1312

1413
abstract class Liberty23Test extends HttpServerTest<Server> {
1514

@@ -117,10 +116,9 @@ abstract class Liberty23Test extends HttpServerTest<Server> {
117116
true
118117
}
119118

119+
@IgnoreIf({ !instance.testBlockingOnResponse() })
120120
def 'test blocking on response with commit during the response'() {
121121
setup:
122-
assumeTrue(testBlockingOnResponse())
123-
124122
def request = request(SUCCESS, 'GET', null)
125123
.header(IG_BLOCK_RESPONSE_HEADER, 'json')
126124
.header('x-commit-during-response', 'true')

0 commit comments

Comments
 (0)