programmatic servlet registration fix

servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/DynamicServlet.java

@@ -0,0 +1,23 @@
+package org.javaee7.servlet.programmatic.registration;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author OrelGenya
+ */
+public class DynamicServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.getWriter().print("dynamic GET");
+    }
+
+    @Override
+    public String getServletInfo() {
+        return "My dynamic awesome servlet!";
+    }
+}

servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/SimpleServletContextListener.java

@@ -0,0 +1,25 @@
+package org.javaee7.servlet.programmatic.registration;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletRegistration;
+import javax.servlet.annotation.WebListener;
+
+/**
+ * @author OrelGenya
+ */
+@WebListener
+public class SimpleServletContextListener implements ServletContextListener {
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+        System.out.println("Servlet context initialized: " + sce.getServletContext().getContextPath());
+        ServletRegistration.Dynamic registration = sce.getServletContext().addServlet("dynamic", DynamicServlet.class);
+        registration.addMapping("dynamic");
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+        System.out.println("Servlet context destroyed: " + sce.getServletContext().getContextPath());
+    }
+}

servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/ServletTest.java → servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/DynamicServletTest.java

@@ -1,29 +1,27 @@
 package org.javaee7.servlet.programmatic.registration;
 
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.HttpMethod;
 import com.gargoylesoftware.htmlunit.TextPage;
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebRequest;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
 import org.junit.runner.RunWith;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+
 /**
- * @author arungupta
+ * @author OrelGenya
  */
 @RunWith(Arquillian.class)
-public class ServletTest {
+public class DynamicServletTest {
 
     @ArquillianResource
     private URL base;
@@ -33,8 +31,8 @@ public class ServletTest {
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
         WebArchive war = ShrinkWrap.create(WebArchive.class).
-            addClass(ParentServlet.class).
-            addClass(ChildServlet.class);
+            addClass(DynamicServlet.class).
+            addClass(SimpleServletContextListener.class);
         return war;
     }
 
@@ -45,15 +43,7 @@ public void setup() {
 
     @Test
     public void testChildServlet() throws IOException, SAXException {
-        try {
-            webClient.getPage(base + "/ChildServlet");
-        } catch (FailingHttpStatusCodeException e) {
-            assertNotNull(e);
-            assertEquals(404, e.getStatusCode());
-            return;
-        }
-        fail("/ChildSevlet could be accessed with programmatic registration");
-        webClient.getPage(base + "/ParentServlet");
-        webClient.getPage(base + "/ChildServlet");
+        TextPage page = webClient.getPage(base + "dynamic");
+        assertEquals("dynamic GET", page.getContent());
     }
 }