You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by js...@apache.org on 2004/12/02 04:57:31 UTC
svn commit: r109443 - /incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java /incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java
Author: jsong
Date: Wed Dec 1 19:57:30 2004
New Revision: 109443
URL: http://svn.apache.org/viewcvs?view=rev&rev=109443
Log:
Update test drivers for control composition and control extension.
Modified:
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java
Modified: incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java?view=diff&rev=109443&p1=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java&r1=109442&p2=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java&r2=109443
==============================================================================
--- incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java (original)
+++ incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java Wed Dec 1 19:57:30 2004
@@ -3,6 +3,7 @@
import org.apache.beehive.test.tools.milton.common.Report;
import org.apache.beehive.controls.test.controls.composition.OuterControlBean;
import org.apache.beehive.controls.test.controls.composition.InnerControlBean;
+import org.apache.beehive.controls.test.controls.composition.InnerControl;
/* This class contains the logic to test control composition.
* By invoking method on OuterControl, a control containing a nested control,
@@ -124,16 +125,35 @@
public Report doTestGetPropertyByGetter(){
Report report=new Report();
- report.setStatus(Report.FAIL);
- report.setMessage("Control bean getter/setter not supported. Check latest development status.");
+ InnerControlBean innerbean=myControl.getDeclaredNestedControl();
+ String name=innerbean.getName();
+ String job=innerbean.getJob();
+
+ if (name.equals(InnerControl.DEFAULT_NAME)&&job.equals(InnerControl.DEFAULT_JOB))
+ report.setStatus(Report.PASS);
+ else{
+ report.setStatus(Report.FAIL);
+ report.setMessage("The property from getter:name="+name+"and job="+job );
+ }
return report;
}
public Report doTestSetPropertyBySetter(){
Report report=new Report();
- report.setStatus(Report.FAIL);
- report.setMessage("Control bean getter/setter not supported. Check latest development status.");
+ InnerControlBean innerbean=myControl.getDeclaredNestedControl();
+ innerbean.setName("A_NEW_NAME");
+ innerbean.setJob("A_NEW_JOB");
+
+ String name=innerbean.getNameFromContext();
+ String job=innerbean.getJobFromContext();
+
+ if (name.equals("A_NEW_NAME")&&job.equals("A_NEW_JOB"))
+ report.setStatus(Report.PASS);
+ else{
+ report.setStatus(Report.FAIL);
+ report.setMessage("The property from getter:name="+name+"and job="+job );
+ }
return report;
}
Modified: incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java?view=diff&rev=109443&p1=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java&r1=109442&p2=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java&r2=109443
==============================================================================
--- incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java (original)
+++ incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java Wed Dec 1 19:57:30 2004
@@ -2,6 +2,8 @@
import org.apache.beehive.test.tools.milton.common.Report;
import org.apache.beehive.controls.test.controls.extension.SubControlBean;
+import org.apache.beehive.controls.test.controls.extension.ExtensibleControl;
+import org.apache.beehive.controls.test.controls.extension.SubControl;
/* This class contains the logic to test control extensibility.
* By invoking methods on a SubControlBean, features of control extensibility are verified.
@@ -94,19 +96,16 @@
report.setMessage("the control is NULL");
}
else {
- /*
- String s=myControl.getWhereaboutPosition();
- if (s.equals("In_ExtensibleControl_Interface"))
+
+ String position=myControl.getPosition();
+ //layer is reconfigured already
+ //String layer=myControl.getLayer();
+ if (position.equals(ExtensibleControl.CURRENT_POSITION))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
- report.setMessage(s);
+ report.setMessage("The property from getter:Position="+position);
}
- */
- /* BUG: getter/setter in generated bean class is busted!
- Just fail this test until it is fixed*/
- report.setStatus(Report.FAIL);
- report.setMessage("Control bean getter/setter is broken. Check the latest development please.");
}
return report;
}
@@ -120,20 +119,18 @@
report.setMessage("the control is NULL");
}
else {
- /*
- myControl.setWhereaboutPosition("new position");
- String s=myControl.accessInheritedProperty();
- if (s.equals("new position"))
+ myControl.setPosition("A_NEW_POSITION");
+ myControl.setLayer("A_NEW_LAYER");
+
+ String position=myControl.accessInheritedProperty();
+ //String layer=myControl.getLayer();
+
+ if (position.equals("A_NEW_POSITION"))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
- report.setMessage(s);
+ report.setMessage("The property from getter:Position="+position);
}
- */
- /* BUG: getter/setter in generated bean class is busted!
- Just fail this test until it is fixed*/
- report.setStatus(Report.FAIL);
- report.setMessage("Control bean getter/setter is broken. Check the latest development please.");
}
return report;
}
@@ -147,19 +144,13 @@
report.setMessage("the control is NULL");
}
else {
- /*
- String s=myControl.getWhereAboutLayer();
- if (s.equals("On_SubControl_Interface_Layer"))
+ String layer=myControl.getLayer();
+ if (layer.equals("On_SubControl_Interface_Layer"))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
- report.setMessage(s);
+ report.setMessage("The property from getter:layer="+layer);
}
- */
- /* BUG: getter/setter in generated bean class is busted!
- Just fail this test until it is fixed*/
- report.setStatus(Report.FAIL);
- report.setMessage("Control bean getter/setter is broken. Check the latest development please.");
}
return report;
}
@@ -173,20 +164,14 @@
report.setMessage("the control is NULL");
}
else {
- /*
- myControl.getWhereAboutLayer("new layer");
- String s=myControl.getLayerByContext();
- if (s.equals("new position"))
+ myControl.setLayer("NEW_VALUE_FOR_LAYER");
+ String the_layer=myControl.getLayerByContext();
+ if (the_layer.equals("NEW_VALUE_FOR_LAYER"))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
- report.setMessage(s);
+ report.setMessage(the_layer);
}
- */
- /* BUG: getter/setter in generated bean class is busted!
- Just fail this test until it is fixed*/
- report.setStatus(Report.FAIL);
- report.setMessage("Control bean getter/setter is broken. Check the latest development please.");
}
return report;
}
@@ -202,7 +187,11 @@
}
else {
String s=myControl.getLayerByContext();
- if (s.equals("On_SubControl_Interface_Layer"))
+ if (s==null){
+ report.setStatus(Report.FAIL);
+ report.setMessage("The property retrieved from context is NULL");
+ }
+ else if (s.equals("On_SubControl_Interface_Layer"))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
@@ -244,19 +233,13 @@
report.setMessage("the control is NULL");
}
else {
- /*
- String s=myControl.getNewPropertyMessage();
- if (s.equals("New Property Declared by Sub Control"))
+ String s=myControl.getMessage();
+ if (s.equals(SubControl.A_MESSAGE))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
report.setMessage(s);
}
- */
- /* BUG: getter/setter in generated bean class is busted!
- Just fail this test until it is fixed*/
- report.setStatus(Report.FAIL);
- report.setMessage("Control bean getter/setter is broken. Check the latest development please.");
}
return report;
}
@@ -270,19 +253,14 @@
report.setMessage("the control is NULL");
}
else {
- /*
- String s=myControl.setNewPropertyMessage("new message for new property");
- if (s.equals("On_SubControl_Interface_Layer"))
+ myControl.setMessage("NEW_VALUE_FOR_EXTENDED_PROPERTY");
+ String the_new_value=myControl.getExtendedPropertyByContext();
+ if (the_new_value.equals("NEW_VALUE_FOR_EXTENDED_PROPERTY"))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
- report.setMessage(s);
+ report.setMessage("The reset value:"+the_new_value);
}
- */
- /* BUG: getter/setter in generated bean class is busted!
- Just fail this test until it is fixed*/
- report.setStatus(Report.FAIL);
- report.setMessage("Control bean getter/setter is broken. Check the latest development please.");
}
return report;
}