From b6a51f0c065f1991963868b33fedb117bfdecfc8 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 17 Jan 2012 13:33:41 -0700 Subject: [PATCH] Updating testcase to indicate reason of failure (when testing on OSX) --- .../jetty/websocket/WebSocketMessageRFC6455Test.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java index 3fe9942cb63..175ef6bf014 100644 --- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java +++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java @@ -15,6 +15,9 @@ *******************************************************************************/ package org.eclipse.jetty.websocket; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + import java.io.EOFException; import java.io.IOException; import java.io.InputStream; @@ -28,9 +31,9 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import java.util.zip.Deflater; import java.util.zip.Inflater; + import javax.servlet.http.HttpServletRequest; -import junit.framework.Assert; import org.eclipse.jetty.io.Buffer; import org.eclipse.jetty.io.ByteArrayEndPoint; import org.eclipse.jetty.server.Connector; @@ -41,13 +44,10 @@ import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.Utf8StringBuilder; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - public class WebSocketMessageRFC6455Test { private static Server __server; @@ -606,7 +606,7 @@ public class WebSocketMessageRFC6455Test Thread.sleep(100); assertEquals(count*(mesg.length()+2),totalB.get()); // all messages - assertTrue(max>1000); // was blocked + Assert.assertThat("Was blocked (max time)", max, greaterThan(1000L)); // was blocked } @Test