Merge "JERSEY-2218: "Clear jdk6/jdk7 specific test cases" Test can run on jdk6."

Author: Marek Potočiar

tests/integration/servlet-3-init-5/src/test/java/org/glassfish/jersey/tests/integration/servlet_3_init_5/HelloWorldResourceITCase.java

@@ -41,6 +41,7 @@
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
+import org.glassfish.jersey.test.TestProperties;
 import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
 import org.glassfish.jersey.test.spi.TestContainerException;
 import org.glassfish.jersey.test.spi.TestContainerFactory;
@@ -56,6 +57,8 @@ public class HelloWorldResourceITCase extends JerseyTest {
 
     @Override
     protected ResourceConfig configure() {
+        enable(TestProperties.LOG_TRAFFIC);
+
         return new ResourceConfig(HelloWorldResource.class);
     }
 

tests/integration/servlet-3-init-provider/pom.xml

@@ -59,7 +59,6 @@
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.ext</groupId>
@@ -80,28 +79,20 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
             <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>${skipTests}</skipTests>
-                    <systemPropertyVariables>
-                        <jersey.config.test.container.factory>${testContainerFactory}</jersey.config.test.container.factory>
-                        <jersey.config.test.container.port>${testContainerPort}</jersey.config.test.container.port>
-                    </systemPropertyVariables>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
 
-    <properties>
-        <skipTests>true</skipTests>
-        <testContainerFactory>org.glassfish.jersey.test.external.ExternalTestContainerFactory</testContainerFactory>
-        <testContainerPort>8080</testContainerPort>
-    </properties>
 </project>

tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/AbstractHelloWorldResource.java

@@ -47,8 +47,6 @@
  */
 public abstract class AbstractHelloWorldResource {
 
-    public static final String CONTEXT_ROOT = "/servlet-3-init-provider";
-
     public static final int NUMBER_OF_APPLICATIONS = 5;
 
     @GET

tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld5Resource.java

@@ -43,6 +43,7 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Context;
+import java.util.Enumeration;
 
 /**
  * @author Libor Kramolis (libor.kramolis at oracle.com)

tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestFilter.java

@@ -61,7 +61,7 @@ public void init(FilterConfig filterConfig) throws ServletException {
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        if (((HttpServletRequest)request).getRequestURI().startsWith(AbstractHelloWorldResource.CONTEXT_ROOT + "/application5")) {
+        if (((HttpServletRequest)request).getRequestURI().startsWith("/application5")) {
             request.setAttribute("FILTER", TestServletContainerProvider.TEST_FILTER);
         }
 

tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestServletContainerProvider.java

@@ -78,7 +78,7 @@ public void postInit(ServletContext servletContext, Set<Class<?>> classes, Set<S
     public void onRegister(ServletContext servletContext, Set<String> servletNames) throws ServletException {
         this.SERVLET_NAMES = servletNames;
 
-        servletContext.addFilter("TestFilter", TestFilter.class).
+        servletContext.addFilter(TEST_FILTER, TestFilter.class).
                 addMappingForServletNames(EnumSet.allOf(DispatcherType.class), false,
                         servletNames.toArray(new String[servletNames.size()]));
     }

tests/integration/servlet-3-init-provider/src/test/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/AbstractHelloWorldResourceTest.java

@@ -49,20 +49,13 @@
 import org.junit.Test;
 import org.junit.Assert;
 
-import java.net.URI;
 import javax.ws.rs.NotFoundException;
-import javax.ws.rs.core.UriBuilder;
 
 /**
  * @author Libor Kramolis (libor.kramolis at oracle.com)
  */
 public abstract class AbstractHelloWorldResourceTest extends JerseyTest {
 
-    @Override
-    protected URI getBaseUri() {
-        return UriBuilder.fromUri(super.getBaseUri()).path(AbstractHelloWorldResource.CONTEXT_ROOT).build();
-    }
-
     @Override
     protected ResourceConfig configure() {
         enable(TestProperties.LOG_TRAFFIC);

tests/integration/servlet-3-init-provider/src/test/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld1ResourceTest.java renamed to tests/integration/servlet-3-init-provider/src/test/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld1ResourceITCase.java

@@ -47,7 +47,7 @@
 /**
  * @author Libor Kramolis (libor.kramolis at oracle.com)
  */
-public class HelloWorld1ResourceTest extends AbstractHelloWorldResourceTest {
+public class HelloWorld1ResourceITCase extends AbstractHelloWorldResourceTest {
 
     protected Class<?> getResourceClass() {
         return HelloWorld1Resource.class;

tests/integration/servlet-3-init-provider/src/test/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld2ResourceTest.java renamed to tests/integration/servlet-3-init-provider/src/test/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld2ResourceITCase.java

@@ -42,7 +42,7 @@
 /**
  * @author Libor Kramolis (libor.kramolis at oracle.com)
  */
-public class HelloWorld2ResourceTest extends AbstractHelloWorldResourceTest {
+public class HelloWorld2ResourceITCase extends AbstractHelloWorldResourceTest {
 
     protected Class<?> getResourceClass() {
         return HelloWorld2Resource.class;

tests/integration/servlet-3-init-provider/src/test/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld3ResourceTest.java renamed to tests/integration/servlet-3-init-provider/src/test/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld3ResourceITCase.java

@@ -47,7 +47,7 @@
 /**
  * @author Libor Kramolis (libor.kramolis at oracle.com)
  */
-public class HelloWorld3ResourceTest extends AbstractHelloWorldResourceTest {
+public class HelloWorld3ResourceITCase extends AbstractHelloWorldResourceTest {
 
     protected Class<?> getResourceClass() {
         return HelloWorld3Resource.class;