svn commit: r1134688 - in /camel/trunk/components/camel-test/src: main/java/org/apache/camel/test/AvailablePortFinder.java test/java/org/apache/camel/test/AvailablePortFinderTest.java

[tj...@apache.org]

Author: tjsnell
Date: Sat Jun 11 16:53:37 2011
New Revision: 1134688

URL: http://svn.apache.org/viewvc?rev=1134688&view=rev
Log:
Jira Camel-4091
Added syncronized and a couple of additional tests.


Modified:
    camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java
    camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java

Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java?rev=1134688&r1=1134687&r2=1134688&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java (original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/AvailablePortFinder.java Sat Jun 11 16:53:37 2011
@@ -22,6 +22,7 @@ import java.net.ServerSocket;
 import java.util.NoSuchElementException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+
 /**
  * Finds currently available server ports.
  *
@@ -59,7 +60,7 @@ public final class AvailablePortFinder {
      *
      * @throws NoSuchElementException if there are no ports available
      */
-    public static int getNextAvailable() {
+    public synchronized static int getNextAvailable() {
         int next = getNextAvailable(currentMinPort.get());
         currentMinPort.set(next + 1);
         return next;
@@ -71,7 +72,7 @@ public final class AvailablePortFinder {
      * @param fromPort the currentMinPort to scan for availability
      * @throws NoSuchElementException if there are no ports available
      */
-    public static int getNextAvailable(int fromPort) {
+    public synchronized static int getNextAvailable(int fromPort) {
         if (fromPort < currentMinPort.get() || fromPort > MAX_PORT_NUMBER) {
             throw new IllegalArgumentException("Invalid start currentMinPort: " + fromPort);
         }

Modified: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java?rev=1134688&r1=1134687&r2=1134688&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java (original)
+++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/AvailablePortFinderTest.java Sat Jun 11 16:53:37 2011
@@ -19,6 +19,8 @@ package org.apache.camel.test;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.net.ServerSocket;
+
 public class AvailablePortFinderTest {
 
 
@@ -26,7 +28,25 @@ public class AvailablePortFinderTest {
     public void getNextAvailablePort() throws Exception {
         int p1 = AvailablePortFinder.getNextAvailable();
         int p2 = AvailablePortFinder.getNextAvailable();
-        Assert.assertTrue(p1 != p2);
+        Assert.assertFalse("Port " + p1 + " Port2 " + p2, p1 == p2);
+    }
+
+    @Test
+    public void testGetNextAvailablePortInt() throws Exception {
+        int p1 = AvailablePortFinder.getNextAvailable(9123);
+        int p2 = AvailablePortFinder.getNextAvailable(9123);
+        // these calls only check availability but don't mark the port as in use.
+        Assert.assertEquals(p1, p2);
+    }
+
+
+    @Test
+    public void testNotAvailablePort() throws Exception {
+        int p1 = AvailablePortFinder.getNextAvailable(11000);
+        ServerSocket socket = new ServerSocket(p1);
+        int p2 = AvailablePortFinder.getNextAvailable(p1);
+        Assert.assertFalse("Port " + p1 + " Port2 " + p2, p1 == p2);
+        socket.close();
     }
 
     @Test (expected = IllegalArgumentException.class)