svn commit: r1781498 - in /jackrabbit/oak/trunk/oak-run: pom.xml src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java

[chetanm]

Author: chetanm
Date: Fri Feb  3 06:32:16 2017
New Revision: 1781498

URL: http://svn.apache.org/viewvc?rev=1781498&view=rev
Log:
OAK-5441 - Test failure: BasicServerTest.testServerOk() Address already in use

Switched to using TemporaryPort rule

Modified:
    jackrabbit/oak/trunk/oak-run/pom.xml
    
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java

Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1781498&r1=1781497&r2=1781498&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Fri Feb  3 06:32:16 2017
@@ -124,33 +124,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <id>reserve-network-port</id>
-            <goals>
-                <goal>reserve-network-port</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <portNames>
-                <portName>jetty.http.port</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <jetty.http.port>${jetty.http.port}</jetty.http.port>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>com.phasebash.jsdoc</groupId>
         <artifactId>jsdoc3-maven-plugin</artifactId>
         <version>1.1.0</version>
@@ -461,7 +434,13 @@
           <artifactId>oak-solr-osgi</artifactId> <!-- this is declared here to 
avoid having it in the jr2 profile too -->
           <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+          <groupId>org.apache.jackrabbit</groupId>
+          <artifactId>oak-commons</artifactId>
+          <version>${project.version}</version>
+          <type>test-jar</type>
+          <scope>test</scope>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>

Modified: 
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java?rev=1781498&r1=1781497&r2=1781498&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java
 Fri Feb  3 06:32:16 2017
@@ -23,16 +23,17 @@ import static org.junit.Assert.assertEqu
 import java.net.HttpURLConnection;
 import java.net.URL;
 
+import org.apache.jackrabbit.oak.commons.junit.TemporaryPort;
 import org.apache.jackrabbit.util.Base64;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 public class BasicServerTest {
 
-    private static int getPort() {
-        return Integer.getInteger("jetty.http.port", 8080);
-    }
+    @Rule
+    public final TemporaryPort temporaryPort = new TemporaryPort();
 
     private HttpServer server;
 
@@ -54,4 +55,8 @@ public class BasicServerTest {
         assertEquals(200, conn.getResponseCode());
     }
 
+    private int getPort() {
+        return temporaryPort.getPort();
+    }
+
 }