From ce0c8c45a857c41d405db5fa2a3c39cf100f1f54 Mon Sep 17 00:00:00 2001 From: ValentinZakharov Date: Mon, 18 Dec 2023 16:29:58 +0100 Subject: [PATCH] Replaced unused Mocks with Stubs in Iast (#6377) --- .../datadog/iast/model/LocationTest.groovy | 4 ++-- .../iast/model/VulnerabilityTypeTest.groovy | 6 ++--- .../model/json/EvidenceRedactionTest.groovy | 6 ++--- .../json/VulnerabilityEncodingTest.groovy | 22 +++++++++---------- .../overhead/OverheadControllerTest.groovy | 2 +- .../iast/sink/AbstractSinkModuleTest.groovy | 4 ++-- .../sink/CommandInjectionModuleTest.groovy | 4 ++-- .../sink/HstsMissingHeaderModuleTest.groovy | 4 ++-- .../sink/HttpResponseHeaderModuleTest.groovy | 8 +++---- .../iast/sink/InsecureCookieModuleTest.groovy | 4 ++-- .../iast/sink/LdapInjectionModuleTest.groovy | 4 ++-- .../iast/sink/NoHttpCookieModuleTest.groovy | 4 ++-- .../sink/NoSameSiteCookieModuleTest.groovy | 4 ++-- .../iast/sink/PathTraversalModuleTest.groovy | 4 ++-- .../iast/sink/SqlInjectionModuleTest.groovy | 4 ++-- .../datadog/iast/sink/SsrfModuleTest.groovy | 4 ++-- .../TrustBoundaryViolationModuleTest.groovy | 4 ++-- .../sink/UnvalidatedRedirectModuleTest.groovy | 4 ++-- .../iast/sink/WeakCipherModuleTest.groovy | 2 +- .../iast/sink/WeakHashModuleTest.groovy | 2 +- .../iast/sink/WeakRandomnessModuleTest.groovy | 2 +- .../sink/XContentTypeOptionsModuleTest.groovy | 4 ++-- .../iast/sink/XPathInjectionModuleTest.groovy | 4 ++-- .../datadog/iast/sink/XssModuleTest.groovy | 4 ++-- .../com/datadog/iast/taint/RangesTest.groovy | 4 ++-- .../TaintedObjectsWithTelemetryTest.groovy | 8 +++---- .../iast/util/RangedDequeueTest.groovy | 2 +- 27 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/LocationTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/LocationTest.groovy index 656e4da309a..86ae0f51235 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/LocationTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/LocationTest.groovy @@ -7,7 +7,7 @@ class LocationTest extends DDSpecification { void 'forStack'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final stack = new StackTraceElement("declaringClass", "methodName", "fileName", 42) @@ -24,7 +24,7 @@ class LocationTest extends DDSpecification { void 'forSpanAndClassAndMethod'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final declaringClass = "declaringClass" diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/VulnerabilityTypeTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/VulnerabilityTypeTest.groovy index 408219c9000..a73041bd45a 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/VulnerabilityTypeTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/VulnerabilityTypeTest.groovy @@ -45,19 +45,19 @@ class VulnerabilityTypeTest extends DDSpecification { } private Location getSpanAndStackLocation(final long spanId) { - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) span.getSpanId() >> spanId return Location.forSpanAndStack(span, new StackTraceElement("foo", "foo", "foo", 1)) } private Location getSpanAndClassAndMethodLocation(final long spanId) { - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) span.getSpanId() >> spanId return Location.forSpanAndClassAndMethod(span, "foo", "foo") } private Location getSpanLocation(final long spanId, final String serviceName) { - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) span.getSpanId() >> spanId span.getServiceName() >> serviceName return Location.forSpan(span) diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceRedactionTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceRedactionTest.groovy index 255d531f819..a0387af6b6a 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceRedactionTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/EvidenceRedactionTest.groovy @@ -56,7 +56,7 @@ class EvidenceRedactionTest extends DDSpecification { void 'test empty value parts'() { given: - final writer = Mock(JsonWriter) + final writer = Stub(JsonWriter) final ctx = new AdapterFactory.Context() when: @@ -70,8 +70,8 @@ class EvidenceRedactionTest extends DDSpecification { new StringValuePart(null) | _ new StringValuePart('') | _ new RedactedValuePart(null) | _ - new TaintedValuePart(Mock(JsonAdapter), null, null, true) | _ - new TaintedValuePart(Mock(JsonAdapter), null, null, false) | _ + new TaintedValuePart(Stub(JsonAdapter), null, null, true) | _ + new TaintedValuePart(Stub(JsonAdapter), null, null, false) | _ } void 'test #suite'() { diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/VulnerabilityEncodingTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/VulnerabilityEncodingTest.groovy index 4ade1c08a8d..68bd622c135 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/VulnerabilityEncodingTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/model/json/VulnerabilityEncodingTest.groovy @@ -49,7 +49,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'one vulnerability'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -115,7 +115,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'one vulnerability with one source'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -160,7 +160,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'one vulnerability with two sources'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -214,7 +214,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'one vulnerability with null source'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -252,7 +252,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'one vulnerability with no source type'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -296,7 +296,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'two vulnerabilities with one shared source'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -363,7 +363,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'two vulnerability with no shared sources'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -434,7 +434,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'one truncated vulnerability'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -469,7 +469,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'two truncated vulnerabilities'() { given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -522,7 +522,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'when json is greater than 25kb VulnerabilityEncoding#getExceededTagSizeJson is called'(){ given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) final spanId = 123456 span.getSpanId() >> spanId final value = new VulnerabilityBatch() @@ -542,7 +542,7 @@ class VulnerabilityEncodingTest extends DDSpecification { void 'exception during serialization is caught'() { given: final value = new VulnerabilityBatch() - final type = Mock(VulnerabilityType) { + final type = Stub(VulnerabilityType) { name() >> { throw new RuntimeException("ERROR") } } final vuln = new Vulnerability(type, null, null) diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/overhead/OverheadControllerTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/overhead/OverheadControllerTest.groovy index e784643f909..0242c3b3c14 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/overhead/OverheadControllerTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/overhead/OverheadControllerTest.groovy @@ -141,7 +141,7 @@ class OverheadControllerTest extends DDSpecification { given: def taskSchedler = Stub(AgentTaskScheduler) def overheadController = OverheadController.build(Config.get(), taskSchedler) - def overheadContext = Mock(OverheadContext) + def overheadContext = Stub(OverheadContext) def iastRequestContext = Stub(IastRequestContext) iastRequestContext.getOverheadContext() >> overheadContext def requestContext = Stub(RequestContext) diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/AbstractSinkModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/AbstractSinkModuleTest.groovy index 2474abf88e9..3eefd6f7dee 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/AbstractSinkModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/AbstractSinkModuleTest.groovy @@ -24,10 +24,10 @@ class AbstractSinkModuleTest extends IastModuleImplTestBase { void setup() { ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getRequestContext() >> reqCtx } tracer.activeSpan() >> span diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/CommandInjectionModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/CommandInjectionModuleTest.groovy index 30b8adf5166..b039a2a8ca9 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/CommandInjectionModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/CommandInjectionModuleTest.groovy @@ -30,10 +30,10 @@ class CommandInjectionModuleTest extends IastModuleImplTestBase { module = new CommandInjectionModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy index 505776b3ea4..c59271f7495 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy @@ -29,10 +29,10 @@ class HstsMissingHeaderModuleTest extends IastModuleImplTestBase { InstrumentationBridge.registerIastModule(module) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HttpResponseHeaderModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HttpResponseHeaderModuleTest.groovy index f3e30e1e180..ae0d778f038 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HttpResponseHeaderModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HttpResponseHeaderModuleTest.groovy @@ -34,7 +34,7 @@ class HttpResponseHeaderModuleTest extends IastModuleImplTestBase { InstrumentationBridge.registerIastModule(new UnvalidatedRedirectModuleImpl(dependencies)) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } span = Mock(AgentSpan) { @@ -100,7 +100,7 @@ class HttpResponseHeaderModuleTest extends IastModuleImplTestBase { void 'exercise IastRequestController'(){ given: - final taintedObjects = Mock(TaintedObjects) + final taintedObjects = Stub(TaintedObjects) IastRequestContext ctx = new IastRequestContext(taintedObjects) when: @@ -112,8 +112,8 @@ class HttpResponseHeaderModuleTest extends IastModuleImplTestBase { void 'exercise IastRequestContext'(){ given: - final taintedObjects = Mock(TaintedObjects) - final iastMetricsCollector = Mock(IastMetricCollector) + final taintedObjects = Stub(TaintedObjects) + final iastMetricsCollector = Stub(IastMetricCollector) when: IastRequestContext ctx = new IastRequestContext(taintedObjects, iastMetricsCollector) diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureCookieModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureCookieModuleTest.groovy index b160f37a28b..6e54bc837cc 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureCookieModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureCookieModuleTest.groovy @@ -28,10 +28,10 @@ class InsecureCookieModuleTest extends IastModuleImplTestBase { InstrumentationBridge.registerIastModule(new InsecureCookieModuleImpl()) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/LdapInjectionModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/LdapInjectionModuleTest.groovy index 682e8dfef39..d53f6777b3b 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/LdapInjectionModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/LdapInjectionModuleTest.groovy @@ -30,10 +30,10 @@ class LdapInjectionModuleTest extends IastModuleImplTestBase { module = new LdapInjectionModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoHttpCookieModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoHttpCookieModuleTest.groovy index a246f30ee9f..16451b92cd6 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoHttpCookieModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoHttpCookieModuleTest.groovy @@ -28,10 +28,10 @@ class NoHttpCookieModuleTest extends IastModuleImplTestBase { InstrumentationBridge.registerIastModule(new NoHttpOnlyCookieModuleImpl()) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoSameSiteCookieModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoSameSiteCookieModuleTest.groovy index 4e32a9b7722..93ac0fc668a 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoSameSiteCookieModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/NoSameSiteCookieModuleTest.groovy @@ -28,10 +28,10 @@ class NoSameSiteCookieModuleTest extends IastModuleImplTestBase { InstrumentationBridge.registerIastModule(new NoSameSiteCookieModuleImpl()) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/PathTraversalModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/PathTraversalModuleTest.groovy index 6c25122e393..010048fcb38 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/PathTraversalModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/PathTraversalModuleTest.groovy @@ -30,10 +30,10 @@ class PathTraversalModuleTest extends IastModuleImplTestBase { module = new PathTraversalModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - final span = Mock(AgentSpan) { + final span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SqlInjectionModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SqlInjectionModuleTest.groovy index 69b30fe5ef3..74081826984 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SqlInjectionModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SqlInjectionModuleTest.groovy @@ -27,10 +27,10 @@ class SqlInjectionModuleTest extends IastModuleImplTestBase { module = new SqlInjectionModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - final span = Mock(AgentSpan) { + final span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SsrfModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SsrfModuleTest.groovy index c379cea4b8f..f9fd5a19666 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SsrfModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/SsrfModuleTest.groovy @@ -28,10 +28,10 @@ class SsrfModuleTest extends IastModuleImplTestBase { module = new SsrfModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/TrustBoundaryViolationModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/TrustBoundaryViolationModuleTest.groovy index a3fce16d195..3c34025a52e 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/TrustBoundaryViolationModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/TrustBoundaryViolationModuleTest.groovy @@ -28,10 +28,10 @@ class TrustBoundaryViolationModuleTest extends IastModuleImplTestBase { module = new TrustBoundaryViolationModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/UnvalidatedRedirectModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/UnvalidatedRedirectModuleTest.groovy index 5dabb12cc52..9b1c7922b2c 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/UnvalidatedRedirectModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/UnvalidatedRedirectModuleTest.groovy @@ -31,10 +31,10 @@ class UnvalidatedRedirectModuleTest extends IastModuleImplTestBase { module = new UnvalidatedRedirectModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - final span = Mock(AgentSpan) { + final span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakCipherModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakCipherModuleTest.groovy index 802df43ec28..2ddcf1ad0d5 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakCipherModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakCipherModuleTest.groovy @@ -68,7 +68,7 @@ class WeakCipherModuleTest extends IastModuleImplTestBase { void 'iast module not blocklisted cipher algorithm'(){ given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) tracer.activeSpan() >> span when: diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakHashModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakHashModuleTest.groovy index 2cfebb744e0..9ed42575290 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakHashModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakHashModuleTest.groovy @@ -49,7 +49,7 @@ class WeakHashModuleTest extends IastModuleImplTestBase { void 'iast module secure hash algorithm'(){ given: - final span = Mock(AgentSpan) + final span = Stub(AgentSpan) tracer.activeSpan() >> span when: diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakRandomnessModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakRandomnessModuleTest.groovy index fa3db3c8f19..3f52ec0f99d 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakRandomnessModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/WeakRandomnessModuleTest.groovy @@ -15,7 +15,7 @@ class WeakRandomnessModuleTest extends IastModuleImplTestBase { def setup() { module = new WeakRandomnessModuleImpl(dependencies) - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 } } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy index a8d377e968b..a26f28496c1 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy @@ -29,10 +29,10 @@ public class XContentTypeOptionsModuleTest extends IastModuleImplTestBase { InstrumentationBridge.registerIastModule(module) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - span = Mock(AgentSpan) { + span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XPathInjectionModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XPathInjectionModuleTest.groovy index 3638b6f431b..a73d0ac367f 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XPathInjectionModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XPathInjectionModuleTest.groovy @@ -26,10 +26,10 @@ class XPathInjectionModuleTest extends IastModuleImplTestBase { module = new XPathInjectionModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - final span = Mock(AgentSpan) { + final span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XssModuleTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XssModuleTest.groovy index bbebbceae97..7216e90658c 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XssModuleTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XssModuleTest.groovy @@ -29,10 +29,10 @@ class XssModuleTest extends IastModuleImplTestBase { module = new XssModuleImpl(dependencies) objectHolder = [] ctx = new IastRequestContext() - final reqCtx = Mock(RequestContext) { + final reqCtx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> ctx } - final span = Mock(AgentSpan) { + final span = Stub(AgentSpan) { getSpanId() >> 123456 getRequestContext() >> reqCtx } diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/RangesTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/RangesTest.groovy index 60525afa7e2..83d80b24511 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/RangesTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/taint/RangesTest.groovy @@ -73,7 +73,7 @@ class RangesTest extends DDSpecification { void 'test range provider'(final Object values, final List tainted, final int size, final int rangeCount) { setup: - final to = Mock(TaintedObjects) + final to = Stub(TaintedObjects) values.eachWithIndex { Object entry, int i -> to.get(entry) >> tainted.get(i) } @@ -100,7 +100,7 @@ class RangesTest extends DDSpecification { void 'test empty range provider'() { setup: - final to = Mock(TaintedObjects) + final to = Stub(TaintedObjects) final provider = rangesProviderFor(to, items) when: diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetryTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetryTest.groovy index 4029d1d00c7..6c16fcc1b44 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetryTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/telemetry/taint/TaintedObjectsWithTelemetryTest.groovy @@ -26,16 +26,16 @@ class TaintedObjectsWithTelemetryTest extends DDSpecification { void setup() { mockCollector = Mock(IastMetricCollector) - final iastCtx = Mock(IastRequestContext) { + final iastCtx = Stub(IastRequestContext) { getMetricCollector() >> mockCollector } - final ctx = Mock(RequestContext) { + final ctx = Stub(RequestContext) { getData(RequestContextSlot.IAST) >> iastCtx } - final span = Mock(AgentSpan) { + final span = Stub(AgentSpan) { getRequestContext() >> ctx } - final api = Mock(AgentTracer.TracerAPI) { + final api = Stub(AgentTracer.TracerAPI) { activeSpan() >> span } AgentTracer.forceRegister(api) diff --git a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/RangedDequeueTest.groovy b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/RangedDequeueTest.groovy index 4db41bc1dad..71e89bb2da4 100644 --- a/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/RangedDequeueTest.groovy +++ b/dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/util/RangedDequeueTest.groovy @@ -54,7 +54,7 @@ class RangedDequeueTest extends Specification { void 'test array based deque'() { given: - final ranged = Mock(Ranged) + final ranged = Stub(Ranged) final array = [ranged] as Ranged[] when: