Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E02AF200CE6 for ; Fri, 15 Sep 2017 11:43:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DECE21609D1; Fri, 15 Sep 2017 09:43:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3183F1609CF for ; Fri, 15 Sep 2017 11:43:07 +0200 (CEST) Received: (qmail 30475 invoked by uid 500); 15 Sep 2017 09:43:06 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 30466 invoked by uid 99); 15 Sep 2017 09:43:06 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Sep 2017 09:43:06 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 5126284EC5; Fri, 15 Sep 2017 09:43:03 +0000 (UTC) Date: Fri, 15 Sep 2017 09:43:03 +0000 To: "commits@cxf.apache.org" Subject: [cxf] branch master updated: adapted test to compile with Spring 5/ Spring Boot 2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150546858359.21009.6099086021708254992@gitbox.apache.org> From: deki@apache.org Reply-To: "commits@cxf.apache.org" X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: fde12db8708c45c7846a1c0a650591f50fa7344a X-Git-Newrev: 29a71e159c7979cda231807e322b109cbf1a849f X-Git-Rev: 29a71e159c7979cda231807e322b109cbf1a849f X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Fri, 15 Sep 2017 09:43:08 -0000 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 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" '].