From 500c6e94c1dbee44ee0784eeb36597d678d5aed5 Mon Sep 17 00:00:00 2001
From: Jesse Bickel <bickelj@gmail.com>
Date: Sat, 30 Jan 2016 12:38:10 -0600
Subject: [PATCH] Use a latch and communicate different test outcomes to user.

---
 test/org/jitsi/sctp4j/SctpTransferTest.java | 59 ++++++++++++---------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/test/org/jitsi/sctp4j/SctpTransferTest.java b/test/org/jitsi/sctp4j/SctpTransferTest.java
index 5d19fea20..7a75b621b 100644
--- a/test/org/jitsi/sctp4j/SctpTransferTest.java
+++ b/test/org/jitsi/sctp4j/SctpTransferTest.java
@@ -16,9 +16,11 @@
 package org.jitsi.sctp4j;
 
 import org.junit.*;
+import static org.junit.Assert.*;
 
 import java.io.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -37,17 +39,16 @@ public class SctpTransferTest
 
     private final int portB = 5001;
 
-    private final Object transferLock = new Object();
-
-    /** @GuardedBy("transferLock") */
     private byte[] receivedData = null;
 
-    /** @GuardedBy("transferLock") */
-    private boolean dataReady = false;
-
     /** Set random generator seed for consistent tests. */
     private static final Random rand = new Random(12345);
 
+    private final int ITERATIONS = 10;
+
+    /** how long to wait for data during lossy send. */
+    private final long SECONDS_TO_WAIT = 10;
+
     @Before
     public void setUp()
     {
@@ -94,11 +95,15 @@ public void testSocketBrokenLink()
         peerB.connect(portA);
 
         byte[] toSendA = createRandomData(2*1024);
-        for(int i=0; i < 10; i++)
+        for(int i=0; i < ITERATIONS; i++)
         {
+            System.out.println("Broken Link Test " + (i+1) + " of " 
+                               + ITERATIONS + 
+                               ". NOTE: IOExceptions may be visible " +
+                               "during this test, and are expected.");
             try
             {
-                testTransferPart(peerA, peerB, toSendA);
+                testTransferPart(peerA, peerB, toSendA, SECONDS_TO_WAIT);
             }
             catch (Exception e)
             {
@@ -108,37 +113,43 @@ public void testSocketBrokenLink()
     }
 
     private void testTransferPart(SctpSocket sender, SctpSocket receiver,
-                                  byte[] testData)
+                                  byte[] testData, long timeoutInSeconds)
         throws Exception
     {
+        final CountDownLatch dataReceivedLatch = new CountDownLatch(1);
+        boolean noTimeoutOccurred;
         receiver.setDataCallback(new SctpDataCallback()
         {
             @Override
             public void onSctpPacket(byte[] data, int sid, int ssn, int tsn,
                                      long ppid,
-                                     int context, int flags)
-            {
-                synchronized (transferLock)
-                {
-                    receivedData = data;
-                    dataReady = true;
-                    transferLock.notifyAll();
-                }
+                                     int context, int flags) {
+                receivedData = data;
+                dataReceivedLatch.countDown();
             }
         });
 
         sender.send(testData, true, 0, 0);
-
-        synchronized (transferLock)
+	try 
+        {
+            noTimeoutOccurred = dataReceivedLatch.await(timeoutInSeconds, 
+                                                        TimeUnit.SECONDS);
+            if (noTimeoutOccurred) {
+                assertArrayEquals(testData, receivedData);
+            } else {
+                fail("Test data did not get received within " +
+                     timeoutInSeconds + " seconds.");
+            }
+        } 
+        catch (InterruptedException ie) 
         {
-            while (!dataReady)
-                transferLock.wait();
-            assertArrayEquals(testData, receivedData);
-	    dataReady = false;
+            fail("Test was interrupted: " + ie.toString());
+            throw ie;
         }
     }
 
-    private static Random getRandom() {
+    private static Random getRandom() 
+    {
         return rand;
     }
 }