Simplifying the Servlet and adding a test for POST

arun-gupta · arun-gupta · commit 17f92b38da34 · 2013-12-13T16:11:45.000-08:00
diff --git a/servlet/metadata-complete/src/main/java/org/javaee7/servlet/metadata/complete/TestServlet.java b/servlet/metadata-complete/src/main/java/org/javaee7/servlet/metadata/complete/TestServlet.java
@@ -40,7 +40,6 @@
 package org.javaee7.servlet.metadata.complete;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -52,67 +51,15 @@
  */
 @WebServlet(urlPatterns = "/RandomName")
 public class TestServlet extends HttpServlet {
-
-    /**
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
-     * methods.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
-        PrintWriter out = response.getWriter();
-        out.println("<!DOCTYPE html>");
-        out.println("<html>");
-        out.println("<head>");
-        out.println("<title>Servlet url-pattern in web.xml</title>");
-        out.println("</head>");
-        out.println("<body>");
-        out.println("<h1>Servlet url-pattern in web.xml</h1>");
-        out.println("</body>");
-        out.println("</html>");
-    }
-
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
-    /**
-     * Handles the HTTP <code>GET</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        processRequest(request, response);
+        response.getWriter().print("my GET");
     }
 
-    /**
-     * Handles the HTTP <code>POST</code> method.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        processRequest(request, response);
+        response.getWriter().print("my POST");
     }
-
-    /**
-     * Returns a short description of the servlet.
-     *
-     * @return a String containing servlet description
-     */
-    @Override
-    public String getServletInfo() {
-        return "Short description";
-    }// </editor-fold>
 }
diff --git a/servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java b/servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java
@@ -1,7 +1,9 @@
 package org.javaee7.servlet.metadata.complete;
 
+import com.gargoylesoftware.htmlunit.HttpMethod;
+import com.gargoylesoftware.htmlunit.TextPage;
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.WebRequest;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -11,6 +13,7 @@
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import static org.junit.Assert.*;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.xml.sax.SAXException;
@@ -25,6 +28,8 @@ public class TestServletTest {
 
     @ArquillianResource
     private URL base;
+    
+    WebClient webClient;
 
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
@@ -33,14 +38,22 @@ public static WebArchive createDeployment() {
                 addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml")));
         return war;
     }
+    
+    @Before
+    public void setup() {
+        webClient = new WebClient();
+    }
 
-    /**
-     * Test of processRequest method, of class TestServlet.
-     */
     @Test
     public void testGet() throws IOException, SAXException {
-        WebClient webClient = new WebClient();
-        HtmlPage page = webClient.getPage(base + "/TestServlet");
-        assertEquals("Servlet url-pattern in web.xml", page.getTitleText());
+        TextPage page = webClient.getPage(base + "/TestServlet");
+        assertEquals("my GET", page.getContent());
+    }
+
+    @Test
+    public void testPost() throws IOException, SAXException {
+        WebRequest request = new WebRequest(new URL(base + "/TestServlet"), HttpMethod.POST);
+        TextPage page = webClient.getPage(request);
+        assertEquals("my POST", page.getContent());
     }
 }
