[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/manager DefaultManagerConnectionTest.java,1.10,1.11

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11254/src/test/net/sf/asterisk/manager

Modified Files:
	DefaultManagerConnectionTest.java 
Log Message:
Introduced EventGeneratingActions

Index: DefaultManagerConnectionTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/DefaultManagerConnectionTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -p -r1.10 -r1.11
--- DefaultManagerConnectionTest.java	12 Jul 2005 08:24:22 -0000	1.10
+++ DefaultManagerConnectionTest.java	16 Jul 2005 21:48:16 -0000	1.11
@@ -57,9 +57,7 @@ public class DefaultManagerConnectionTes
         dmc = new MockedDefaultManagerConnection(mockReader, mockWriter,
                 mockSocket);
 
-        // make tests faster that expect a TimeoutException
-        dmc.setSleepTime(5);
-        dmc.setDefaultTimeout(20);
+        dmc.setDefaultResponseTimeout(20);
 
         mockWriter.setDispatcher(dmc);
         mockWriter.setAsteriskServer(asteriskServer);
@@ -141,7 +139,17 @@ public class DefaultManagerConnectionTes
         // Some time for the reader thread to be started. Otherwise run() might
         // not yet have been
         // called.
-        Thread.sleep(10);
+        try
+        {
+            Thread.sleep(10);
+        }
+        catch (InterruptedException e)
+        {
+            // ugly hack to make this work when the thread is interrupted coz a
+            // response has been received but the ManagerConnection was not yet 
+            // sleeping
+            Thread.sleep(10);
+        }
         assertEquals("run() not called 1 time", 1, mockReader.runCalls);
         assertEquals("unexpected call to die()", 0, mockReader.dieCalls);
 
@@ -150,9 +158,10 @@ public class DefaultManagerConnectionTes
         assertEquals("must have handled exactly one event", 1,
                 managerEventHandler.eventsHandled.size());
 
-        assertTrue("eventHandled must be a ConnectEvent",
+        assertTrue(
+                "eventHandled must be a ConnectEvent",
                 managerEventHandler.eventsHandled.get(0) instanceof ConnectEvent);
-        
+
         socketMC.verify();
     }
 
@@ -193,7 +202,17 @@ public class DefaultManagerConnectionTes
         // Some time for the reader thread to be started. Otherwise run() might
         // not yet have been
         // called.
-        Thread.sleep(10);
+        try
+        {
+            Thread.sleep(10);
+        }
+        catch (InterruptedException e)
+        {
+            // ugly hack to make this work when the thread is interrupted coz a
+            // response has been received but the ManagerConnection was not yet 
+            // sleeping
+            Thread.sleep(10);
+        }
         assertEquals("run() not called 1 time", 1, mockReader.runCalls);
         assertEquals("unexpected call to die()", 0, mockReader.dieCalls);
 
@@ -591,15 +610,14 @@ public class DefaultManagerConnectionTes
 
         socketMC.verify();
     }
-    
-    
+
     public void testDispatchEventWithMultipleEventHandlers()
     {
         final int count = 20;
         ManagerEvent event;
         MockControl listMC;
         final List list;
-        
+
         // verify that event handlers are called in the correct order
         event = new NewChannelEvent(new AsteriskServer());
         listMC = MockControl.createStrictControl(List.class);
@@ -609,14 +627,15 @@ public class DefaultManagerConnectionTes
             final int index = i;
             list.add(new Integer(index));
             listMC.setReturnValue(true);
-            dmc.addEventHandler(new ManagerEventHandler(){
+            dmc.addEventHandler(new ManagerEventHandler()
+            {
                 public void handleEvent(ManagerEvent event)
                 {
                     list.add(new Integer(index));
                 }
             });
         }
-    
+
         listMC.replay();
         dmc.dispatchEvent(event);
         listMC.verify();