Repository: cxf Updated Branches: refs/heads/master 9505a3c7c -> e37c00d5c
Revert previous wrong commit "Change test to demostrate the real issue" (This reverts commit 9505a3c7c82691da2bad94459702a665b14420fa). Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aed1b1d4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aed1b1d4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aed1b1d4 Branch: refs/heads/master Commit: aed1b1d45ea12b1b1a7f083f756c27ed914ad9b7 Parents: 9505a3c Author: Jim Ma <[email protected]> Authored: Mon Apr 11 14:42:51 2016 +0800 Committer: Jim Ma <[email protected]> Committed: Mon Apr 11 14:45:12 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/cxf/systest/jaxrs/BookApplication2.java | 2 +- .../cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/aed1b1d4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java index c77e636..b424f7d 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookApplication2.java @@ -22,7 +22,7 @@ import javax.servlet.ServletContext; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Context; -@ApplicationPath("/thebooks2%21") +@ApplicationPath("/the%20books2") public class BookApplication2 extends BookApplication { public BookApplication2(@Context ServletContext sc) { super(sc); http://git-wip-us.apache.org/repos/asf/cxf/blob/aed1b1d4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java index 9bb5760..75e966e 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java @@ -39,7 +39,6 @@ import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; public class JAXRSClientServerNonSpringBookTest extends AbstractBusClientServerTestBase { @@ -181,10 +180,10 @@ public class JAXRSClientServerNonSpringBookTest extends AbstractBusClientServerT assertEquals("TheBook", r.getHeaderString("BookWriter")); } - @Ignore + @Test public void testGetBook123TwoApplications() throws Exception { doTestPerRequest("http://localhost:"; + PORT + "/application6/thebooks/bookstore2/bookheaders"); - doTestPerRequest("http://localhost:"; + PORT + "/application6/thebooks2!/bookstore2/book%20headers"); + doTestPerRequest("http://localhost:"; + PORT + "/application6/the%20books2/bookstore2/book%20headers"); } private Response doTestPerRequest(String address) throws Exception {
