Author: markt Date: Tue Aug 20 11:13:33 2013 New Revision: 1515778 URL: http://svn.apache.org/r1515778 Log: Further reduce a potential timing sensitivity
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1515778&r1=1515777&r2=1515778&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Tue Aug 20 11:13:33 2013 @@ -163,30 +163,27 @@ public class TestEncodingDecoding extend session.close(); // Should not take very long but some failures have been seen - i = 0; - while (i < 20) { - if (Server.isLifeCycleEventCalled( - MsgStringEncoder.class.getName()+":init")) { + i = testEvent(MsgStringEncoder.class.getName()+":init", 0); + i = testEvent(MsgStringDecoder.class.getName()+":init", i); + i = testEvent(MsgByteEncoder.class.getName()+":init", i); + i = testEvent(MsgByteDecoder.class.getName()+":init", i); + i = testEvent(MsgStringEncoder.class.getName()+":destroy", i); + i = testEvent(MsgStringDecoder.class.getName()+":destroy", i); + i = testEvent(MsgByteEncoder.class.getName()+":destroy", i); + i = testEvent(MsgByteDecoder.class.getName()+":destroy", i); + } + + + private int testEvent(String name, int count) throws InterruptedException { + int i = count; + while (i < 50) { + if (Server.isLifeCycleEventCalled(name)) { break; } Thread.sleep(100); } - Assert.assertTrue(Server.isLifeCycleEventCalled( - MsgStringEncoder.class.getName()+":init")); - Assert.assertTrue(Server.isLifeCycleEventCalled( - MsgStringDecoder.class.getName()+":init")); - Assert.assertTrue(Server.isLifeCycleEventCalled( - MsgByteEncoder.class.getName()+":init")); - Assert.assertTrue(Server.isLifeCycleEventCalled( - MsgByteDecoder.class.getName()+":init")); - Assert.assertTrue(Server.isLifeCycleEventCalled( - MsgStringEncoder.class.getName()+":destroy")); - Assert.assertTrue(Server.isLifeCycleEventCalled( - MsgStringDecoder.class.getName()+":destroy")); - Assert.assertTrue(Server.isLifeCycleEventCalled( - MsgByteEncoder.class.getName()+":destroy")); - Assert.assertTrue(Server.isLifeCycleEventCalled( - MsgByteDecoder.class.getName()+":destroy")); + Assert.assertTrue(Server.isLifeCycleEventCalled(name)); + return i; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org