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/06 23:08:28 UTC
svn commit: r110041 - in incubator/beehive/trunk/controls/test: src/drivers/org/apache/beehive/controls/test/driver/composition src/drivers/org/apache/beehive/controls/test/driver/extension src/units/org/apache/beehive/controls/test/jws/contextevent webapps/controlsWeb/WEB-INF/src/jws
Author: jsong
Date: Mon Dec 6 14:08:27 2004
New Revision: 110041
URL: http://svn.apache.org/viewcvs?view=rev&rev=110041
Log:
Update detailed.tests for controls. Add more comment to help failure analysis.
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
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/contextevent/TestContextEvent.java
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws
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=110041&p1=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java&r1=110040&p2=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/DriveOuterControl.java&r2=110041
==============================================================================
--- 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 Mon Dec 6 14:08:27 2004
@@ -69,7 +69,7 @@
if (programNestedControl==null){
report.setStatus(Report.FAIL);
- report.setMessage("the nested control instantiated programmatically is NULL");
+ report.setMessage("Missing API:Controls. JIRA-BEEHIVE-113");
}
else
report.setStatus(Report.PASS);
@@ -129,12 +129,32 @@
String name=innerbean.getName();
String job=innerbean.getJob();
- if (name.equals(InnerControl.DEFAULT_NAME)&&job.equals(InnerControl.DEFAULT_JOB))
+ if (name.equals(InnerControl.DEFAULT_NAME)&&(job==null))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
report.setMessage("The property from getter:name="+name+"and job="+job );
}
+
+ if (report.getStatus().equals(Report.PASS)){
+ InnerControlBean innerbean2=myControl.getDeclaredNestedControl2();
+ String name2=innerbean.getName();
+ String job2=innerbean.getJob();
+
+ if (job2==null){
+ report.setStatus(Report.FAIL);
+ report.setMessage("The property reset at declaration is NULL" );
+ }
+ else{
+ if (name.equals(InnerControl.DEFAULT_NAME)&&(job.equals("farmer")))
+ report.setStatus(Report.PASS);
+ else{
+ report.setStatus(Report.FAIL);
+ report.setMessage("The property from getter:name="+name2+"and job="+job2 );
+ }
+ }
+ }
+
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=110041&p1=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java&r1=110040&p2=incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/extension/DriveSubControl.java&r2=110041
==============================================================================
--- 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 Mon Dec 6 14:08:27 2004
@@ -165,12 +165,18 @@
}
else {
myControl.setLayer("NEW_VALUE_FOR_LAYER");
- String the_layer=myControl.getLayerByContext();
- if (the_layer.equals("NEW_VALUE_FOR_LAYER"))
- report.setStatus(Report.PASS);
- else{
+ try{
+ String the_layer=myControl.getLayerByContext();
+ if (the_layer.equals("NEW_VALUE_FOR_LAYER"))
+ report.setStatus(Report.PASS);
+ else{
+ report.setStatus(Report.FAIL);
+ report.setMessage(the_layer);
+ }
+ }
+ catch(Exception e){
report.setStatus(Report.FAIL);
- report.setMessage(the_layer);
+ report.setExceptionStack(e);
}
}
return report;
@@ -186,16 +192,22 @@
report.setMessage("the control is NULL");
}
else {
- String s=myControl.getLayerByContext();
- if (s==null){
- report.setStatus(Report.FAIL);
- report.setMessage("The property retrieved from context is NULL");
+ try{
+ String s=myControl.getLayerByContext();
+ 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);
+ report.setMessage(s);
+ }
}
- else if (s.equals("On_SubControl_Interface_Layer"))
- report.setStatus(Report.PASS);
- else{
+ catch(Exception e){
report.setStatus(Report.FAIL);
- report.setMessage(s);
+ report.setExceptionStack(e);
}
}
return report;
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/contextevent/TestContextEvent.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/contextevent/TestContextEvent.java?view=diff&rev=110041&p1=incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/contextevent/TestContextEvent.java&r1=110040&p2=incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/contextevent/TestContextEvent.java&r2=110041
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/contextevent/TestContextEvent.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jws/contextevent/TestContextEvent.java Mon Dec 6 14:08:27 2004
@@ -19,16 +19,23 @@
@Freq("detailed")
public void testEventHandler() throws Exception
{
- assertReport("http://localhost:8080/controlsWeb/jws/Event.jws","testEventHandler");
+ assertReport("http://localhost:8080/controlsWeb/jws/ContextEvent.jws","testEventHandler");
}
-
+ /**
+ * Tests listening to control's events by EventHandler
+ */
+ @Freq("detailed")
+ public void testEventHandler2() throws Exception
+ {
+ assertReport("http://localhost:8080/controlsWeb/jws/ContextEvent.jws","testEventHandler2");
+ }
/**
* Tests listening to control's events by listener
*/
@Freq("detailed")
public void testListener() throws Exception
{
- assertReport("http://localhost:8080/controlsWeb/jws/Event.jws","testListener");
+ assertReport("http://localhost:8080/controlsWeb/jws/ContextEvent.jws","testListeners");
}
}
Modified: incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws?view=diff&rev=110041&p1=incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws&r1=110040&p2=incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws&r2=110041
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws (original)
+++ incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/Instantiate.jws Mon Dec 6 14:08:27 2004
@@ -96,6 +96,7 @@
*/
Report report=new Report();
report.setStatus(Report.FAIL);
+ report.setMessage("Missing API: Controls. JIRA-BEEHIVE-113");
return report;
}