Issue #1650 - testcase stability effort (take 2)

jetty-cdi/cdi-websocket/src/test/java/org/eclipse/jetty/cdi/websocket/basicapp/BasicAppTest.java

@@ -108,11 +108,12 @@ public class BasicAppTest
 
             socket.awaitOpen(5,TimeUnit.SECONDS);
             socket.sendText("Hello World");
-            socket.close(StatusCode.NORMAL,"Test complete");
-            socket.awaitClose(5,TimeUnit.SECONDS);
 
             String response = socket.getTextMessages().poll(5, TimeUnit.SECONDS);
             assertThat("Message[0]",response,is("Hello World"));
+
+            socket.close(StatusCode.NORMAL,"Test complete");
+            socket.awaitClose(5,TimeUnit.SECONDS);
         }
         finally
         {

jetty-cdi/cdi-websocket/src/test/java/org/eclipse/jetty/cdi/websocket/cdiapp/CdiAppTest.java

@@ -167,13 +167,14 @@ public class CdiAppTest
 
             socket.awaitOpen(2,TimeUnit.SECONDS);
             socket.sendText("data|stuff");
-            socket.close(StatusCode.NORMAL,"Test complete");
-            socket.awaitClose(2,TimeUnit.SECONDS);
 
             String response = socket.getTextMessages().poll(5, TimeUnit.SECONDS);
             assertThat("Message[0]",response,containsString("Hello there stuff"));
             response = socket.getTextMessages().poll(5, TimeUnit.SECONDS);
             assertThat("Message[1]",response,notNullValue());
+
+            socket.close(StatusCode.NORMAL,"Test complete");
+            socket.awaitClose(2,TimeUnit.SECONDS);
         }
         finally
         {