svn commit: r1644373 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java

[markt]

Author: markt
Date: Wed Dec 10 11:08:06 2014
New Revision: 1644373

URL: http://svn.apache.org/r1644373
Log:
Parameterise the message used in the test (so we can more easily test different 
sized messages).

Modified:
    tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1644373&r1=1644372&r2=1644373&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java Wed 
Dec 10 11:08:06 2014
@@ -62,25 +62,25 @@ public class TestWsRemoteEndpoint extend
 
     @Test
     public void testWriterAnnotation() throws Exception {
-        doTestWriter(TesterAnnotatedEndpoint.class, true);
+        doTestWriter(TesterAnnotatedEndpoint.class, true, TEST_MESSAGE_5K);
     }
 
     @Test
     public void testWriterProgrammatic() throws Exception {
-        doTestWriter(TesterProgrammaticEndpoint.class, true);
+        doTestWriter(TesterProgrammaticEndpoint.class, true, TEST_MESSAGE_5K);
     }
 
     @Test
     public void testStreamAnnotation() throws Exception {
-        doTestWriter(TesterAnnotatedEndpoint.class, false);
+        doTestWriter(TesterAnnotatedEndpoint.class, false, TEST_MESSAGE_5K);
     }
 
     @Test
     public void testStreamProgrammatic() throws Exception {
-        doTestWriter(TesterProgrammaticEndpoint.class, false);
+        doTestWriter(TesterProgrammaticEndpoint.class, false, TEST_MESSAGE_5K);
     }
 
-    private void doTestWriter(Class<?> clazz, boolean useWriter) throws 
Exception {
+    private void doTestWriter(Class<?> clazz, boolean useWriter, String 
testMessage) throws Exception {
         Tomcat tomcat = getTomcatInstance();
         // No file system docBase required
         Context ctx = tomcat.addContext("", null);
@@ -123,7 +123,7 @@ public class TestWsRemoteEndpoint extend
             Writer w = wsSession.getBasicRemote().getSendWriter();
 
             for (int i = 0; i < 8; i++) {
-                w.write(TEST_MESSAGE_5K);
+                w.write(testMessage);
             }
 
             w.close();
@@ -131,7 +131,7 @@ public class TestWsRemoteEndpoint extend
             OutputStream s = wsSession.getBasicRemote().getSendStream();
 
             for (int i = 0; i < 8; i++) {
-                s.write(TEST_MESSAGE_5K.getBytes(StandardCharsets.UTF_8));
+                s.write(testMessage.getBytes(StandardCharsets.UTF_8));
             }
 
             s.close();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org