fixing tests based on primitives after upgrading to cxf 3.1
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/554ccb1c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/554ccb1c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/554ccb1c Branch: refs/heads/fb_tomee2_owb16 Commit: 554ccb1ce218ca2a0a72caf126088afcacefacc8 Parents: b27b5ea Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Wed May 6 10:43:28 2015 +0200 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Wed May 6 10:43:28 2015 +0200 ---------------------------------------------------------------------- .../cxf/rs/AdvancedProviderConfigTest.java | 14 +++++++---- .../server/cxf/rs/CustomContextTest.java | 15 +++++++---- .../cxf/rs/CustomSecurityContextTest.java | 26 ++++++++++++++------ .../rs/DynamicSubclassEjbDeploymentTest.java | 9 ++++--- .../server/cxf/rs/EjbDeploymentTest.java | 9 ++++--- .../openejb/server/cxf/rs/RsInjectionTest.java | 15 +++++++---- .../cxf/rs/RsInterceptorInjectionTest.java | 9 ++++++- .../server/cxf/rs/RsWithInterfaceTest.java | 12 +++++++-- .../server/cxf/rs/SimpleApplicationTest.java | 17 +++++++------ .../SimpleApplicationWithLongMappingTest.java | 11 +++++---- ...icationWithLongMappingWithNoAppPathTest.java | 11 +++++---- .../rs/SimpleApplicationWithMappingTest.java | 11 +++++---- .../openejb/server/cxf/rs/SingletonTest.java | 5 ++-- .../openejb/server/cxf/rs/SubResourceTest.java | 9 ++++++- server/openejb-cxf/pom.xml | 2 +- 15 files changed, 115 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java index 3710019..5893213 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/AdvancedProviderConfigTest.java @@ -27,7 +27,6 @@ import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.jee.oejb3.OpenejbJar; import org.apache.openejb.jee.oejb3.PojoDeployment; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.loader.IO; import org.apache.openejb.testing.Configuration; import org.apache.openejb.testing.EnableServices; import org.apache.openejb.testing.Module; @@ -38,18 +37,18 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import java.lang.annotation.Annotation; +import java.util.Properties; import javax.ejb.Singleton; import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Providers; import javax.xml.bind.ValidationEvent; import javax.xml.bind.ValidationEventHandler; import javax.xml.bind.annotation.XmlRootElement; -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.Properties; import static org.junit.Assert.assertEquals; @@ -101,7 +100,12 @@ public class AdvancedProviderConfigTest { @Test public void check() throws Exception { - assertEquals("true", IO.slurp(new URL("http://127.0.0.1:" + port + "/AdvancedProviderConfigTest/advanced-provider-config/"))); + assertEquals("true", ClientBuilder.newClient() + .target("http://127.0.0.1:" + port + "/AdvancedProviderConfigTest") + .path("advanced-provider-config") + .request() + .accept(MediaType.TEXT_PLAIN_TYPE) + .get(String.class)); } @Singleton http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java index 9fdd67b..c3845af 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java @@ -26,7 +26,6 @@ import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.jee.oejb3.OpenejbJar; import org.apache.openejb.jee.oejb3.PojoDeployment; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.loader.IO; import org.apache.openejb.testing.Configuration; import org.apache.openejb.testing.Module; import org.apache.openejb.testng.PropertiesBuilder; @@ -35,14 +34,15 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import java.io.IOException; +import java.util.Properties; import javax.ejb.Singleton; import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; -import java.io.IOException; -import java.net.URL; -import java.util.Properties; import static org.junit.Assert.assertEquals; @@ -83,7 +83,12 @@ public class CustomContextTest { @Test public void rest() throws IOException { - final String response = IO.slurp(new URL("http://127.0.0.1:" + port + "/CustomContextTest/custom-context/check")); + final String response = ClientBuilder.newClient() + .target("http://127.0.0.1:" + port + "/CustomContextTest") + .path("custom-context/check") + .request() + .accept(MediaType.TEXT_PLAIN_TYPE) + .get(String.class); assertEquals("true", response); } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomSecurityContextTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomSecurityContextTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomSecurityContextTest.java index 6129a06..9046254 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomSecurityContextTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomSecurityContextTest.java @@ -18,7 +18,6 @@ package org.apache.openejb.server.cxf.rs; import org.apache.openejb.jee.WebApp; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.loader.IO; import org.apache.openejb.testing.Classes; import org.apache.openejb.testing.Configuration; import org.apache.openejb.testing.EnableServices; @@ -30,17 +29,18 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import java.io.IOException; +import java.security.Principal; +import java.util.Properties; import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.ext.Provider; -import java.io.IOException; -import java.net.URL; -import java.security.Principal; -import java.util.Properties; import static org.junit.Assert.assertEquals; @@ -70,8 +70,20 @@ public class CustomSecurityContextTest { @Test public void check() throws IOException { - assertEquals("true", IO.slurp(new URL("http://localhost:" + port + "/foo/sc?role=therole"))); - assertEquals("false", IO.slurp(new URL("http://localhost:" + port + "/foo/sc?role=another"))); + assertEquals("true", ClientBuilder.newClient() + .target("http://127.0.0.1:" + port) + .path("foo/sc") + .queryParam("role", "therole") + .request() + .accept(MediaType.TEXT_PLAIN_TYPE) + .get(String.class)); + assertEquals("false", ClientBuilder.newClient() + .target("http://127.0.0.1:" + port) + .path("foo/sc") + .queryParam("role", "another") + .request() + .accept(MediaType.TEXT_PLAIN_TYPE) + .get(String.class)); } @Path("sc") http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java index f5273ec..5a6663a 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java @@ -38,6 +38,7 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.util.Properties; +import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -75,22 +76,22 @@ public class DynamicSubclassEjbDeploymentTest { @Test public void rest() { final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs") - .path("/ejb/rest").get(String.class); + .path("/ejb/rest").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("ok", response); } @Test public void restParameterInjected() { - String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").get(String.class); + String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("true", response); - response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").get(String.class); + response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("foo", response); } @Test public void restFieldInjected() { - final Boolean response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/field").get(Boolean.class); + final Boolean response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/field").accept(TEXT_PLAIN_TYPE).get(Boolean.class); assertEquals(true, response); } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java index ecc787d..7219d31 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java @@ -33,6 +33,7 @@ import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import java.util.Properties; @@ -71,22 +72,22 @@ public class EjbDeploymentTest { @Test public void rest() { - final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/rest").get(String.class); + final String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/rest").accept(MediaType.TEXT_PLAIN_TYPE).get(String.class); assertEquals("ok", response); } @Test public void restParameterInjected() { - String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").get(String.class); + String response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").accept(MediaType.TEXT_PLAIN_TYPE).get(String.class); assertEquals("true", response); - response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").get(String.class); + response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/param").query("arg", "foo").accept(MediaType.TEXT_PLAIN_TYPE).get(String.class); assertEquals("foo", response); } @Test public void restFieldInjected() { - final Boolean response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/field").get(Boolean.class); + final Boolean response = WebClient.create("http://localhost:" + port + "/openejb-cxf-rs").path("/ejb/field").accept(MediaType.TEXT_PLAIN_TYPE).get(Boolean.class); assertEquals(true, response); } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java index c3f51ce..ce10ef7 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java @@ -20,7 +20,6 @@ import org.apache.openejb.OpenEjbContainer; import org.apache.openejb.jee.Empty; import org.apache.openejb.jee.SingletonBean; import org.apache.openejb.junit.ApplicationComposer; -import org.apache.openejb.loader.IO; import org.apache.openejb.testing.Configuration; import org.apache.openejb.testing.Module; import org.apache.openejb.testng.PropertiesBuilder; @@ -29,16 +28,17 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import java.io.IOException; +import java.util.Properties; import javax.ejb.Singleton; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Providers; -import java.io.IOException; -import java.net.URL; -import java.util.Properties; import static org.junit.Assert.assertEquals; @@ -69,7 +69,12 @@ public class RsInjectionTest { @Test public void rest() throws IOException { - final String response = IO.slurp(new URL("http://127.0.0.1:" + port + "/RsInjectionTest/injections/check")); + final String response = ClientBuilder.newClient() + .target("http://127.0.0.1:" + port + "/RsInjectionTest/") + .path("injections/check") + .request() + .accept(MediaType.TEXT_PLAIN_TYPE) + .get(String.class); assertEquals("true", response); } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java index 3e7d546..99dde7a 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java @@ -39,8 +39,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.core.UriInfo; @@ -79,7 +81,12 @@ public class RsInterceptorInjectionTest { @Test public void rest() throws IOException { - final String response = IO.slurp(new URL("http://127.0.0.1:" + port + "/RsInterceptorInjectionTest/injections/check")); + final String response = ClientBuilder.newClient() + .target("http://127.0.0.1:" + port + "/RsInterceptorInjectionTest/") + .path("injections/check") + .request() + .accept(MediaType.TEXT_PLAIN_TYPE) + .get(String.class); assertEquals("true", response); } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java index 4f1439d..12de8b6 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java @@ -16,6 +16,7 @@ */ package org.apache.openejb.server.cxf.rs; +import org.apache.cxf.jaxrs.client.WebClient; import org.apache.openejb.OpenEjbContainer; import org.apache.openejb.junit.ApplicationComposer; import org.apache.openejb.loader.IO; @@ -31,8 +32,10 @@ import javax.ejb.Singleton; import javax.ws.rs.ApplicationPath; import javax.ws.rs.GET; import javax.ws.rs.Path; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Application; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.SecurityContext; import java.io.IOException; import java.net.URL; @@ -67,7 +70,12 @@ public class RsWithInterfaceTest { @Test public void rest() throws IOException { - final String response = IO.slurp(new URL("http://127.0.0.1:" + port + "/RsWithInterfaceTest/itf/check")); + final String response = ClientBuilder.newClient() + .target("http://127.0.0.1:" + port + "/RsWithInterfaceTest/") + .path("itf/check") + .request() + .accept(MediaType.TEXT_PLAIN_TYPE) + .get(String.class); assertEquals("true", response); } @@ -90,7 +98,7 @@ public class RsWithInterfaceTest { } } - public static interface Rs { + public interface Rs { @GET @Path("/check") boolean check(@Context final SecurityContext sc); http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java index c8dd5b5..444139a 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java @@ -48,6 +48,7 @@ import java.io.InputStreamReader; import java.io.StringWriter; import java.util.Properties; +import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -83,7 +84,7 @@ public class SimpleApplicationTest { @Test public void wadlXML() throws IOException { - final Response response = WebClient.create(BASE_URL).path("/first/hi").query("_wadl").query("_type", "xml").get(); + final Response response = WebClient.create(BASE_URL).path("/first/hi").query("_wadl").query("_type", "xml").accept(TEXT_PLAIN_TYPE).get(); final StringBuilder sb = new StringBuilder(); BufferedReader br = null; @@ -114,7 +115,7 @@ public class SimpleApplicationTest { @Test public void wadlJSON() throws IOException { - final Response response = WebClient.create(BASE_URL).path("/first/hi").query("_wadl").query("_type", "json").get(); + final Response response = WebClient.create(BASE_URL).path("/first/hi").query("_wadl").query("_type", "json").accept(TEXT_PLAIN_TYPE).get(); final StringBuilder sb = new StringBuilder(); BufferedReader br = null; @@ -140,19 +141,19 @@ public class SimpleApplicationTest { @Test public void first() { - final String hi = WebClient.create(BASE_URL).path("/first/hi").get(String.class); + final String hi = WebClient.create(BASE_URL).path("/first/hi").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("Hi from REST World!", hi); } @Test public void second() { - final String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").get(String.class); + final String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("hi 2nd", hi); } @Test public void expert() throws Exception { - final Response response = WebClient.create(BASE_URL).path("/expert/still-hi").post("Pink Floyd"); + final Response response = WebClient.create(BASE_URL).path("/expert/still-hi").accept(TEXT_PLAIN_TYPE).post("Pink Floyd"); assertEquals(HttpServletResponse.SC_OK, response.getStatus()); final InputStream is = (InputStream) response.getEntity(); @@ -166,16 +167,16 @@ public class SimpleApplicationTest { @Test(expected = WebApplicationException.class) public void nonListed() { - WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class); + WebClient.create(BASE_URL).path("/non-listed/yata/foo").accept(TEXT_PLAIN_TYPE).get(String.class); } @Test public void hooked() { - assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").get(Boolean.class)); + assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").accept(TEXT_PLAIN_TYPE).get(Boolean.class)); } @Test public void injectEjb() { - assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").get(Boolean.class)); + assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").accept(TEXT_PLAIN_TYPE).get(Boolean.class)); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java index f35eb45..0883c2e 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java @@ -41,6 +41,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Application; import java.util.Properties; +import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static org.junit.Assert.assertEquals; @EnableServices("jax-rs") @@ -76,28 +77,28 @@ public class SimpleApplicationWithLongMappingTest { @Test public void first() { - final String hi = WebClient.create(BASE_URL).path("/first/hi").get(String.class); + final String hi = WebClient.create(BASE_URL).path("/first/hi").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("Hi from REST World!", hi); } @Test public void second() { - final String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").get(String.class); + final String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("hi 2nd", hi); } @Test(expected = WebApplicationException.class) public void nonListed() { - WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class); + WebClient.create(BASE_URL).path("/non-listed/yata/foo").accept(TEXT_PLAIN_TYPE).get(String.class); } @Test public void hooked() { - assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").get(Boolean.class)); + assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").accept(TEXT_PLAIN_TYPE).get(Boolean.class)); } @Test public void injectEjb() { - assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").get(Boolean.class)); + assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").accept(TEXT_PLAIN_TYPE).get(Boolean.class)); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java index 69be2e6..f0ec6f7 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java @@ -41,6 +41,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Application; import java.util.Properties; +import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static org.junit.Assert.assertEquals; @EnableServices("jax-rs") @@ -79,28 +80,28 @@ public class SimpleApplicationWithLongMappingWithNoAppPathTest { @Test public void first() { - final String hi = WebClient.create(BASE_URL).path("/first/hi").get(String.class); + final String hi = WebClient.create(BASE_URL).path("/first/hi").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("Hi from REST World!", hi); } @Test public void second() { - final String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").get(String.class); + final String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("hi 2nd", hi); } @Test(expected = WebApplicationException.class) public void nonListed() { - WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class); + WebClient.create(BASE_URL).path("/non-listed/yata/foo").accept(TEXT_PLAIN_TYPE).get(String.class); } @Test public void hooked() { - assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").get(Boolean.class)); + assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").accept(TEXT_PLAIN_TYPE).get(Boolean.class)); } @Test public void injectEjb() { - assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").get(Boolean.class)); + assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").accept(TEXT_PLAIN_TYPE).get(Boolean.class)); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java index f878bc9..0817644 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java @@ -41,6 +41,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Application; import java.util.Properties; +import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static org.junit.Assert.assertEquals; @EnableServices("jax-rs") @@ -76,28 +77,28 @@ public class SimpleApplicationWithMappingTest { @Test public void first() { - final String hi = WebClient.create(BASE_URL).path("/first/hi").get(String.class); + final String hi = WebClient.create(BASE_URL).path("/first/hi").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("Hi from REST World!", hi); } @Test public void second() { - final String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").get(String.class); + final String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").accept(TEXT_PLAIN_TYPE).get(String.class); assertEquals("hi 2nd", hi); } @Test(expected = WebApplicationException.class) public void nonListed() { - WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class); + WebClient.create(BASE_URL).path("/non-listed/yata/foo").accept(TEXT_PLAIN_TYPE).get(String.class); } @Test public void hooked() { - assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").get(Boolean.class)); + assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").accept(TEXT_PLAIN_TYPE).get(Boolean.class)); } @Test public void injectEjb() { - assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").get(Boolean.class)); + assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").accept(TEXT_PLAIN_TYPE).get(Boolean.class)); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonTest.java index 593175a..bf76ecc 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SingletonTest.java @@ -36,6 +36,7 @@ import java.util.HashSet; import java.util.Set; import static java.util.Arrays.asList; +import static javax.ws.rs.core.MediaType.TEXT_PLAIN_TYPE; import static org.junit.Assert.assertEquals; @EnableServices("jax-rs") @@ -56,14 +57,14 @@ public class SingletonTest { @Test public void checkStateStays() { for (int i = 0; i < 3; i++) { - assertEquals(i, WebClient.create(base.toExternalForm() + "foo/foo").get(Integer.class).intValue()); + assertEquals(i, WebClient.create(base.toExternalForm() + "foo/foo").accept(TEXT_PLAIN_TYPE).get(Integer.class).intValue()); } } @Test public void checkCdiInjections() { for (int i = 0; i < 3; i++) { - assertEquals(i, WebClient.create(base.toExternalForm() + "foo/cdi").get(Integer.class).intValue()); + assertEquals(i, WebClient.create(base.toExternalForm() + "foo/cdi").accept(TEXT_PLAIN_TYPE).get(Integer.class).intValue()); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java index d996a5f..2283d6e 100644 --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java @@ -31,8 +31,10 @@ import org.junit.runner.RunWith; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; +import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.container.ResourceContext; import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; import java.io.IOException; import java.net.URL; import java.util.Properties; @@ -65,7 +67,12 @@ public class SubResourceTest { @Test public void rest() throws IOException { - final String response = IO.slurp(new URL("http://127.0.0.1:" + port + "/SubResourceTest/sub1/sub2/value")); + final String response = ClientBuilder.newClient() + .target("http://127.0.0.1:" + port + "/SubResourceTest/") + .path("sub1/sub2/value") + .request() + .accept(MediaType.TEXT_PLAIN_TYPE) + .get(String.class); assertEquals("2", response); } http://git-wip-us.apache.org/repos/asf/tomee/blob/554ccb1c/server/openejb-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml index 264844f..5f1e8a4 100644 --- a/server/openejb-cxf/pom.xml +++ b/server/openejb-cxf/pom.xml @@ -33,7 +33,7 @@ <name>OpenEJB :: Server :: CXF</name> <properties> - <wss4j.version>2.0.3</wss4j.version> + <wss4j.version>2.1.0</wss4j.version> <openejb.osgi.import.pkg> org.apache.xml.resolver*;resolution:=optional, *