You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/05/01 21:56:44 UTC
svn commit: r398672 - in /beehive/trunk/controls/test/src:
controls/org/apache/beehive/controls/test/controls/contextevent/
drivers/org/apache/beehive/controls/test/driver/contextevent/
junit-tests/org/apache/beehive/controls/test/junit/ units/org/apac...
Author: ekoneil
Date: Mon May 1 12:56:42 2006
New Revision: 398672
URL: http://svn.apache.org/viewcvs?rev=398672&view=rev
Log:
Add some test cleanup. Am trying to debug a Controls + JPF test in the controls/test directory and am adding some traces to print exceptions where they are otherwise eaten.
BB: self
Test: Controls pass
Modified:
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.java
beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java
beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/DeclarativeTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.java?rev=398672&r1=398671&r2=398672&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/contextevent/RecorderImpl.java Mon May 1 12:56:42 2006
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-
+
package org.apache.beehive.controls.test.controls.contextevent;
import org.apache.beehive.controls.api.context.Context;
@@ -27,60 +27,59 @@
/**
* A control impl that listens to and records context events
* This impl listens to context events by declaring EventHandler.
- *
+ * <p/>
* There are two sources of control context events: ControlBeanContext and
* ResouceContext.
- * This class listens to context events from both sources.
+ * This class listens to context events from both sources.
*/
-@ControlImplementation
-public class RecorderImpl implements Recorder, java.io.Serializable
-{
-
- private String event_log="init";
-
- @Context ControlBeanContext context;
- @Context ResourceContext resourceContext;
-
+@ControlImplementation
+public class RecorderImpl implements Recorder, java.io.Serializable {
+
+ private String event_log = "init";
+
+ @Context
+ ControlBeanContext context;
+ @Context
+ ResourceContext resourceContext;
+
/*A EventHandler that listens to onCreate event*/
- @EventHandler(field="context", eventSet=ControlBeanContext.LifeCycle.class, eventName="onCreate")
- public void onCreate()
- {
- System.out.println("+++++++++++++++++++++++++++++++++++++++++");
+ @EventHandler(field = "context", eventSet = ControlBeanContext.LifeCycle.class, eventName = "onCreate")
+ public void onCreate() {
+ System.out.println("+++++++++++++++++++++++++++++++++++++++++");
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*/
- @EventHandler(field="resourceContext", eventSet=ResourceContext.ResourceEvents.class, eventName="onAcquire")
- public void onAcquire()
- {
- System.out.println("+++++++++++++++++++++++++++++++++++++++++");
+ @EventHandler(field = "resourceContext", eventSet = ResourceContext.ResourceEvents.class, eventName = "onAcquire")
+ public void onAcquire() {
+ Thread.dumpStack();
+
+ 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*/
- @EventHandler(field="resourceContext", eventSet=ResourceContext.ResourceEvents.class, eventName="onRelease")
- public void onRelease()
- {
- System.out.println("+++++++++++++++++++++++++++++++++++++++++");
+ @EventHandler(field = "resourceContext", eventSet = ResourceContext.ResourceEvents.class, eventName = "onRelease")
+ public void onRelease() {
+ System.out.println("+++++++++++++++++++++++++++++++++++++++++");
System.out.println("onRelease invoked on RecorderImpl");
System.out.println("++++++++++++++++++++++++++++++++++++++++++");
- event_log=event_log+"onRelease";
+ event_log = event_log + "onRelease";
}
-
+
/*Returns the event log*/
- public String getRecord()
- {
- System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
+ public String getRecord() {
+ System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
System.out.println("getRecord method invoked on RecorderImpl");
System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");
-
- return event_log;
+
+ return event_log;
}
}
Modified: beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java?rev=398672&r1=398671&r2=398672&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java (original)
+++ beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveBeanRecorder.java Mon May 1 12:56:42 2006
@@ -15,11 +15,9 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.driver.contextevent;
import java.beans.PropertyChangeEvent;
-import java.lang.Class;
import org.apache.beehive.controls.api.context.ControlBeanContext;
import org.apache.beehive.controls.api.context.ResourceContext;
import org.apache.beehive.controls.test.controls.contextevent.RecorderBean;
@@ -31,17 +29,15 @@
* This class listens to context events by adding listeners to ControlBeanContext and
* ResourceContext.
*/
-public class DriveBeanRecorder
-{
-
- private RecorderBean myControl;
- private boolean onCreateReceived=false;
- private boolean onAcquireReceived=false;
- private boolean onReleaseReceived=false;
+public class DriveBeanRecorder {
- public void setControl(RecorderBean aControl){
+ private RecorderBean _theControl;
+ private boolean _onCreateReceived =false;
+ private boolean _onAcquireReceived =false;
+ private boolean _onReleaseReceived =false;
- myControl=aControl;
+ public void setControl(RecorderBean theControl){
+ _theControl = theControl;
}
/*
@@ -54,24 +50,28 @@
Report report=new Report();
- if (myControl==null){
+ if (_theControl ==null){
report.setStatus(Report.FAIL);
report.setMessage("the custom control is NULL");
}
else{
- ControlBeanContext beanContext = myControl.getControlBeanContext();
- beanContext.addLifeCycleListener( new ControlBeanContext.LifeCycle()
- {
- public void onCreate() { onCreateReceived=true; };
- public void onPropertyChange(PropertyChangeEvent pce) {};
- public void onVetoableChange(PropertyChangeEvent pce) {};
- }
-
- );
+ ControlBeanContext beanContext = _theControl.getControlBeanContext();
+ beanContext.addLifeCycleListener(
+ new ControlBeanContext.LifeCycle() {
+ public void onCreate() {
+ _onCreateReceived =true;
+ }
+
+ public void onPropertyChange(PropertyChangeEvent pce) {
+ }
+
+ public void onVetoableChange(PropertyChangeEvent pce) {
+ }
+ }
+ );
-
- report.setStatus(Report.PASS);
+ report.setStatus(Report.PASS);
}
return report;
@@ -87,31 +87,31 @@
Report report=new Report();
- if (myControl==null){
+ if (_theControl ==null){
report.setStatus(Report.FAIL);
- report.setMessage("the custom control is NULL");
+ report.setMessage("The control is null.");
}
else{
-
- ControlBeanContext beanContext = myControl.getControlBeanContext();
+ ControlBeanContext beanContext = _theControl.getControlBeanContext();
try{
- ResourceContext resourceContext=(ResourceContext)beanContext.getService(
- Class.forName("org.apache.beehive.controls.api.context.ResourceContext"),null);
- resourceContext.addResourceEventsListener( new ResourceContext.ResourceEvents()
- {
- public void onAcquire(){
- onAcquireReceived=true;
- }
- public void onRelease(){
- onReleaseReceived=true;
- }
- });
- String s=myControl.getRecord();
+ ResourceContext resourceContext = beanContext.getService(ResourceContext.class, null);
+ resourceContext.addResourceEventsListener(new ResourceContext.ResourceEvents()
+ {
+ public void onAcquire(){
+ _onAcquireReceived =true;
+ }
+ public void onRelease(){
+ _onReleaseReceived =true;
+ }
+ });
+
+ String s = _theControl.getRecord();
report.setStatus(Report.PASS);
}
catch(Exception e){
- report.setStatus(Report.FAIL);
+ e.printStackTrace();
+ report.setStatus(Report.FAIL);
report.setExceptionStack(e);
}
}
@@ -129,16 +129,16 @@
Report report=new Report();
- if (myControl==null){
+ if (_theControl ==null){
report.setStatus(Report.FAIL);
- report.setMessage("the custom control is NULL");
+ report.setMessage("The control is null.");
}
else{
- if (onAcquireReceived)
+ if (_onAcquireReceived)
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
- report.setMessage("onAcquire is not received.");
+ report.setMessage("The onAcquire ResourceContext event was not received.");
}
}
Modified: beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java?rev=398672&r1=398671&r2=398672&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java (original)
+++ beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/contextevent/DriveRecorder.java Mon May 1 12:56:42 2006
@@ -15,23 +15,20 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.driver.contextevent;
import org.apache.beehive.test.tools.milton.common.Report;
import org.apache.beehive.controls.test.controls.contextevent.RecorderBean;
-/* This class contains the logic to test control context event.
+/**
+ * This class contains the logic to test control context event.
*/
-
public class DriveRecorder
{
+ private RecorderBean _theControl;
- private RecorderBean myControl;
-
- public void setControl(RecorderBean aControl){
-
- myControl=aControl;
+ public void setControl(RecorderBean theControl){
+ _theControl = theControl;
}
/*
@@ -41,13 +38,13 @@
Report report=new Report();
- if (myControl==null){
+ if (_theControl ==null){
report.setStatus(Report.FAIL);
report.setMessage("the custom control is NULL");
}
else{
- String record=myControl.getRecord();
+ String record=_theControl.getRecord();
if (record.equals("initonCreateonAcquire"))
report.setStatus(Report.PASS);
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java?rev=398672&r1=398671&r2=398672&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/ComplexLifecycleTest.java Mon May 1 12:56:42 2006
@@ -21,9 +21,7 @@
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.api.context.ControlContainerContext;
-import org.apache.beehive.controls.api.context.ControlBeanContext;
import org.apache.beehive.controls.test.controls.lifecycle.ControlLifecycle;
-import junit.framework.TestCase;
/**
*
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/DeclarativeTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/DeclarativeTest.java?rev=398672&r1=398671&r2=398672&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/DeclarativeTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/DeclarativeTest.java Mon May 1 12:56:42 2006
@@ -119,8 +119,6 @@
Assert.assertEquals("outerControl", outerControl.getControlID());
Assert.assertEquals("outerControl/innerControl", outerControl.getDeclaredNestedControl().getControlID());
- Thread.dumpStack();
-
// Test the relationships and identifiers are preserved across serialization and deserialization
ByteArrayOutputStream baos = null;
ObjectOutputStream oos = null;
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java?rev=398672&r1=398671&r2=398672&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java Mon May 1 12:56:42 2006
@@ -19,43 +19,40 @@
import org.apache.beehive.test.tools.milton.junit.HtmlReportTestCase;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
/**
* Tests control context events
*/
-public class TestLifecycleEvent extends HtmlReportTestCase
-{
- public TestLifecycleEvent(String s){
- super(s);
- }
+public class TestLifecycleEvent
+ extends HtmlReportTestCase {
+ public TestLifecycleEvent(String s) {
+ super(s);
+ }
+
/**
* Verifies control implmentation receiving control lifecycle events.
* The control is instantiated declaratively by the pageflow
*/
- @Freq("checkin")
- public void testReceivedByImpl() throws Exception
- {
- assertReport("/controlsWeb/contextevent/implrecord/Controller.jpf");
+ @Freq("checkin")
+ public void testReceivedByImpl() throws Exception {
+ assertReport("/controlsWeb/contextevent/implrecord/Controller.jpf");
}
/**
* Verifies control implmentation receiving control lifecycle events.
* The control is instantiated programmatically by the pageflow
*/
- @Freq("checkin")
- public void testReceivedByImpl2() throws Exception
- {
- assertReport("/controlsWeb/contextevent/implrecord2/Controller.jpf");
+ @Freq("checkin")
+ public void testReceivedByImpl2() throws Exception {
+ assertReport("/controlsWeb/contextevent/implrecord2/Controller.jpf");
}
/**
* Tests receiving control lifecycle events from control bean instance.
*/
- @Freq("checkin")
- public void testListenFromBean() throws Exception
- {
- assertReport("/controlsWeb/contextevent/beanrecord/Controller.jpf");
+ @Freq("checkin")
+ public void testListenFromBean() throws Exception {
+ assertReport("/controlsWeb/contextevent/beanrecord/Controller.jpf");
}