Skip to content

Commit 310d00c

Browse files
authored
Use stubs instead of mocks (#8052)
1 parent 7698f2f commit 310d00c

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

dd-java-agent/instrumentation/grpc-1.5/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ dependencies {
4040
testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
4141
testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
4242
testImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
43-
testImplementation libs.bundles.mockito
4443

4544
latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes
4645
latestDepTestCompileOnly group: 'io.grpc', name: 'grpc-core', version: '1.+'

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcCodeOriginTest.groovy

+17-6
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@ import io.grpc.Server
1212
import io.grpc.inprocess.InProcessChannelBuilder
1313
import io.grpc.inprocess.InProcessServerBuilder
1414
import io.grpc.stub.StreamObserver
15-
import org.mockito.internal.util.MockUtil
1615

16+
import java.lang.reflect.Method
1717
import java.util.concurrent.CopyOnWriteArrayList
1818
import java.util.concurrent.Executors
1919
import java.util.concurrent.TimeUnit
2020
import java.util.concurrent.atomic.AtomicReference
2121

2222
import static datadog.trace.api.config.TraceInstrumentationConfig.*
23-
import org.mockito.Mockito
2423

2524
abstract class GrpcCodeOriginTest extends VersionedNamingTestBase {
26-
private CodeOriginRecorder codeOriginRecorder
25+
def codeOriginRecorder
2726

2827
@Override
2928
final String service() {
@@ -157,8 +156,7 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase {
157156
}.flatten().sort()
158157

159158

160-
def invocations = MockUtil.getInvocationContainer(codeOriginRecorder)
161-
assert invocations.invocations.stream().anyMatch { it.method.name == "captureCodeOrigin" }
159+
assert codeOriginRecorder.invoked
162160
assertTraces(2) {
163161
trace((hasClientMessageSpans() ? clientMessageCount * serverMessageCount : 0) + 1) {
164162
span {
@@ -253,7 +251,20 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase {
253251

254252
void codeOriginSetup() {
255253
injectSysConfig(CODE_ORIGIN_FOR_SPANS_ENABLED, "true", true)
256-
codeOriginRecorder = Mockito.mock(CodeOriginRecorder)
254+
codeOriginRecorder = new CodeOriginRecorder() {
255+
def invoked = false
256+
@Override
257+
String captureCodeOrigin(boolean entry) {
258+
invoked = true
259+
return "done"
260+
}
261+
262+
@Override
263+
String captureCodeOrigin(Method method, boolean entry) {
264+
invoked = true
265+
return "done"
266+
}
267+
}
257268
DebuggerContext.initCodeOrigin(codeOriginRecorder)
258269
}
259270
}

0 commit comments

Comments
 (0)