From 720c7de896e97c5a01aac61e9a7377cd1f30e76e Mon Sep 17 00:00:00 2001 From: kanovotn Date: Tue, 27 Sep 2016 12:53:27 +0200 Subject: [PATCH] Fix Jackson2Test - add javax.ws.rs.ext.Providers (#953) --- .../resteasy/test/providers/jackson2/Jackson2Test.java | 9 ++++----- .../test/providers/jackson2/javax.ws.rs.ext.Providers | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 testsuite/integration-tests/src/test/resources/org/jboss/resteasy/test/providers/jackson2/javax.ws.rs.ext.Providers diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/Jackson2Test.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/Jackson2Test.java index c6e76c405ea..083f8858a5e 100644 --- a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/Jackson2Test.java +++ b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/jackson2/Jackson2Test.java @@ -72,10 +72,10 @@ public interface Jackson2Proxy { public static Archive deploy() { WebArchive war = TestUtil.prepareArchive(Jackson2Test.class.getSimpleName()); war.addClass(Jackson2Test.class); + war.addAsResource(Jackson2Test.class.getPackage(), "javax.ws.rs.ext.Providers", "META-INF/services/javax.ws.rs.ext.Providers"); return TestUtil.finishContainerPrepare(war, null, Jackson2Resource.class, Jackson2Product.class, Jackson2XmlResource.class, Jackson2XmlProduct.class, Jackson2JAXBResource.class, - Jackson2XmlResourceWithJacksonAnnotation.class, Jackson2XmlResourceWithJAXB.class, - org.jboss.resteasy.plugins.providers.jackson.Jackson2JsonpInterceptor.class); + Jackson2XmlResourceWithJacksonAnnotation.class, Jackson2XmlResourceWithJAXB.class); } /** @@ -88,8 +88,7 @@ public static Archive deployJettison() { war.addAsManifestResource("jboss-deployment-structure-jackson-v2-jettison.xml", "jboss-deployment-structure.xml"); return TestUtil.finishContainerPrepare(war, null, Jackson2Resource.class, Jackson2Product.class, Jackson2XmlResource.class, Jackson2XmlProduct.class, Jackson2JAXBResource.class, - Jackson2XmlResourceWithJacksonAnnotation.class, Jackson2XmlResourceWithJAXB.class, - org.jboss.resteasy.plugins.providers.jackson.Jackson2JsonpInterceptor.class); + Jackson2XmlResourceWithJacksonAnnotation.class, Jackson2XmlResourceWithJAXB.class); } @Before @@ -148,7 +147,7 @@ public void testJacksonJsonp() throws Exception { String entity = response.readEntity(String.class); logger.info(entity); Assert.assertEquals(HttpResponseCodes.SC_OK, response.getStatus()); - Assert.assertEquals(TestUtil.getErrorMessageForKnownIssue("JBEAP-1168"), "foo({\"name\":\"Iphone\",\"id\":333})", entity); + Assert.assertEquals("The response entity content doesn't match the expected", "foo({\"name\":\"Iphone\",\"id\":333})", entity); response.close(); } diff --git a/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/test/providers/jackson2/javax.ws.rs.ext.Providers b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/test/providers/jackson2/javax.ws.rs.ext.Providers new file mode 100644 index 00000000000..97d1290f9be --- /dev/null +++ b/testsuite/integration-tests/src/test/resources/org/jboss/resteasy/test/providers/jackson2/javax.ws.rs.ext.Providers @@ -0,0 +1 @@ +org.jboss.resteasy.plugins.providers.jackson.Jackson2JsonpInterceptor