This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dda4173d77d9fa278d9eca005549a55226b72ef9 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Tue Oct 16 16:30:57 2018 +0100 Rationalizing some code in the cdi systests --- ...tWarTest.java => AbstractBookStoreCdiTest.java} | 35 +++------------- .../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 46 +-------------------- .../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 47 +--------------------- .../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 46 +-------------------- 4 files changed, 11 insertions(+), 163 deletions(-) diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java similarity index 68% copy from systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java copy to systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java index f47b154..c5616a2 100644 --- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java +++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java @@ -16,38 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.systest.jaxrs.cdi.tomcat; +package org.apache.cxf.systest.jaxrs.cdi; import java.util.UUID; import javax.ws.rs.core.Form; import javax.ws.rs.core.Response; -import org.apache.cxf.jaxrs.model.AbstractResourceInfo; import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest; -import org.apache.cxf.systests.cdi.base.tomcat.AbstractTomcatServer; -import org.jboss.weld.environment.Container; -import org.jboss.weld.environment.tomcat.TomcatContainer; -import org.junit.BeforeClass; import org.junit.Test; -public class TomcatWarTest extends AbstractCdiSingleAppTest { - public static class EmbeddedTomcatServer extends AbstractTomcatServer { - public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class); - - public EmbeddedTomcatServer() { - super("/jaxrs_cdi", "/", PORT); - } - } - - @BeforeClass - public static void startServers() throws Exception { - AbstractResourceInfo.clearAllMaps(); - System.setProperty(Container.class.getName(), TomcatContainer.class.getName()); - assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatServer.class, true)); - createStaticBus(); - } +public abstract class AbstractBookStoreCdiTest extends AbstractCdiSingleAppTest { @Test public void testAddOneBookWithValidation() { @@ -58,14 +38,14 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest { .param("id", id)); assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus()); } - + @Test public void testResponseHasBeenReceivedWhenQueringAllBookAsAtomFeed() { Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").get(); assertEquals(Response.Status.OK.getStatusCode(), r.getStatus()); assertEquals("application/atom+xml", r.getMediaType().toString()); } - + @Test public void testBookHasBeenValidatedWhenPostedAsAtomFeed() { Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post( @@ -74,7 +54,7 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest { assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus()); } - + @Test public void testBookHasBeenCreatedWhenPostedAsAtomFeed() { Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post( @@ -85,9 +65,4 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest { assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus()); } - @Override - protected int getPort() { - return EmbeddedTomcatServer.PORT; - } - } diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java index d6545a4..0d9fb81 100644 --- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java +++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java @@ -18,22 +18,16 @@ */ package org.apache.cxf.systest.jaxrs.cdi.jetty; -import java.util.UUID; - -import javax.ws.rs.core.Form; -import javax.ws.rs.core.Response; - import org.apache.cxf.jaxrs.model.AbstractResourceInfo; -import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest; +import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest; import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer; import org.jboss.weld.environment.Container; import org.jboss.weld.environment.jetty.JettyContainer; import org.jboss.weld.environment.servlet.Listener; import org.junit.BeforeClass; -import org.junit.Test; -public class JettyEmbeddedTest extends AbstractCdiSingleAppTest { +public class JettyEmbeddedTest extends AbstractBookStoreCdiTest { public static class EmbeddedJettyServer extends AbstractJettyServer { public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); @@ -50,42 +44,6 @@ public class JettyEmbeddedTest extends AbstractCdiSingleAppTest { createStaticBus(); } - @Test - public void testAddOneBookWithValidation() { - final String id = UUID.randomUUID().toString(); - - Response r = createWebClient(getBasePath() + "/books").post( - new Form() - .param("id", id)); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus()); - } - - @Test - public void testResponseHasBeenReceivedWhenQueringAllBookAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").get(); - assertEquals(Response.Status.OK.getStatusCode(), r.getStatus()); - assertEquals("application/atom+xml", r.getMediaType().toString()); - } - - @Test - public void testBookHasBeenValidatedWhenPostedAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post( - new Form() - .param("name", "Book 1234")); - - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus()); - } - - @Test - public void testBookHasBeenCreatedWhenPostedAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post( - new Form() - .param("id", "1234") - .param("name", "Book 1234")); - - assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus()); - } - @Override protected int getPort() { return EmbeddedJettyServer.PORT; diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java index ab15677..b288169 100644 --- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java +++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java @@ -18,13 +18,8 @@ */ package org.apache.cxf.systest.jaxrs.cdi.jetty; -import java.util.UUID; - -import javax.ws.rs.core.Form; -import javax.ws.rs.core.Response; - import org.apache.cxf.jaxrs.model.AbstractResourceInfo; -import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest; +import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest; import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer; import org.jboss.weld.environment.Container; import org.jboss.weld.environment.jetty.JettyContainer; @@ -32,9 +27,8 @@ import org.jboss.weld.environment.servlet.Listener; import org.junit.BeforeClass; import org.junit.Ignore; -import org.junit.Test; -public class JettyWarTest extends AbstractCdiSingleAppTest { +public class JettyWarTest extends AbstractBookStoreCdiTest { @Ignore public static class EmbeddedJettyServer extends AbstractJettyServer { public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); @@ -51,44 +45,7 @@ public class JettyWarTest extends AbstractCdiSingleAppTest { assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); createStaticBus(); } - - @Test - public void testAddOneBookWithValidation() { - final String id = UUID.randomUUID().toString(); - - Response r = createWebClient(getBasePath() + "/books").post( - new Form() - .param("id", id)); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus()); - } - - @Test - public void testResponseHasBeenReceivedWhenQueringAllBookAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").get(); - assertEquals(Response.Status.OK.getStatusCode(), r.getStatus()); - assertEquals("application/atom+xml", r.getMediaType().toString()); - } - - @Test - public void testBookHasBeenValidatedWhenPostedAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post( - new Form() - .param("name", "Book 1234")); - - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus()); - } - - @Test - public void testBookHasBeenCreatedWhenPostedAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post( - new Form() - .param("id", "1234") - .param("name", "Book 1234")); - - assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus()); - } - @Override protected int getPort() { return EmbeddedJettyServer.PORT; } diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java index f47b154..a36f002 100644 --- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java +++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java @@ -18,21 +18,15 @@ */ package org.apache.cxf.systest.jaxrs.cdi.tomcat; -import java.util.UUID; - -import javax.ws.rs.core.Form; -import javax.ws.rs.core.Response; - import org.apache.cxf.jaxrs.model.AbstractResourceInfo; -import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest; +import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest; import org.apache.cxf.systests.cdi.base.tomcat.AbstractTomcatServer; import org.jboss.weld.environment.Container; import org.jboss.weld.environment.tomcat.TomcatContainer; import org.junit.BeforeClass; -import org.junit.Test; -public class TomcatWarTest extends AbstractCdiSingleAppTest { +public class TomcatWarTest extends AbstractBookStoreCdiTest { public static class EmbeddedTomcatServer extends AbstractTomcatServer { public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class); @@ -49,42 +43,6 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest { createStaticBus(); } - @Test - public void testAddOneBookWithValidation() { - final String id = UUID.randomUUID().toString(); - - Response r = createWebClient(getBasePath() + "/books").post( - new Form() - .param("id", id)); - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus()); - } - - @Test - public void testResponseHasBeenReceivedWhenQueringAllBookAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").get(); - assertEquals(Response.Status.OK.getStatusCode(), r.getStatus()); - assertEquals("application/atom+xml", r.getMediaType().toString()); - } - - @Test - public void testBookHasBeenValidatedWhenPostedAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post( - new Form() - .param("name", "Book 1234")); - - assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus()); - } - - @Test - public void testBookHasBeenCreatedWhenPostedAsAtomFeed() { - Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post( - new Form() - .param("id", "1234") - .param("name", "Book 1234")); - - assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus()); - } - @Override protected int getPort() { return EmbeddedTomcatServer.PORT;
