Don't mix JUnit4 with JUunit5 in spring tests (#888)
This commit is contained in:
parent
2b8cc4a5ae
commit
515fdac34c
|
@ -20,15 +20,14 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
import io.opentelemetry.instrumentation.spring.httpclients.RestTemplateInterceptor;
|
import io.opentelemetry.instrumentation.spring.httpclients.RestTemplateInterceptor;
|
||||||
import io.opentelemetry.trace.Tracer;
|
import io.opentelemetry.trace.Tracer;
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.jupiter.api.DisplayName;
|
import org.junit.jupiter.api.DisplayName;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.junit.MockitoJUnitRunner;
|
import org.mockito.junit.jupiter.MockitoExtension;
|
||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
/** Spring bean post processor test {@link RestTemplateBeanPostProcessor} */
|
@ExtendWith(MockitoExtension.class)
|
||||||
@RunWith(MockitoJUnitRunner.class)
|
|
||||||
class RestTemplateBeanPostProcessorTest {
|
class RestTemplateBeanPostProcessorTest {
|
||||||
@Mock Tracer tracer;
|
@Mock Tracer tracer;
|
||||||
|
|
||||||
|
|
|
@ -20,15 +20,14 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
|
||||||
import io.opentelemetry.instrumentation.springwebflux.client.WebClientTracingFilter;
|
import io.opentelemetry.instrumentation.springwebflux.client.WebClientTracingFilter;
|
||||||
import io.opentelemetry.trace.Tracer;
|
import io.opentelemetry.trace.Tracer;
|
||||||
import org.junit.Test;
|
|
||||||
import org.junit.jupiter.api.DisplayName;
|
import org.junit.jupiter.api.DisplayName;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.junit.MockitoJUnitRunner;
|
import org.mockito.junit.jupiter.MockitoExtension;
|
||||||
import org.springframework.web.reactive.function.client.WebClient;
|
import org.springframework.web.reactive.function.client.WebClient;
|
||||||
|
|
||||||
/** Spring bean post processor test {@link WebClientBeanPostProcessor} */
|
@ExtendWith(MockitoExtension.class)
|
||||||
@RunWith(MockitoJUnitRunner.class)
|
|
||||||
class WebClientBeanPostProcessorTest {
|
class WebClientBeanPostProcessorTest {
|
||||||
|
|
||||||
@Mock Tracer tracer;
|
@Mock Tracer tracer;
|
||||||
|
|
Loading…
Reference in New Issue