Author: markt Date: Mon Aug 19 23:41:30 2013 New Revision: 1515669 URL: http://svn.apache.org/r1515669 Log: Fix unit test failure observed on command line on Windows. SecureRandom took took long to initialise causing test to fail. Initialize a SecureRandom instance before running the test.
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java?rev=1515669&r1=1515668&r2=1515669&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java Mon Aug 19 23:41:30 2013 @@ -26,6 +26,11 @@ import org.junit.Test; public class TestUtil { + // Used to init SecureRandom prior to running tests + public static void generateMask() { + Util.generateMask(); + } + @Test public void testGetMessageTypeSimple() { Assert.assertEquals( Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java?rev=1515669&r1=1515668&r2=1515669&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java Mon Aug 19 23:41:30 2013 @@ -38,6 +38,7 @@ import org.apache.catalina.servlets.Defa import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.descriptor.web.ApplicationListener; +import org.apache.tomcat.websocket.TestUtil; import org.apache.tomcat.websocket.pojo.TesterUtil.ServerConfigListener; import org.apache.tomcat.websocket.pojo.TesterUtil.SingletonConfigurator; @@ -45,6 +46,7 @@ public class TestPojoEndpointBase extend @Test public void testBug54716() throws Exception { + TestUtil.generateMask(); // Set up utility classes Bug54716 server = new Bug54716(); SingletonConfigurator.setInstance(server); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org