TestWithNetworkConnections: pick random TCP bind ports for each test …

…instance

This will hopefully reduce spurious test failures due to already bound ports.

This is a backport of 006c00a.

core/src/test/java/org/bitcoinj/testing/TestWithNetworkConnections.java

@@ -38,6 +38,7 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.Random;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -49,7 +50,9 @@
  * Utility class that makes it easy to work with mock NetworkConnections.
  */
 public class TestWithNetworkConnections {
+    protected static final int TCP_PORT_BASE = 10000 + new Random().nextInt(40000);
     public static final int PEER_SERVERS = 5;
+
     protected static final NetworkParameters UNITTEST = UnitTestParams.get();
     protected Context context;
     protected BlockStore blockStore;
@@ -130,7 +133,7 @@ public void connectionOpened() {
                     }
                 };
             }
-        }, new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000 + i));
+        }, new InetSocketAddress(InetAddress.getLoopbackAddress(), TCP_PORT_BASE + i));
         peerServers[i].startAsync();
         peerServers[i].awaitRunning();
     }

core/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java

@@ -119,7 +119,7 @@ public void run() {
 
     protected InboundMessageQueuer connectPeerWithoutVersionExchange(int id) throws Exception {
         Preconditions.checkArgument(id < PEER_SERVERS);
-        InetSocketAddress remoteAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000 + id);
+        InetSocketAddress remoteAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(), TCP_PORT_BASE + id);
         Peer peer = peerGroup.connectTo(remoteAddress).getConnectionOpenFuture().get();
         InboundMessageQueuer writeTarget = newPeerWriteTargetQueue.take();
         writeTarget.peer = peer;