cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [cxf] branch 3.2.x-fixes updated: Removing one test and fixing another to work with a HTTPClient upgrade
Date Tue, 19 Feb 2019 13:18:54 GMT
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
     new 05ee41d  Removing one test and fixing another to work with a HTTPClient upgrade
05ee41d is described below

commit 05ee41ddbaebf691e3b1a1d48a84eb9106e6cde5
Author: Colm O hEigeartaigh <coheigea@apache.org>
AuthorDate: Tue Feb 19 12:56:56 2019 +0000

    Removing one test and fixing another to work with a HTTPClient upgrade
    
    (cherry picked from commit ef0e6d380036354bb454c8c2239353b1240e68d4)
---
 .../test/java/org/apache/cxf/systest/jaxrs/Chapter.java   |  2 +-
 .../cxf/systest/jaxrs/JAXRSClientServerBookTest.java      | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java
index e09592b..da9c66c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Chapter.java
@@ -97,7 +97,7 @@ public class Chapter {
     }
 
     @GET
-    @Path("/matched%21uris")
+    @Path("/matched!uris")
     @Produces("text/plain")
     public String getMatchedUris(@Context UriInfo ui,
                                  @QueryParam("decode") String decode) {
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
index e63b515..0014381 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
@@ -2657,24 +2657,11 @@ public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase
{
                           + "bookstore/booksubresource/123/, "
                           + "bookstore]";
         getAndCompare("http://localhost:" + PORT + "/bookstore/"
-                      + "booksubresource/123/chapters/sub/1/matched%21uris?decode=true",
+                      + "booksubresource/123/chapters/sub/1/matched!uris?decode=true",
                       expected, "text/plain", "text/plain", 200);
     }
 
     @Test
-    public void testUriInfoMatchedUrisNoDecode() throws Exception {
-        //note '%21' instead of '!'
-        String expected = "[bookstore/booksubresource/123/chapters/sub/1/matched%21uris,
"
-            + "bookstore/booksubresource/123/chapters/sub/1/, "
-            + "bookstore/booksubresource/123/, "
-            + "bookstore]";
-        getAndCompare("http://localhost:" + PORT + "/bookstore/"
-                      + "booksubresource/123/chapters/sub/1/matched%21uris?decode=false",
-                      expected,
-                      "text/plain", "text/plain", 200);
-    }
-
-    @Test
     public void testQuotedHeaders() throws Exception {
 
         String endpointAddress =


Mime
View raw message