You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2017/09/15 09:43:03 UTC
[cxf] branch master updated: adapted test to compile with Spring 5/
Spring Boot 2
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 29a71e1 adapted test to compile with Spring 5/ Spring Boot 2
29a71e1 is described below
commit 29a71e159c7979cda231807e322b109cbf1a849f
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Fri Sep 15 11:42:52 2017 +0200
adapted test to compile with Spring 5/ Spring Boot 2
---
.../cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
index 1c375c1..eeefdf1 100644
--- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
+++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.spring.boot.autoconfigure;
+import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
@@ -29,9 +30,9 @@ import org.springframework.mock.web.MockServletContext;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertThat;
/**
@@ -71,7 +72,7 @@ public class CxfAutoConfigurationTests {
public void customPathWithTrailingSlash() {
load(CxfAutoConfiguration.class, "cxf.path=/valid/");
assertThat(this.context.getBean(ServletRegistrationBean.class).getUrlMappings(),
- contains("/valid/*"));
+ (Matcher) hasItem("/valid/*"));
}
@Test
@@ -80,7 +81,7 @@ public class CxfAutoConfigurationTests {
assertThat(this.context.getBeansOfType(ServletRegistrationBean.class).size(),
equalTo(1));
assertThat(this.context.getBean(ServletRegistrationBean.class).getUrlMappings(),
- contains("/valid/*"));
+ (Matcher) hasItem("/valid/*"));
}
@Test
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.apache.org>'].