This is an automated email from the ASF dual-hosted git repository. radcortez pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit b485d4b749965fdc7bf3d017a9a4a704742de910 Author: Roberto Cortez <[email protected]> AuthorDate: Wed Dec 26 19:16:27 2018 +0000 TOMEE-2365 - Refactored tests to be more scalable. --- ...letTest.java => AbstractTomEESecurityTest.java} | 45 ++++++---------------- .../security/servlet/BasicAuthServletTest.java | 41 ++++++++------------ .../tomee/security/servlet/SimpleServletTest.java | 29 ++++---------- 3 files changed, 34 insertions(+), 81 deletions(-) diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/AbstractTomEESecurityTest.java similarity index 52% copy from tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java copy to tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/AbstractTomEESecurityTest.java index 5d11cbc..7e80ce2 100644 --- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java +++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/AbstractTomEESecurityTest.java @@ -20,48 +20,27 @@ import org.apache.openejb.loader.JarLocation; import org.apache.openejb.util.NetworkUtil; import org.apache.tomee.embedded.Configuration; import org.apache.tomee.embedded.Container; -import org.junit.Test; +import org.junit.AfterClass; +import org.junit.BeforeClass; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; -import java.io.IOException; +public abstract class AbstractTomEESecurityTest { + protected static Container container; -import static org.junit.Assert.assertEquals; - -public class SimpleServletTest { - @Test - public void testWebApp() throws Exception { - try (Container container = new Container( + @BeforeClass + public static void setUp() throws Exception { + container = new Container( new Configuration() .conf("conf") .http(NetworkUtil.getNextAvailablePort()) .property("openejb.container.additional.exclude", "org.apache.tomee.security.") .property("openejb.additional.include", "tomee-")) .deployPathsAsWebapp( - JarLocation.jarLocation(SimpleServletTest.class), - JarLocation.jarLocation(TomEESecurityServletContainerInitializer.class))) { - - final Client client = ClientBuilder.newBuilder().build(); - final Response response = - client.target("http://localhost:"; + container.getConfiguration().getHttpPort() + "/servlet") - .request() - .get(); - assertEquals(200, response.getStatus()); - } + JarLocation.jarLocation(AbstractTomEESecurityTest.class), + JarLocation.jarLocation(TomEESecurityServletContainerInitializer.class)); } - @WebServlet(urlPatterns = "/servlet") - public static class TestServlet extends HttpServlet { - @Override - protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) - throws ServletException, IOException { - resp.getWriter().write("ok!"); - } + @AfterClass + public static void tearDown() throws Exception { + container.close(); } } diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java index b25f169..e0fd2c6 100644 --- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java +++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/BasicAuthServletTest.java @@ -16,10 +16,6 @@ */ package org.apache.tomee.security.servlet; -import org.apache.openejb.loader.JarLocation; -import org.apache.openejb.util.NetworkUtil; -import org.apache.tomee.embedded.Configuration; -import org.apache.tomee.embedded.Container; import org.apache.tomee.security.client.BasicAuthFilter; import org.junit.Test; @@ -36,31 +32,24 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; -public class BasicAuthServletTest { +public class BasicAuthServletTest extends AbstractTomEESecurityTest { @Test - public void testWebApp() throws Exception { - try (Container container = new Container( - new Configuration() - .conf("conf") - .http(NetworkUtil.getNextAvailablePort()) - .property("openejb.container.additional.exclude", "org.apache.tomee.security.") - .property("openejb.additional.include", "tomee-")) - .deployPathsAsWebapp( - JarLocation.jarLocation(SimpleServletTest.class), - JarLocation.jarLocation(TomEESecurityServletContainerInitializer.class))) { - - final String servlet = "http://localhost:"; + container.getConfiguration().getHttpPort() + "/basic"; + public void authenticate() throws Exception { + final String servlet = "http://localhost:"; + container.getConfiguration().getHttpPort() + "/basic"; + assertEquals(200, ClientBuilder.newBuilder().register(new BasicAuthFilter()).build() + .target(servlet) + .request() + .get().getStatus()); + } - assertEquals(401, ClientBuilder.newBuilder().build() - .target(servlet) - .request() - .get().getStatus()); + @Test + public void missingAuthorizationHeader() throws Exception { + final String servlet = "http://localhost:"; + container.getConfiguration().getHttpPort() + "/basic"; - assertEquals(200, ClientBuilder.newBuilder().register(new BasicAuthFilter()).build() - .target(servlet) - .request() - .get().getStatus()); - } + assertEquals(401, ClientBuilder.newBuilder().build() + .target(servlet) + .request() + .get().getStatus()); } @WebServlet(urlPatterns = "/basic") diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java index 5d11cbc..e45e2ed 100644 --- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java +++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/servlet/SimpleServletTest.java @@ -16,10 +16,6 @@ */ package org.apache.tomee.security.servlet; -import org.apache.openejb.loader.JarLocation; -import org.apache.openejb.util.NetworkUtil; -import org.apache.tomee.embedded.Configuration; -import org.apache.tomee.embedded.Container; import org.junit.Test; import javax.servlet.ServletException; @@ -34,26 +30,15 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; -public class SimpleServletTest { +public class SimpleServletTest extends AbstractTomEESecurityTest { @Test public void testWebApp() throws Exception { - try (Container container = new Container( - new Configuration() - .conf("conf") - .http(NetworkUtil.getNextAvailablePort()) - .property("openejb.container.additional.exclude", "org.apache.tomee.security.") - .property("openejb.additional.include", "tomee-")) - .deployPathsAsWebapp( - JarLocation.jarLocation(SimpleServletTest.class), - JarLocation.jarLocation(TomEESecurityServletContainerInitializer.class))) { - - final Client client = ClientBuilder.newBuilder().build(); - final Response response = - client.target("http://localhost:"; + container.getConfiguration().getHttpPort() + "/servlet") - .request() - .get(); - assertEquals(200, response.getStatus()); - } + final Client client = ClientBuilder.newBuilder().build(); + final Response response = + client.target("http://localhost:"; + container.getConfiguration().getHttpPort() + "/servlet") + .request() + .get(); + assertEquals(200, response.getStatus()); } @WebServlet(urlPatterns = "/servlet")
