Skip to content

Commit 588ea9b

Browse files
committed
fix mockito conversion issues
1 parent 579f962 commit 588ea9b

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void testTracingPropagatorContextInjection() {
6161

6262
propagator.inject(span, carrier, setter);
6363

64-
verify(injector).inject(any(DDSpanContext.class), same(carrier), any());
64+
verify(injector).inject(same((DDSpanContext) span.context()), same(carrier), any());
6565

6666
span.finish();
6767
tracer.close();
@@ -175,7 +175,7 @@ void testPropagationWhenTracingIsDisabled(
175175

176176
propagator.inject(span, carrier, setter);
177177

178-
verify(injector, times(injected)).inject(any(DDSpanContext.class), same(carrier), any());
178+
verify(injector, times(injected)).inject(same((DDSpanContext)span.context()), same(carrier), any());
179179

180180
span.finish();
181181
tracer.close();

dd-trace-core/src/test/java/datadog/trace/core/propagation/XRayHttpInjectorTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static java.util.Collections.singletonMap;
66
import static org.mockito.Mockito.clearInvocations;
77
import static org.mockito.Mockito.mock;
8+
import static org.mockito.Mockito.times;
89
import static org.mockito.Mockito.verify;
910
import static org.mockito.Mockito.verifyNoMoreInteractions;
1011
import static org.mockito.Mockito.when;
@@ -160,11 +161,14 @@ void injectHttpHeadersWithEndToEnd() {
160161
mockedContext.beginEndToEnd();
161162
injector.inject(mockedContext, carrier, MapSetter.INSTANCE);
162163

164+
// 2 calls: CoreTracer constructor + beginEndToEnd()
165+
verify(timeSource, times(2)).getCurrentTimeNanos();
166+
verify(timeSource, times(2)).getNanoTicks();
163167
verify(carrier)
164168
.put(
165169
"X-Amzn-Trace-Id",
166170
"Root=1-633c7675-000000000000000000000001;Parent=0000000000000002;_dd.origin=fakeOrigin;t0=1664906869195;k=v");
167-
verifyNoMoreInteractions(carrier);
171+
verifyNoMoreInteractions(timeSource, carrier);
168172

169173
tracer.close();
170174
}

0 commit comments

Comments
 (0)