Author: jsong
Date: Thu May 5 12:43:38 2005
New Revision: 168391
URL: http://svn.apache.org/viewcvs?rev=168391&view=rev
Log:
Update controls detaled.test and activate more detailed tests.
Modified:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.jcs
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/SubControlImpl.jcs
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/extension/TestSubControl.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/ContextEvent.jws
incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf
incubator/beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf
Modified:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.jcs
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.jcs?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.jcs
(original)
+++
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.jcs
Thu May 5 12:43:38 2005
@@ -32,7 +32,7 @@
System.out.println("onCreate invoked on RecorderImpl");
System.out.println("++++++++++++++++++++++++++++++++++++++++++");
- event_log=event_log+"onCreate";
+ event_log=event_log+"onCreate";
}
/*A EventHandler that listens to onAcquire event*/
@@ -42,7 +42,7 @@
System.out.println("+++++++++++++++++++++++++++++++++++++++++");
System.out.println("onAcquire invoked on RecorderImpl");
System.out.println("++++++++++++++++++++++++++++++++++++++++++");
- event_log=event_log+"onAcquire";
+ event_log=event_log+"onAcquire";
}
/*A EventHandler that listens to onRelease event*/
@@ -53,7 +53,7 @@
System.out.println("onRelease invoked on RecorderImpl");
System.out.println("++++++++++++++++++++++++++++++++++++++++++");
- event_log=event_log+"onRelease";
+ event_log=event_log+"onRelease";
}
/*Returns the event log*/
@@ -63,6 +63,6 @@
System.out.println("getRecord method invoked on RecorderImpl");
System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
- return event_log;
+ return event_log;
}
}
Modified:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/SubControlImpl.jcs
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/SubControlImpl.jcs?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/SubControlImpl.jcs
(original)
+++
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/SubControlImpl.jcs
Thu May 5 12:43:38 2005
@@ -46,10 +46,6 @@
}
public int invokeExtendedEventFromSubControl(){
-
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- System.out.println("on sub control impl class");
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
subevent.method1();
return 0;
}
Modified:
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java
(original)
+++
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java
Thu May 5 12:43:38 2005
@@ -52,6 +52,7 @@
);
+
report.setStatus(Report.PASS);
}
@@ -68,11 +69,6 @@
Report report=new Report();
- System.out.println("***********************************************");
- System.out.println("** DriveBeanRecorder:testResourceContextEvent**");
- System.out.println("***********************************************");
-
-
if (myControl==null){
report.setStatus(Report.FAIL);
report.setMessage("the custom control is NULL");
@@ -86,15 +82,16 @@
resourceContext.addResourceEventsListener( new
ResourceContext.ResourceEvents()
{
public void onAcquire(){
-
+ /*
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
System.out.println("onAcquire invoked on DriveBeanRecorder");
System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
-
+ */
onAcquireReceived=true;
};
public void
onRelease(){onReleaseReceived=true;};
});
+ String s=myControl.getRecord();
report.setStatus(Report.PASS);
}
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java
(original)
+++
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java
Thu May 5 12:43:38 2005
@@ -19,7 +19,7 @@
public void testByEventHandler() throws Exception
{
assertReport("/controlsWeb/event/eventhandler/begin.do");
- assertReport("/controlsWeb/event/eventhandler/verifyResult.do");
+
//assertReport("/controlsWeb/event/eventhandler/verifyResult.do");
}
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/extension/TestSubControl.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/extension/TestSubControl.java?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/extension/TestSubControl.java
(original)
+++
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/extension/TestSubControl.java
Thu May 5 12:43:38 2005
@@ -288,15 +288,9 @@
* Tests invoking a method that is overwritten by subcontrol.
*/
@Freq("detailed")
- @Status("inactive")
public void testInheritedEvent() throws Exception
{
assertReport("/controlsWeb/extension/testInvokeInheritedEvent.do");
- try{
- Thread.currentThread().sleep(1000);
- }
- catch(Exception e){}
-
assertReport("/controlsWeb/extension/testGetSuperClassEventRslt.do");
}
/**
@@ -306,11 +300,6 @@
public void testExtendedEvent() throws Exception
{
assertReport("/controlsWeb/extension/testInvokeExtendedEvent.do");
- try{
- Thread.currentThread().sleep(1000);
- }
- catch(Exception e){}
-
assertReport("/controlsWeb/extension/testGetSubClassEventRslt.do");
}
}
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?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
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
Thu May 5 12:43:38 2005
@@ -2,9 +2,6 @@
import org.apache.beehive.test.tools.milton.junit.SOAPReportTestCase;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Misc;
-
/**
@@ -35,8 +32,6 @@
* Tests listening to control's events by listener
*/
@Freq("detailed")
- @Status("inactive")
- @Misc("JIRA604")
public void testListener() throws Exception
{
assertReport("http://localhost:8080/controlsWeb/jws/ContextEvent.jws","testListeners";);
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/ContextEvent.jws
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/ContextEvent.jws?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/ContextEvent.jws
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/WEB-INF/src/jws/ContextEvent.jws
Thu May 5 12:43:38 2005
@@ -45,9 +45,6 @@
@WebMethod
public Report testListeners()
{
- System.out.println("***********************************************");
- System.out.println("**On ContextEvent.jws testListeners method ****");
- System.out.println("***********************************************");
DriveBeanRecorder driver=new DriveBeanRecorder();
driver.setControl(recorder);
Report report=driver.testBeanContextEvent();
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/event/eventhandler/Controller.jpf
Thu May 5 12:43:38 2005
@@ -50,9 +50,6 @@
eventName="method1")
public void myHelloBeanMessageHandler()
{
- System.out.println("***************************************");
- System.out.println(" On Controller.jpf:event1 received!");
- System.out.println("***************************************");
eventSet1Received=true;
}
@@ -61,9 +58,6 @@
@EventHandler (field="myHelloBean", eventSet= HelloBean.EventSet2.class,
eventName="set2Method2")
public int myHelloBeanMessageHandler2()
{
-
System.out.println("***************************************************");
- System.out.println(" On Controller.jpf: event2 receive!");
-
System.out.println("***************************************************");
eventSet2Received=true;
return 0;
}
@@ -77,22 +71,31 @@
//Invoke method on myHelloBean to trigger the events
- Report report=new Report();
- System.out.println("******************************************");
- System.out.println(" On Controller.jpf: Begin method invoked!");
- System.out.println("*******************************************");
-
-
- try{
- myHelloBean.triggerEvents();
- report.setStatus(Report.PASS);
- }
- catch(Exception e){
- report.setStatus(Report.FAIL);
- report.setExceptionStack(e);
+ Report report=new Report();
- }
+ try{
+ myHelloBean.triggerEvents();
+ report.setStatus(Report.PASS);
+
+ if (eventSet1Received && eventSet2Received)
+ report.setStatus(Report.PASS);
+ else{
+ report.setStatus(Report.FAIL);
+
+ String detail="";
+ if (!eventSet1Received)
+ detail="EventSet1 is not received.";
+ if (!eventSet2Received)
+ detail=detail+"EventSet2 is not
received.";
+ report.setMessage(detail);
+ }
+ }
+ catch(Exception e){
+ report.setStatus(Report.FAIL);
+ report.setExceptionStack(e);
+ }
+
return new Forward(Report.RESULTS, Report.KEY, report);
}
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf?rev=168391&r1=168390&r2=168391&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/extension/Controller.jpf
Thu May 5 12:43:38 2005
@@ -17,6 +17,10 @@
*/
package extension;
+
+import java.lang.InterruptedException;
+import java.lang.Thread;
+
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.FormData;
@@ -46,30 +50,19 @@
/** EventHandler that receives SuperClassEvent from subcontrol*/
- /* This causes a compile error
@EventHandler (field="subcontrol", eventSet=
SubControlBean.SuperClassEvent.class,
eventName="method1")
public void subcontrolMessageHandler()
{
- System.out.println("***************************************");
- System.out.println("SuperClassEvent received");
- System.out.println("***************************************");
-
- superClassEventReceived=true;
+ superClassEventReceived=true;
}
- */
/** EventHandler that receives SubClassEvent from subcontrol*/
-
@EventHandler (field="subcontrol", eventSet=
SubControlBean.SubClassEvent.class,
eventName="method1")
public void subcontrolMessageHandler2()
{
- System.out.println("***************************************");
- System.out.println("SubClassEvent received");
- System.out.println("***************************************");
-
- subClassEventReceived=true;
+ subClassEventReceived=true;
}
@@ -477,15 +470,19 @@
)
protected Forward testInvokeExtendedEvent(){
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- System.out.println("testInvokeExtendedEvent");
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
-
-
Report report=new Report();
int result=subcontrol.invokeExtendedEventFromSubControl();
- if (result==0)
- report.setStatus(Report.PASS);
+ try{Thread.currentThread().sleep(500);}
+ catch(InterruptedException e){}
+ if (result==0){
+ if (subClassEventReceived)
+ report.setStatus(Report.PASS);
+ else{
+ report.setStatus(Report.FAIL);
+ report.setMessage("The inherited event is NOT
received");
+ }
+
+ }
else{
report.setStatus(Report.FAIL);
report.setMessage("The event on subcontrol is not triggered
successfully");
@@ -495,20 +492,23 @@
@Jpf.Action(
)
- protected Forward testGetSubClassEventRslt(){
+ protected Forward testInvokeInheritedEvent(){
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
- System.out.println("testGetSubClassEventRslt");
- System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
-
-
Report report=new Report();
+ int result=subcontrol.invokeInheritedEventFromSubControl();
- if (subClassEventReceived)
- report.setStatus(Report.PASS);
+ if (result==0){
+ if (superClassEventReceived)
+ report.setStatus(Report.PASS);
+ else{
+ report.setStatus(Report.FAIL);
+ report.setMessage("The extended event is NOT received");
+ }
+
+ }
else{
report.setStatus(Report.FAIL);
- report.setMessage("SubClassEvent is not received.");
+ report.setMessage("The event on subcontrol is not triggered
successfully");
}
return new Forward(Report.RESULTS, Report.KEY, report);
}
