Author: markt Date: Wed Sep 11 14:21:47 2013 New Revision: 1521866 URL: http://svn.apache.org/r1521866 Log: Improve performance of unit tests and hopefully fix intermittent unit test failure.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterMessageCountClient.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1521835 Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1521866&r1=1521865&r2=1521866&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java Wed Sep 11 14:21:47 2013 @@ -19,7 +19,7 @@ package org.apache.tomcat.websocket; import java.io.File; import java.net.URI; import java.net.URL; -import java.util.List; +import java.util.Queue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -85,7 +85,7 @@ public class TestWebSocketFrameClient ex handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS, TimeUnit.MILLISECONDS); - List<String> messages = handler.getMessages(); + Queue<String> messages = handler.getMessages(); Assert.assertEquals( TesterFirehoseServer.MESSAGE_COUNT, messages.size()); for (String message : messages) { Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1521866&r1=1521865&r2=1521866&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java Wed Sep 11 14:21:47 2013 @@ -80,7 +80,7 @@ public class TestWsPingPongMessages exte boolean latchResult = handler.getLatch().await(10, TimeUnit.SECONDS); Assert.assertTrue(latchResult); Assert.assertArrayEquals(applicationData.array(), - (handler.getMessages().get(0)).getApplicationData().array()); + (handler.getMessages().peek()).getApplicationData().array()); } public static class PongMessageHandler extends Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1521866&r1=1521865&r2=1521866&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Wed Sep 11 14:21:47 2013 @@ -21,7 +21,7 @@ import java.net.SocketTimeoutException; import java.net.URI; import java.net.URL; import java.nio.ByteBuffer; -import java.util.List; +import java.util.Queue; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; @@ -107,9 +107,9 @@ public class TestWsWebSocketContainer ex Assert.assertTrue(latchResult); - List<String> messages = handler.getMessages(); + Queue<String> messages = handler.getMessages(); Assert.assertEquals(1, messages.size()); - Assert.assertEquals(MESSAGE_STRING_1, messages.get(0)); + Assert.assertEquals(MESSAGE_STRING_1, messages.peek()); } @@ -265,14 +265,14 @@ public class TestWsWebSocketContainer ex Assert.assertTrue(latchResult); - List<?> messages = handler.getMessages(); + Queue<?> messages = handler.getMessages(); if (pass) { Assert.assertEquals(1, messages.size()); if (isTextMessage) { - Assert.assertEquals(MESSAGE_TEXT_4K, messages.get(0)); + Assert.assertEquals(MESSAGE_TEXT_4K, messages.peek()); } else { Assert.assertEquals(ByteBuffer.wrap(MESSAGE_BINARY_4K), - messages.get(0)); + messages.peek()); } } else { // When the message exceeds the buffer size, the WebSocket is @@ -814,9 +814,9 @@ public class TestWsWebSocketContainer ex Assert.assertTrue(latchResult); - List<String> messages = handler.getMessages(); + Queue<String> messages = handler.getMessages(); Assert.assertEquals(1, messages.size()); - Assert.assertEquals(MESSAGE_STRING_1, messages.get(0)); + Assert.assertEquals(MESSAGE_STRING_1, messages.peek()); } Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterMessageCountClient.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterMessageCountClient.java?rev=1521866&r1=1521865&r2=1521866&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterMessageCountClient.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterMessageCountClient.java Wed Sep 11 14:21:47 2013 @@ -18,8 +18,10 @@ package org.apache.tomcat.websocket; import java.nio.ByteBuffer; import java.util.List; +import java.util.Queue; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.LinkedBlockingQueue; import javax.websocket.ClientEndpoint; import javax.websocket.CloseReason; @@ -111,7 +113,7 @@ public class TesterMessageCountClient { private final CountDownLatch latch; - private final List<T> messages = new CopyOnWriteArrayList<T>(); + private final Queue<T> messages = new LinkedBlockingQueue<T>(); public BasicHandler(CountDownLatch latch) { this.latch = latch; @@ -121,7 +123,7 @@ public class TesterMessageCountClient { return latch; } - public List<T> getMessages() { + public Queue<T> getMessages() { return messages; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org