This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new b35b0ea Fixing post-merge compilation issues
b35b0ea is described below
commit b35b0ea63e0eaa11a35e445a70b2d72b9e605f65
Author: reta <drreta@gmail.com>
AuthorDate: Sun Nov 1 12:08:35 2020 -0500
Fixing post-merge compilation issues
---
.../micrometer/MicrometerMetricsAutoConfigurationTest.java | 2 +-
.../micrometer/provider/DefaultExceptionClassProviderTest.java | 4 ++--
.../micrometer/provider/DefaultTimedAnnotationProviderTest.java | 4 ++--
.../cxf/metrics/micrometer/provider/StandardTagsProviderTest.java | 4 ++--
.../org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java | 4 ++--
.../org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java
b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java
index f43ff9d..b565997 100644
--- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java
+++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/micrometer/MicrometerMetricsAutoConfigurationTest.java
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertThrows;
public class MicrometerMetricsAutoConfigurationTest {
private final WebApplicationContextRunner runner = new WebApplicationContextRunner()
- .withBean(CxfProperties.class)
+ .withUserConfiguration(CxfProperties.class)
.withConfiguration(AutoConfigurations.of(
MetricsAutoConfiguration.class,
SimpleMetricsExportAutoConfiguration.class,
diff --git a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java
b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java
index 54b7543..46d0f04 100644
--- a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java
+++ b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultExceptionClassProviderTest.java
@@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.MockitoAnnotations.openMocks;
+import static org.mockito.MockitoAnnotations.initMocks;
public class DefaultExceptionClassProviderTest {
@@ -50,7 +50,7 @@ public class DefaultExceptionClassProviderTest {
@Before
public void setUp() {
- openMocks(this);
+ initMocks(this);
underTest = new DefaultExceptionClassProvider();
}
diff --git a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultTimedAnnotationProviderTest.java
b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultTimedAnnotationProviderTest.java
index 0229112..3f4c4f9 100644
--- a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultTimedAnnotationProviderTest.java
+++ b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/DefaultTimedAnnotationProviderTest.java
@@ -40,7 +40,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.MockitoAnnotations.openMocks;
+import static org.mockito.MockitoAnnotations.initMocks;
@SuppressWarnings({"unused"})
public class DefaultTimedAnnotationProviderTest {
@@ -60,7 +60,7 @@ public class DefaultTimedAnnotationProviderTest {
@Before
public void setUp() {
- openMocks(this);
+ initMocks(this);
underTest = new DefaultTimedAnnotationProvider();
doReturn(service).when(exchange).getService();
diff --git a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsProviderTest.java
b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsProviderTest.java
index a6e5529..2ed8dce 100644
--- a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsProviderTest.java
+++ b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsProviderTest.java
@@ -33,7 +33,7 @@ import org.mockito.Mock;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.MockitoAnnotations.openMocks;
+import static org.mockito.MockitoAnnotations.initMocks;
public class StandardTagsProviderTest {
@@ -53,7 +53,7 @@ public class StandardTagsProviderTest {
@Before
public void setUp() {
- openMocks(this);
+ initMocks(this);
underTest = new StandardTagsProvider(exceptionClassProvider, standardTags);
diff --git a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java
b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java
index 92a13b3..3159d02 100644
--- a/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java
+++ b/rt/features/metrics/src/test/java/org/apache/cxf/metrics/micrometer/provider/StandardTagsTest.java
@@ -34,7 +34,7 @@ import org.mockito.Mock;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.MockitoAnnotations.openMocks;
+import static org.mockito.MockitoAnnotations.initMocks;
public class StandardTagsTest {
@@ -65,7 +65,7 @@ public class StandardTagsTest {
@Before
public void setUp() {
- openMocks(this);
+ initMocks(this);
doReturn(exchange).when(request).getExchange();
doReturn(bindingOperationInfo).when(exchange).getBindingOperationInfo();
diff --git a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
index 7771653..895862b 100644
--- a/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
+++ b/systests/spring-boot/src/test/java/org/apache/cxf/systest/jaxrs/spring/boot/SpringJaxrsTest.java
@@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.system.OutputCaptureRule;
+import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@@ -66,7 +66,7 @@ import static org.assertj.core.api.Assertions.entry;
@ActiveProfiles("jaxrs")
public class SpringJaxrsTest {
@Rule
- public OutputCaptureRule output = new OutputCaptureRule();
+ public OutputCapture output = new OutputCapture();
@Autowired
private MeterRegistry registry;
|