svn commit: rev 47494 - in incubator/beehive/trunk/controls/test: src/controls/org/apache/beehive/controls/test/controls/event src/units/org/apache/beehive/controls/test/jpf/contextevent webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event webapps/controlsWeb/event/listener

[jsong]

Author: jsong
Date: Wed Sep 29 11:20:21 2004
New Revision: 47494

Modified:
   
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
   
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
   
incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/listener/Controller.jpf
Log:
Updates beehive controls tests on listening to events.
CR: self.
checkin.tests pass.


Modified: 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
    (original)
+++ 
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
    Wed Sep 29 11:20:21 2004
@@ -4,7 +4,7 @@
 import org.apache.beehive.controls.api.events.Client;
 
 /**
- * A control implementation that raises events when its method is invoked
+ * A control implementation that raises events when the method is invoked
  */
 @ControlImplementation
 public class HelloImpl implements Hello
@@ -16,6 +16,9 @@
     public void triggerEvents() 
     {
         eventSet1.method1();
+        eventSet2.method1();
         eventSet2.set2Method2();
+        eventSet2.set2OverloadedMethod();
+        eventSet2.set2OverloadedMethod(68);
     }
 }

Modified: 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
==============================================================================
--- 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
   (original)
+++ 
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
   Wed Sep 29 11:20:21 2004
@@ -41,7 +41,7 @@
        @Status("inactive")
     public void testListenFromBean() throws Exception
     {
-               
assertReport("/controlsWeb/contextevent/implrecord2/Controller.jpf");
+               
assertReport("/controlsWeb/contextevent/beanrecord/Controller.jpf");
     }
 
 

Modified: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
==============================================================================
--- 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
    (original)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/controls/event/HelloImpl.jcs
    Wed Sep 29 11:20:21 2004
@@ -16,6 +16,9 @@
     public void triggerEvents() 
     {
         eventSet1.method1();
+        eventSet2.method1();
         eventSet2.set2Method2();
+        eventSet2.set2OverloadedMethod();
+        eventSet2.set2OverloadedMethod(68);
     }
 }

Modified: 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/listener/Controller.jpf
==============================================================================
--- 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/listener/Controller.jpf
     (original)
+++ 
incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/listener/Controller.jpf
     Wed Sep 29 11:20:21 2004
@@ -24,8 +24,8 @@
 
 import org.apache.beehive.controls.api.bean.Control;
 import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.test.controls.contextevent.RecorderBean;
-import org.apache.beehive.controls.test.driver.contextevent.DriveRecorder;
+import org.apache.beehive.controls.test.controls.event.HelloBean;
+import org.apache.beehive.controls.test.driver.event.DriveListener;
 import org.apache.beehive.test.tools.milton.common.Report;
 
 /* Test receiving events raised by a control using a registered listener
@@ -40,7 +40,7 @@
 {
 
     @Control
-    public RecorderBean recorder;
+    public HelloBean hello;
     
     /**
      * @jpf:action
@@ -49,13 +49,23 @@
         )
     protected Forward begin(){
        
-       DriveRecorder driver=new DriveRecorder();
-       driver.setControl(recorder);
+       DriveListener driver=new DriveListener();
+       driver.setControl(hello);
        Report report=driver.doTest();
        
+       if (report.getStatus().equals(Report.PASS)){
+
+           try{
+               Thread.currentThread().sleep(1000);
+               report=driver.verifyResult();
+               }
+           catch(Exception e){
+               report.setStatus(Report.FAIL);
+               report.setExceptionStack(e);
+           }
+       }
         return new Forward(Report.RESULTS, Report.KEY, report);
     }
-
 }