Author: jsong
Date: Wed Aug 11 23:20:21 2004
New Revision: 36274
Modified:
incubator/beehive/trunk/controls/test/webapps/build.xml
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/beanrecord/Controller.jpf
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord/Controller.jpf
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord2/Controller.jpf
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java
Log:
Update tests for controls invoked by pageflows.
Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml Wed Aug 11
23:20:21 2004
@@ -57,7 +57,7 @@
<!--property name="webapp.dir"
location="C:/beehive/work_dir/controls/test/webapps/${webapp.name}"/-->
<property name="webapp.dir" location="./${webapp.name}"/>
- <ant antfile="${deployNetui.ant}" target="deploy.netui"
inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="deploy.netui"
inheritAll="false">
<property name="webapp.dir" value="${webapp.dir}" />
</ant>
@@ -89,7 +89,7 @@
<ant antfile="${buildWebapp.ant}" target="undeploy.netui"
inheritAll="false">
<property name="webapp.dir" location="./${webapp.name}"/>
</ant>
- <ant antfile="${buildNetui.ant}" target="clean.webapp"
inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="clean.webapp"
inheritAll="false">
<property name="webapp.dir" location="./${webapp.name}"/>
</ant>
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/beanrecord/Controller.jpf
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/beanrecord/Controller.jpf
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/beanrecord/Controller.jpf
Wed Aug 11 23:20:21 2004
@@ -26,7 +26,7 @@
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.context.DriveBeanRecorder;
+import org.apache.beehive.controls.test.driver.contextevent.DriveBeanRecorder;
import org.apache.beehive.test.tools.milton.common.Report;
/* Test listening to controls life cycle events from control bean instance
directly
@@ -50,7 +50,7 @@
)
protected Forward begin(){
- DriveBeanRecord driver=new DriveBeanRecord();
+ DriveBeanRecorder driver=new DriveBeanRecorder();
driver.setControl(recorder);
Report report=driver.doTest();
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord/Controller.jpf
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord/Controller.jpf
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord/Controller.jpf
Wed Aug 11 23:20:21 2004
@@ -26,7 +26,7 @@
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.context.DriveRecorder;
+import org.apache.beehive.controls.test.driver.contextevent.DriveRecorder;
import org.apache.beehive.test.tools.milton.common.Report;
/* Test control implementation listenning to and recording controls life cycle
events
@@ -50,7 +50,7 @@
)
protected Forward begin(){
- DriveRecord driver=new DriveRecord();
+ DriveRecorder driver=new DriveRecorder();
driver.setControl(recorder);
Report report=driver.doTest();
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord2/Controller.jpf
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord2/Controller.jpf
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/contextevent/implrecord2/Controller.jpf
Wed Aug 11 23:20:21 2004
@@ -26,7 +26,7 @@
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.context.DriveRecorder;
+import org.apache.beehive.controls.test.driver.contextevent.DriveRecorder;
import org.apache.beehive.test.tools.milton.common.Report;
/* Test control implementation listenning to and recording controls life cycle
events
@@ -47,7 +47,8 @@
)
protected Forward begin(){
- DriveRecord driver=new DriveRecord();
+ Report report =new Report();
+ DriveRecorder driver=new DriveRecorder();
try{
RecorderBean
recorder=(RecorderBean)java.beans.Beans.instantiate(
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/controls/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java
Wed Aug 11 23:20:21 2004
@@ -29,9 +29,9 @@
}
else{
- String record=myRecorder.getRecord();
+ String record=myControl.getRecord();
- if record.equals("onCreateonInstantiate");
+ if (record.equals("onCreateonInstantiate"))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
