Correct tests: clear duplications.

3 files changed, 52 insertions, 51 deletions

diff --git a/test-bundles/war-with-servlet/src/main/java/test/BaseServlet.java b/test-bundles/war-with-servlet/src/main/java/test/BaseServlet.java
new file mode 100644
index 0000000..6d1a141
--- /dev/null
+++ b/test-bundles/war-with-servlet/src/main/java/test/BaseServlet.java
@@ -0,0 +1,48 @@
+/*******************************************************************************

+ * Copyright (c) 2014 SAP AG

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * and Apache License v2.0 which accompanies this distribution.

+ * The Eclipse Public License is available at

+ *   http://www.eclipse.org/legal/epl-v10.html

+ * and the Apache License v2.0 is available at

+ *   http://www.opensource.org/licenses/apache2.0.php.

+ * You may elect to redistribute this code under either of these licenses.

+ *

+ * Contributors:

+ *   Violeta Georgieva - initial contribution

+ *******************************************************************************/

+

+package test;

+

+import java.io.IOException;

+

+import javax.servlet.ServletException;

+import javax.servlet.http.HttpServlet;

+import javax.servlet.http.HttpServletRequest;

+import javax.servlet.http.HttpServletResponse;

+

+public class BaseServlet extends HttpServlet {

+

+    private static final long serialVersionUID = 1L;

+

+    /**

+     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)

+     */

+    @Override

+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

+        response.getWriter().println("path info: " + request.getPathInfo());

+        response.getWriter().println("servlet path: " + request.getServletPath());

+        response.getWriter().println("context path: " + request.getContextPath());

+    }

+

+    /**

+     * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)

+     */

+    @Override

+    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {

+        doGet(request, response);

+    }

+

+}
\ No newline at end of file
diff --git a/test-bundles/war-with-servlet/src/main/java/test/Bug53356Servlet.java b/test-bundles/war-with-servlet/src/main/java/test/Bug53356Servlet.java
index db4a80d..2af5dbb 100644
--- a/test-bundles/war-with-servlet/src/main/java/test/Bug53356Servlet.java
+++ b/test-bundles/war-with-servlet/src/main/java/test/Bug53356Servlet.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 SAP AG
+ * Copyright (c) 2012, 2014 SAP AG
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,39 +16,15 @@
 
 package test;
 
-import java.io.IOException;
-
-import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * Servlet covers bug - https://issues.apache.org/bugzilla/show_bug.cgi?id=53356 - Mapping a servlet to the
  * application's context root results in IAE
  */
 @WebServlet("")
-public class Bug53356Servlet extends HttpServlet {
+public class Bug53356Servlet extends BaseServlet {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.getWriter().println("path info: " + request.getPathInfo());
-        response.getWriter().println("servlet path: " + request.getServletPath());
-        response.getWriter().println("context path: " + request.getContextPath());
-    }
-
-    /**
-     * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
-     */
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        doGet(request, response);
-    }
-
 }
diff --git a/test-bundles/war-with-servlet/src/main/java/test/Bug53356Servlet1.java b/test-bundles/war-with-servlet/src/main/java/test/Bug53356Servlet1.java
index b603bf1..2271939 100644
--- a/test-bundles/war-with-servlet/src/main/java/test/Bug53356Servlet1.java
+++ b/test-bundles/war-with-servlet/src/main/java/test/Bug53356Servlet1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 SAP AG
+ * Copyright (c) 2012, 2014 SAP AG
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,39 +16,16 @@
 
 package test;
 
-import java.io.IOException;
 
-import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * Servlet covers bug - https://issues.apache.org/bugzilla/show_bug.cgi?id=53356 - Mapping a servlet to the
  * application's context root results in IAE
  */
 @WebServlet("/")
-public class Bug53356Servlet1 extends HttpServlet {
+public class Bug53356Servlet1 extends BaseServlet {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        response.getWriter().println("path info: " + request.getPathInfo());
-        response.getWriter().println("servlet path: " + request.getServletPath());
-        response.getWriter().println("context path: " + request.getContextPath());
-    }
-
-    /**
-     * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
-     */
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        doGet(request, response);
-    }
-
 }