From 7c315ebce5dbeaef3ae3a412ca27a57fb47e2167 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Tue, 24 Feb 2015 15:59:32 +0100
Subject: [PATCH] Fixed test.

---
 .../eclipse/jetty/http2/client/StreamCloseTest.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java
index 4c49eabe55b..f45e4410776 100644
--- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java
+++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/StreamCloseTest.java
@@ -96,16 +96,19 @@ public class StreamCloseTest extends AbstractTest
 
         Session session = newClient(new Session.Listener.Adapter());
         HeadersFrame frame = new HeadersFrame(0, newRequest("GET", new HttpFields()), null, true);
-        session.newStream(frame, new Promise.Adapter<Stream>(), new Stream.Listener.Adapter()
+        FuturePromise<Stream> promise = new FuturePromise<>();
+        session.newStream(frame, promise, new Stream.Listener.Adapter()
         {
             @Override
             public void onHeaders(Stream stream, HeadersFrame frame)
             {
-                Assert.assertTrue(stream.isClosed());
+                // The stream promise may not be notified yet here.
                 latch.countDown();
             }
         });
+        Stream stream = promise.get(5, TimeUnit.SECONDS);
         Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
+        Assert.assertTrue(stream.isClosed());
     }
 
     @Test
@@ -151,7 +154,7 @@ public class StreamCloseTest extends AbstractTest
             @Override
             public void onData(Stream stream, DataFrame frame, Callback callback)
             {
-                Assert.assertTrue(stream.isClosed());
+                // The sent data callback may not be notified yet here.
                 completeLatch.countDown();
             }
         });
@@ -173,6 +176,7 @@ public class StreamCloseTest extends AbstractTest
         Assert.assertTrue(clientDataLatch.await(5, TimeUnit.SECONDS));
         Assert.assertTrue(serverDataLatch.await(5, TimeUnit.SECONDS));
         Assert.assertTrue(completeLatch.await(5, TimeUnit.SECONDS));
+        Assert.assertTrue(stream.isClosed());
         Assert.assertEquals(0, stream.getSession().getStreams().size());
     }
 
@@ -226,6 +230,7 @@ public class StreamCloseTest extends AbstractTest
                     public void onData(Stream pushedStream, DataFrame frame, Callback callback)
                     {
                         Assert.assertTrue(pushedStream.isClosed());
+                        callback.succeeded();
                         clientLatch.countDown();
                     }
                 };