Merge "J-614 Hotfix - skipping problematic integration test"

Author: Marek Potociar

tests/integration/jersey-2136/pom.xml

@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -79,35 +79,40 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
+
+            <!-- TODO: The test was skipped, including the hooked app-engine start && stop. The app-engine process was sometimes
+            left hanging after the end of the build and kept blocking the port. -->
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>com.google.appengine</groupId>
-                <artifactId>appengine-maven-plugin</artifactId>
-                <version>${gae.version}</version>
-                <configuration>
-                    <port>${jersey.config.test.container.port}</port>
-                    <offline>true</offline>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>start-gae</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>devserver_start</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>stop-gae</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>devserver_stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>com.google.appengine</groupId>-->
+                <!--<artifactId>appengine-maven-plugin</artifactId>-->
+                <!--<version>${gae.version}</version>-->
+                <!--<configuration>-->
+
+                    <!--<port>${jersey.config.test.container.port}</port>-->
+                    <!--<offline>true</offline>-->
+                <!--</configuration>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>start-gae</id>-->
+                        <!--<phase>pre-integration-test</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>devserver_start</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                    <!--<execution>-->
+                        <!--<id>stop-gae</id>-->
+                        <!--<phase>post-integration-test</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>devserver_stop</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
         </plugins>
     </build>
 

tests/integration/jersey-2136/src/main/java/org/glassfish/jersey/tests/integration/jersey2136/Jersey2136.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

tests/integration/jersey-2136/src/test/java/org/glassfish/jersey/tests/integration/jersey2136/Jersey2136ITCase.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -48,6 +48,7 @@
 import org.glassfish.jersey.test.spi.TestContainerException;
 import org.glassfish.jersey.test.spi.TestContainerFactory;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -69,6 +70,11 @@ protected TestContainerFactory getTestContainerFactory() throws TestContainerExc
         return new ExternalTestContainerFactory();
     }
 
+    // This test requires app engine to be launched by a maven plugin,
+    // which was causing intermittent problems with hanging app engine process.
+    // After un-ignoring this test, make sure to uncomment the app engine plugin
+    // execution in the project's pom.xml
+    @Ignore
     @Test
     public void testGet() throws Exception {
         final Response response = target().request().get();