From 53019a88f2c4ea4413e9a01bc121dd43e7354662 Mon Sep 17 00:00:00 2001
From: Ivan Vilata-i-Balaguer <ivan@selidor.net>
Date: Thu, 12 May 2016 09:51:56 +0200
Subject: [PATCH] Split latch count down and progress bar printing methods

---
 .../p2p/network/NetworkStressTest.java        | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 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 11c58fb840..49e90678fe 100644
--- a/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java
+++ b/network/src/test/java/io/bitsquare/p2p/network/NetworkStressTest.java
@@ -112,26 +112,30 @@ public class NetworkStressTest {
         return ret;
     }
 
-    /** Decrease latch count and print pending as a progress bar based on the given character. */
-    private void countDownAndPrint(CountDownLatch latch, char c) {
-        latch.countDown();
-        int remaining = (int)latch.getCount();
+    /** Print a progress bar based on the given character. */
+    private void printProgress(char c, int n) {
         long now = System.currentTimeMillis();
         if (now - lastProgressUpdateMillis < 500)
             return;  // throttle message printing below half a second
         lastProgressUpdateMillis = now;
-        if (remaining > 0) {
+        if (n > 0) {
             String hdr = String.format("\r%s> ", this.getClass().getSimpleName());
-            String msg = (hdr.length() - 1/*carriage return*/ + remaining + 1/*final space*/ > terminalColumns)
-                    ? String.format("%c*%d", c, remaining)
-                    : nChars(c, remaining);
+            String msg = (hdr.length() - 1/*carriage return*/ + n + 1/*final space*/ > terminalColumns)
+                    ? String.format("%c*%d", c, n)
+                    : nChars(c, n);
             System.out.print(hdr + msg + ' ');
         }
-        if (remaining == 1)
+        if (n == 1)
             System.out.print('\n');
         System.out.flush();
     }
 
+    /** Decrease latch count and print pending as a progress bar based on the given character. */
+    private void countDownAndPrint(CountDownLatch latch, char c) {
+        latch.countDown();
+        printProgress(c, (int)latch.getCount());
+    }
+
     @Before
     public void setUp() throws Exception {
         // Parse test parameter environment variables.