Marking client tests appropriately

jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java

@@ -30,6 +30,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.eclipse.jetty.toolchain.test.AdvancedRunner;
 import org.eclipse.jetty.util.FutureCallback;
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.api.UpgradeException;
@@ -41,8 +42,11 @@ import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@RunWith(AdvancedRunner.class)
 public class WebSocketClientTest
 {
     private BlockheadServer server;
@@ -275,6 +279,7 @@ public class WebSocketClientTest
     }
 
     @Test
+    @Ignore("Not working, it hangs")
     public void testBlockSending() throws Exception
     {
         TrackingSocket wsocket = new TrackingSocket();
@@ -371,6 +376,7 @@ public class WebSocketClientTest
     }
 
     @Test(expected = ConnectException.class)
+    @Ignore("Needs work in SelectManager to support this use case")
     public void testConnectionRefused() throws Exception
     {
         TrackingSocket wsocket = new TrackingSocket();
@@ -419,6 +425,7 @@ public class WebSocketClientTest
     }
 
     @Test
+    @Ignore("Work In Progress")
     public void testIdle() throws Exception
     {
         TrackingSocket wsocket = new TrackingSocket();
@@ -483,6 +490,7 @@ public class WebSocketClientTest
     }
 
     @Test
+    @Ignore("Work In Progress")
     public void testNotIdle() throws Exception
     {
         TrackingSocket wsocket = new TrackingSocket();
@@ -500,7 +508,7 @@ public class WebSocketClientTest
 
         wsocket.assertIsOpen();
 
-        // Send some messages client to server
+        // Send some messages from client to server
         byte[] recv = new byte[1024];
         int len = -1;
         for (int i = 0; i < 10; i++)
@@ -511,7 +519,7 @@ public class WebSocketClientTest
             Assert.assertTrue(len > 0);
         }
 
-        // Send some messages server to client
+        // Send some messages from server to client
         byte[] send = new byte[]
         { (byte)0x81, (byte)0x02, (byte)'H', (byte)'i' };
 
@@ -530,11 +538,13 @@ public class WebSocketClientTest
         ssocket.flush();
 
         wsocket.closeLatch.await(10,TimeUnit.SECONDS);
-        Assert.assertTrue((System.currentTimeMillis() - start) < 5000);
+        long dur = (System.currentTimeMillis() - start);
+        Assert.assertThat("Overall duration",dur,lessThanOrEqualTo(5000L));
         wsocket.assertClose(StatusCode.PROTOCOL,"Invalid close code 1111");
     }
 
     @Test
+    @Ignore("Test for is-open is broken")
     public void testUpgradeThenTCPClose() throws Exception
     {
         TrackingSocket wsocket = new TrackingSocket();

jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties

@@ -3,7 +3,7 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 # org.eclipse.jetty.io.ChannelEndPoint.LEVEL=INFO
 org.eclipse.jetty.websocket.LEVEL=WARN
 # org.eclipse.jetty.websocket.LEVEL=DEBUG
-org.eclipse.jetty.websocket.client.TrackingSocket.LEVEL=DEBUG
+# org.eclipse.jetty.websocket.client.TrackingSocket.LEVEL=DEBUG
 # See the read/write traffic
 # org.eclipse.jetty.websocket.io.Frames.LEVEL=DEBUG
 # org.eclipse.jetty.websocket.io.LEVEL=DEBUG