From 30e980748d0fc521b8875999907f2307f75f9b32 Mon Sep 17 00:00:00 2001
From: Ivan Vilata-i-Balaguer <ivan@selidor.net>
Date: Mon, 25 Apr 2016 11:35:57 +0200
Subject: [PATCH] Make methods for seed node address and setup listener
 creation

This will ease redefining node type (Tor or localhost) and creating more nodes that can report setup result.
---
 .../p2p/network/NetworkStressTest.java        | 96 +++++++++++--------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java b/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java
index 6a0a457353..64850170f4 100644
--- a/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java
+++ b/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java
@@ -38,61 +38,73 @@ public class NetworkStressTest {
 
         // Create and start the seed node.
         seedNode = new SeedNode(tempDir.toString());
-        final NodeAddress seedNodeAddress = new NodeAddress("localhost:8002");
-        final boolean useLocalhost = true;
+        final NodeAddress seedNodeAddress = getSeedNodeAddress();
+        final boolean useLocalhost = seedNodeAddress.getFullAddress().startsWith("localhost:");
         final Set<NodeAddress> seedNodes = new HashSet<>(1);
         seedNodes.add(seedNodeAddress);  // the only seed node in tests
         seedNode.createAndStartP2PService(seedNodeAddress, useLocalhost,
                 2 /*regtest*/, true /*detailed logging*/, seedNodes,
-                new P2PServiceListener() {
-                    @Override
-                    public void onRequestingDataCompleted() {
-                        // do nothing
-                    }
-
-                    @Override
-                    public void onNoSeedNodeAvailable() {
-                        // expected, do nothing
-                    }
-
-                    @Override
-                    public void onNoPeersAvailable() {
-                        // expected, do nothing
-                    }
-
-                    @Override
-                    public void onBootstrapComplete() {
-                        // do nothing
-                    }
-
-                    @Override
-                    public void onTorNodeReady() {
-                        // do nothing
-                    }
-
-                    @Override
-                    public void onHiddenServicePublished() {
-                        // successful result
-                        pendingTasks.countDown();
-                    }
-
-                    @Override
-                    public void onSetupFailed(Throwable throwable) {
-                        // failed result
-                        setupFailed.set(true);
-                        pendingTasks.countDown();
-                    }
-                }
+                getSetupListener(setupFailed, pendingTasks)
         );
 
         // Wait for concurrent tasks to finish.
         pendingTasks.await();
 
-        // Check if nodes started correctly.
+        // Check if any node reported setup failure on start.
         if (setupFailed.get())
             throw new Exception("nodes failed to start");
     }
 
+    @NotNull
+    private static NodeAddress getSeedNodeAddress() {
+        return new NodeAddress("localhost:8002");
+    }
+
+    @NotNull
+    private static P2PServiceListener getSetupListener(
+            final BooleanProperty setupFailed,
+            final CountDownLatch pendingTasks) {
+        return new P2PServiceListener() {
+            @Override
+            public void onRequestingDataCompleted() {
+                // do nothing
+            }
+
+            @Override
+            public void onNoSeedNodeAvailable() {
+                // expected, do nothing
+            }
+
+            @Override
+            public void onNoPeersAvailable() {
+                // expected, do nothing
+            }
+
+            @Override
+            public void onBootstrapComplete() {
+                // do nothing
+            }
+
+            @Override
+            public void onTorNodeReady() {
+                // do nothing
+            }
+
+            @Override
+            public void onHiddenServicePublished() {
+                // successful result
+                pendingTasks.countDown();
+            }
+
+            @Override
+            public void onSetupFailed(Throwable throwable) {
+                // failed result
+                setupFailed.set(true);
+                pendingTasks.countDown();
+            }
+        };
+    }
+
     @After
     public void tearDown() throws InterruptedException, IOException {
         /** A barrier to wait for concurrent tasks. */