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/04/26 18:20:11 UTC
svn commit: r397228 [1/2] - in /beehive/trunk/controls/test: infra/milton/
src/controls/org/apache/beehive/controls/test/controls/composition/
src/drivers/org/apache/beehive/controls/test/driver/composition/
src/junit-controls/org/apache/beehive/contro...
Author: ekoneil
Date: Wed Apr 26 09:19:58 2006
New Revision: 397228
URL: http://svn.apache.org/viewcvs?rev=397228&view=rev
Log:
Test cleanup. Trying to debug a TCH test and understand the infrastructure that is used there.
BB: self
Test: Controls pass
Modified:
beehive/trunk/controls/test/infra/milton/milton.jar
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Composer.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/ComposerImpl.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControl.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlEventListener.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlImpl.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Nested.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedAssembler.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedImpl.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControl.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControlImpl.java
beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/ComposerBeanDriver.java
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControl.java
beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControlImpl.java
beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleSerializationTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/assembly/AssemblyTests.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/beaninfo/BeanInfoTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ComposerTest.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/java/composition/ProgrammaticTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextParamTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/ContextEventTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/encoding/EncodingTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/generic/GenericTest.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/instantiate/TestInstantiate.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/binding/TestControlBinding.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/composition/TestOuterControl.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/context/TestContext.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/contextevent/TestLifecycleEvent.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/event/TestEvent.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/extension/TestSubControl.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/instantiate/TestInstantiate.java
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/jpf/property/TestProperty.java
beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonControlContext.java
beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonTestCase.java
beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/ReportTestCase.java
Modified: beehive/trunk/controls/test/infra/milton/milton.jar
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/milton/milton.jar?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
Binary files - no diff available.
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Composer.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Composer.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Composer.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Composer.java Wed Apr 26 09:19:58 2006
@@ -15,18 +15,11 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
import org.apache.beehive.controls.api.bean.ControlInterface;
-import org.apache.beehive.controls.api.properties.PropertyKey;
-import org.apache.beehive.controls.api.properties.PropertySet;
/**
* A simple control that tests control composition
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/ComposerImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/ComposerImpl.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/ComposerImpl.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/ComposerImpl.java Wed Apr 26 09:19:58 2006
@@ -30,10 +30,9 @@
import org.apache.beehive.test.tools.milton.junit.MiltonControlContext;
-
@ControlImplementation
-public class ComposerImpl implements Composer, java.io.Serializable
-{
+public class ComposerImpl
+ implements Composer, java.io.Serializable {
static final long serialVersionUID = 1L;
@Context
@@ -50,31 +49,31 @@
@Nested.Index(1)
private @Control Nested nested1;
+ @Control
@Nested.Index(2)
- /* package */@Control Nested nested2;
+ /* package */ Nested nested2;
+ @Control
@Nested.Index(3)
- protected @Control Nested nested3;
+ protected Nested nested3;
+ @Control
@Nested.Index(4)
- public @Control Nested nested4;
+ public Nested nested4;
/**
* Provides a simple test API to externally query the PropertySet values on a
* nested control.
*/
- public Annotation getControlPropertySet(Class propertySet)
- {
+ public Annotation getControlPropertySet(Class propertySet) {
return propControl.getControlPropertySet(propertySet);
}
- public Annotation getExtensionControlPropertySet(Class propertySet)
- {
+ public Annotation getExtensionControlPropertySet(Class propertySet) {
return propExtControl.getControlPropertySet(propertySet);
}
- public void invokeNestedControls()
- {
+ public void invokeNestedControls() {
nested1.fireEvent( "Return", "returnVoid" );
nested1.fireEvent( "Return", "returnInt" );
nested1.fireEvent( "Return", "returnString" );
@@ -84,93 +83,84 @@
// Define various event handlers for the nested controls
//
@EventHandler(field="nested1", eventSet=Nested.Return.class, eventName="returnVoid")
- public void nested1ReturnVoid()
- {
+ public void nested1ReturnVoid() {
_testContext.addEvent( "nested1ReturnVoid" );
- return;
}
@EventHandler(field="nested1", eventSet=Nested.Return.class, eventName="returnString")
- public String nested1ReturnString()
- {
+ public String nested1ReturnString() {
_testContext.addEvent( "nested1ReturnString" );
return "Hello";
}
@EventHandler(field="nested1", eventSet=Nested.Return.class, eventName="returnInt")
- public int nested1ReturnInt()
- {
+ public int nested1ReturnInt() {
_testContext.addEvent( "nested1ReturnInt" );
return 21;
}
@EventHandler(field="nested2", eventSet=Nested.Args.class, eventName="argsInt")
- public int nested2ArgsInt(int value)
- {
+ public int nested2ArgsInt(int value) {
_testContext.addEvent( "nested2ArgsInt" );
return value;
}
@EventHandler(field="nested2", eventSet=Nested.Args.class, eventName="argsString")
- public String nested2ArgsString(String value)
- {
+ public String nested2ArgsString(String value) {
_testContext.addEvent( "nested2ArgsString" );
return value;
}
@EventHandler(field="nested2", eventSet=Nested.Args.class, eventName="argsMultiple")
- public Object [] nested2ArgsMultiple(int val1, String val2)
- {
+ public Object [] nested2ArgsMultiple(int val1, String val2) {
_testContext.addEvent( "nested2ArgsMultiple" );
return new Object[] {val1,val2};
}
@EventHandler(field="nested3", eventSet=Nested.Except.class, eventName="exceptIO")
- public void nested3ExceptIO() throws java.io.IOException
- {
+ public void nested3ExceptIO()
+ throws java.io.IOException {
_testContext.addEvent( "nested3ExceptIO" );
throw new java.io.IOException("Ouch");
}
@EventHandler(field="nested3", eventSet=Nested.Except.class, eventName="exceptRuntime")
- public void nested3ExceptRuntime() throws java.lang.RuntimeException
- {
+ public void nested3ExceptRuntime()
+ throws java.lang.RuntimeException {
_testContext.addEvent( "nested3ExceptRuntime" );
throw new RuntimeException("Crash");
}
@EventHandler(field="nested3", eventSet=Nested.Except.class, eventName="exceptLocal")
- public void nested3ExceptLocal() throws Nested.LocalException
- {
+ public void nested3ExceptLocal()
+ throws Nested.LocalException {
_testContext.addEvent( "nested3ExceptLocal" );
throw new Nested.LocalException("Bang");
}
@EventHandler(field="nested3", eventSet=Nested.Except.class, eventName="exceptMultiple")
- public void nested3ExceptMultiple() throws java.io.IOException, RuntimeException
- {
+ public void nested3ExceptMultiple()
+ throws java.io.IOException, RuntimeException {
_testContext.addEvent( "nested3ExceptMultiple" );
throw new java.io.IOException("Play nice!");
}
@EventHandler(field="nested4", eventSet=Nested.Return.class, eventName="returnInt")
- public int nested4ReturnInt()
- {
+ public int nested4ReturnInt() {
_testContext.addEvent( "nested4ReturnInt" );
return 99;
}
@EventHandler(field="nested4", eventSet=Nested.Args.class, eventName="argsString")
- public String nested4ArgsString(String value)
- {
+ public String nested4ArgsString(String value) {
_testContext.addEvent( "nested4ArgsString" );
return value;
}
@EventHandler(field="nested4", eventSet=Nested.Except.class, eventName="exceptLocal")
- public void nested4ExceptLocal() throws Nested.LocalException
- {
+ public void nested4ExceptLocal()
+ throws Nested.LocalException {
_testContext.addEvent( "nested4ExceptLocal" );
throw new Nested.LocalException("Bang");
}
-}
+}
\ No newline at end of file
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControl.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControl.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControl.java Wed Apr 26 09:19:58 2006
@@ -15,7 +15,6 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
import java.lang.annotation.ElementType;
@@ -39,27 +38,22 @@
@PropertySet
@Target( {ElementType.TYPE, ElementType.FIELD} )
@Retention(RetentionPolicy.RUNTIME)
- public @interface Identity
- {
+ public @interface Identity {
public String name() default DEFAULT_NAME;
//does not have a default value assigned
public String job();
public int rank() default 0;
}
-
-
@EventSet(unicast=true)
- public interface Activity
- {
+ public interface Activity {
void wakeup();
int readMessage(String message);
String report();
}
@EventSet(unicast=true)
- public interface Action
- {
+ public interface Action {
public Object[] shopping (double credit);
public void doStuff(String value);
}
@@ -69,6 +63,7 @@
/*Gets property value from context*/
public String getNameFromContext();
+
/*Gets property value from context*/
public String getJobFromContext();
}
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlEventListener.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlEventListener.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlEventListener.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlEventListener.java Wed Apr 26 09:19:58 2006
@@ -15,15 +15,14 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
/**
* A listener class for event raised by InnerControl
*/
-public class InnerControlEventListener implements InnerControl.Activity,InnerControl.Action,
- java.io.Serializable
-{
+public class InnerControlEventListener
+ implements InnerControl.Activity,InnerControl.Action,
+ java.io.Serializable {
private boolean wakeupReceived=false;
private boolean readMessageReceived=false;
@@ -42,31 +41,52 @@
*
*/
- public void wakeup(){wakeupReceived=true;}
+ public void wakeup(){
+ wakeupReceived=true;
+ }
+
public int readMessage(String message){
readMessageReceived=true;
- return 0;}
+ return 0;
+ }
+
public String report(){
reportReceived=true;
- return "a report from event listener";}
+ return "a report from event listener";
+ }
public Object[] shopping (double credit){
shoppingReceived=true;
//return (Object){"clothes","shoes","food"};
return null;
- }
+ }
+
public void doStuff(String value){
doStuffReceived=true;
- }
+ }
- public boolean getWakeupResult(){return wakeupReceived;}
- public boolean getReadMessageResult(){return readMessageReceived;}
- public boolean getReportResult(){return reportReceived;}
- public boolean getShoppingResult(){return shoppingReceived;}
- public boolean getDoStuffResult(){return doStuffReceived;}
+ public boolean getWakeupResult(){
+ return wakeupReceived;
+ }
+
+ public boolean getReadMessageResult(){
+ return readMessageReceived;
+ }
+
+ public boolean getReportResult(){
+ return reportReceived;
+ }
+
+ public boolean getShoppingResult(){
+ return shoppingReceived;
+ }
+
+ public boolean getDoStuffResult(){
+ return doStuffReceived;
+ }
- /* checks all the event records.
- * returns '0' if all the events have been received.
+ /**
+ * Checks all the event records and returns '0' if all the events have been received.
*/
public String getFinalResult(){
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlImpl.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlImpl.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/InnerControlImpl.java Wed Apr 26 09:19:58 2006
@@ -15,11 +15,8 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
-import java.lang.reflect.Method;
-
import org.apache.beehive.controls.api.bean.ControlImplementation;
import org.apache.beehive.controls.api.events.Client;
import org.apache.beehive.controls.api.context.Context;
@@ -30,24 +27,28 @@
* This control shall be instantiated by another control.
*/
@ControlImplementation
-public class InnerControlImpl implements InnerControl, java.io.Serializable
-{
- @Context ControlBeanContext context;
- @Client Activity activity;
- @Client Action action;
+public class InnerControlImpl
+ implements InnerControl, java.io.Serializable {
+
+ @Context
+ ControlBeanContext context;
+ @Client
+ Activity activity;
+
+ @Client
+ Action action;
/*Gets property value from context*/
public String getNameFromContext(){
-
- Identity identity=(InnerControl.Identity)context.getControlPropertySet(InnerControl.Identity.class);
- return identity.name();
+ Identity identity = context.getControlPropertySet(InnerControl.Identity.class);
+ return identity.name();
}
+
/*Gets property value from context*/
public String getJobFromContext(){
-
- Identity identity=(InnerControl.Identity)context.getControlPropertySet(InnerControl.Identity.class);
- return identity.job();
+ Identity identity = context.getControlPropertySet(InnerControl.Identity.class);
+ return identity.job();
}
public void fireEvent(String eventSet, String eventName){
@@ -73,12 +74,10 @@
}
public void fireAllEvents(){
-
activity.wakeup();
- activity.readMessage("message from nested control");
- activity.report();
- action.shopping(999.99d);
- action.doStuff("stuff to do");
+ activity.readMessage("message from nested control");
+ activity.report();
+ action.shopping(999.99d);
+ action.doStuff("stuff to do");
}
-
-}
+}
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Nested.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Nested.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Nested.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/Nested.java Wed Apr 26 09:19:58 2006
@@ -15,7 +15,6 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
import java.lang.annotation.ElementType;
@@ -28,46 +27,48 @@
import org.apache.beehive.controls.api.properties.PropertySet;
@ControlInterface
-public interface Nested
-{
+public interface Nested {
+
+ public void fireEvent(String eventSet, String eventName);
+
@PropertySet
@Target( {ElementType.TYPE, ElementType.FIELD} )
@Retention(RetentionPolicy.RUNTIME)
- public @interface Index
- {
+ public @interface Index {
int value() default -1;
}
@EventSet(unicast=true)
- public interface Return
- {
+ public interface Return {
void returnVoid();
String returnString();
int returnInt();
}
@EventSet(unicast=true)
- public interface Args
- {
+ public interface Args {
public int argsInt(int value);
public String argsString(String value);
public Object [] argsMultiple(int val1, String val2);
}
- public class LocalException extends Exception
- {
- LocalException(String msg) { super(msg); }
- LocalException(String msg, Throwable t) { super(msg,t); }
- }
-
@EventSet
- public interface Except
- {
+ public interface Except {
void exceptIO() throws java.io.IOException;
void exceptRuntime() throws java.lang.RuntimeException;
void exceptLocal() throws LocalException;
void exceptMultiple() throws java.io.IOException, RuntimeException;
}
- public void fireEvent(String eventSet, String eventName);
+ public class LocalException
+ extends Exception
+ {
+ LocalException(String msg) {
+ super(msg);
+ }
+
+ LocalException(String msg, Throwable t) {
+ super(msg, t);
+ }
+ }
}
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedAssembler.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedAssembler.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedAssembler.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedAssembler.java Wed Apr 26 09:19:58 2006
@@ -15,16 +15,15 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
import org.apache.beehive.controls.api.assembly.ControlAssembler;
import org.apache.beehive.controls.api.assembly.ControlAssemblyContext;
-public class NestedAssembler implements ControlAssembler
-{
- public void assemble( ControlAssemblyContext cac )
- {
+public class NestedAssembler
+ implements ControlAssembler {
+
+ public void assemble(ControlAssemblyContext cac) {
System.out.println( "NestedAssembler:" );
System.out.println( " context type=" + cac.getClass().getName() );
System.out.println( " module=" + cac.getModuleDir() );
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedImpl.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedImpl.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/NestedImpl.java Wed Apr 26 09:19:58 2006
@@ -15,7 +15,6 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
import org.apache.beehive.controls.api.bean.ControlImplementation;
@@ -23,51 +22,59 @@
import org.apache.beehive.controls.api.context.Context;
import org.apache.beehive.test.tools.milton.junit.MiltonControlContext;
-@ControlImplementation( assembler=NestedAssembler.class )
-public class NestedImpl implements Nested, java.io.Serializable
-{
- @Context MiltonControlContext testContext;
-
- @Client Return returnClient;
- @Client Args argsClient;
- @Client Except exceptClient;
-
- public void fireEvent(String set, String name)
- {
- if ( set.equals("Return") )
- {
- if ( name.equals( "returnVoid" ) )
+@ControlImplementation(assembler = NestedAssembler.class)
+public class NestedImpl
+ implements Nested, java.io.Serializable {
+
+ @Context
+ MiltonControlContext testContext;
+
+ @Client
+ Return returnClient;
+
+ @Client
+ Args argsClient;
+
+ @Client
+ Except exceptClient;
+
+ public void fireEvent(String set, String name) {
+ if (set.equals("Return")) {
+ if (name.equals("returnVoid"))
returnClient.returnVoid();
- if ( name.equals( "returnInt" ) )
+
+ if (name.equals("returnInt"))
returnClient.returnInt();
- if ( name.equals( "returnString" ) )
+
+ if (name.equals("returnString"))
returnClient.returnString();
- }
- else if ( set.equals("Args") )
- {
- if ( name.equals( "argsInt" ) )
- argsClient.argsInt( 1 );
- if ( name.equals( "argsString" ) )
- argsClient.argsString( "foo" );
- if ( name.equals( "argsMultiple" ) )
- argsClient.argsMultiple( 2, "bar" );
- }
- else if ( set.equals( "Except") )
- {
- try
- {
- if ( name.equals( "exceptIO") );
+
+ } else if (set.equals("Args")) {
+ if (name.equals("argsInt"))
+ argsClient.argsInt(1);
+
+ if (name.equals("argsString"))
+ argsClient.argsString("foo");
+
+ if (name.equals("argsMultiple"))
+ argsClient.argsMultiple(2, "bar");
+
+ } else if (set.equals("Except")) {
+ try {
+ if (name.equals("exceptIO"))
exceptClient.exceptIO();
- if ( name.equals( "exceptRuntime") )
+
+ if (name.equals("exceptRuntime"))
exceptClient.exceptRuntime();
- if ( name.equals( "exceptLocal") )
+
+ if (name.equals("exceptLocal"))
exceptClient.exceptLocal();
- if ( name.equals( "exceptMultiple") )
+
+ if (name.equals("exceptMultiple"))
exceptClient.exceptMultiple();
}
- catch ( Exception e )
- {
- testContext.addEvent( e.getClass().getName() );
+ catch (Exception e) {
+ testContext.addEvent(e.getClass().getName());
}
}
}
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControl.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControl.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControl.java Wed Apr 26 09:19:58 2006
@@ -15,35 +15,31 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
-
import org.apache.beehive.controls.api.bean.ControlInterface;
import org.apache.beehive.controls.api.events.EventSet;
-import org.apache.beehive.controls.test.controls.composition.InnerControlBean;
-
/**
* A control interface to test control composition.
*/
@ControlInterface
-public interface OuterControl
-{
+public interface OuterControl {
+
@EventSet(unicast=true)
- public interface OuterEvents
- {
+ public interface OuterEvents {
int report(String message);
}
- public void fireOuterEvents( String message );
+ public void fireOuterEvents(String message);
public InnerControlBean getDeclaredNestedControl();
public InnerControlBean getDeclaredNestedControl2();
public InnerControlBean instantiateNestedControlProgrammatically();
public InnerControlBean instantiateNestedControlWithProperty();
- /*Test outer control receiving event from nested control using
+ /*
+ * Test outer control receiving event from nested control using
* EventHandler.
*/
public String testActivityWakeup();
@@ -52,21 +48,26 @@
public String testActionShopping();
public String testActionDostuff();
- /*Tests outer control receiving event from nested control using
+ /*
+ * Tests outer control receiving event from nested control using
* event listener. The nested control is instantiated programmatically
*/
public String testEventListener();
- /*Tests outer control receiving event from nested control using
+ /*
+ * Tests outer control receiving event from nested control using
* event listener. The nested control is instantiated decalratively
*/
public String testEventListenerByDeclare();
- /*Tests outer control receiving event from nested control using
+ /*
+ * Tests outer control receiving event from nested control using
* inner class listener. The nested control is instantiated programmatically
*/
public String testInnerClassListener();
- /*Tests outer control receiving event from nested control using
+
+ /*
+ * Tests outer control receiving event from nested control using
* inner class listener. The nested control is instantiated decalratively
*/
public String testInnerClassListenerByDeclare();
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControlImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControlImpl.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControlImpl.java (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/composition/OuterControlImpl.java Wed Apr 26 09:19:58 2006
@@ -15,473 +15,487 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.composition;
import org.apache.beehive.controls.api.bean.ControlImplementation;
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.context.Context;
-import org.apache.beehive.controls.api.context.ControlBeanContext;
import org.apache.beehive.controls.api.events.Client;
import org.apache.beehive.controls.api.events.EventHandler;
-import org.apache.beehive.controls.api.properties.PropertyMap;
import org.apache.beehive.controls.api.properties.BeanPropertyMap;
-import org.apache.beehive.controls.test.controls.composition.InnerControlBean;
-
/**
- * A control implementation to test control composition.
- * Makes two instances of nested control be declaration.
+ * A control implementation to test control composition. Makes two instances of nested control be declaration.
*/
@ControlImplementation
-public class OuterControlImpl implements OuterControl, java.io.Serializable
-{
+public class OuterControlImpl
+ implements OuterControl, java.io.Serializable {
+
static final long serialVersionUID = 1L;
- static final String EVENT_RECEIVED="Event Received";
-
- private String innerControlEventHandlerWakeUp="";
- private String innerControlEventHandlerReadMessage="";
- private String innerControlEventHandlerReport="";
- private String innerControlEventHandlerShopping="";
- private String innerControlEventHandlerDoStuff="";
-
- private boolean innerClassWakeUp=false;
- private boolean innerClassReadMessage=false;
- private boolean innerClassReport=false;
- private boolean innerClassShopping=false;
- private boolean innerClassDoStuff=false;
-
- private boolean innerControlInnerClassWakeUp=false;
- private boolean innerControlInnerClassReadMessage=false;
- private boolean innerControlInnerClassReport=false;
- private boolean innerControlInnerClassShopping=false;
- private boolean innerControlInnerClassDoStuff=false;
-
+ static final String EVENT_RECEIVED = "Event Received";
+
+ private String innerControlEventHandlerWakeUp = "";
+ private String innerControlEventHandlerReadMessage = "";
+ private String innerControlEventHandlerReport = "";
+ private String innerControlEventHandlerShopping = "";
+ private String innerControlEventHandlerDoStuff = "";
+
+ private boolean innerClassWakeUp = false;
+ private boolean innerClassReadMessage = false;
+ private boolean innerClassReport = false;
+ private boolean innerClassShopping = false;
+ private boolean innerClassDoStuff = false;
+
+ private boolean innerControlInnerClassWakeUp = false;
+ private boolean innerControlInnerClassReadMessage = false;
+ private boolean innerControlInnerClassReport = false;
+ private boolean innerControlInnerClassShopping = false;
+ private boolean innerControlInnerClassDoStuff = false;
+
@Client
transient OuterEvents outerEvents;
/*Instantiates a nested control without reconfiguring the property*/
- @Control
+ @Control
InnerControlBean innerControl;
- @Control
- @InnerControl.Identity(job="farmer")
+ @Control
+ @InnerControl.Identity(job = "farmer")
InnerControlBean innerControl2;
-
-
+
//
// Define various event handlers for the nested controls
//
- @EventHandler(field="innerControl", eventSet=InnerControl.Activity.class, eventName="wakeup")
- public void innerControlwakeup() { innerControlEventHandlerWakeUp=EVENT_RECEIVED; }
+ @EventHandler(field = "innerControl", eventSet = InnerControl.Activity.class, eventName = "wakeup")
+ public void innerControlwakeup() {
+ innerControlEventHandlerWakeUp = EVENT_RECEIVED;
+ }
- @EventHandler(field="innerControl", eventSet=InnerControl.Activity.class, eventName="readMessage")
- public int innerControlreadMessage(String message) {
- innerControlEventHandlerReadMessage=EVENT_RECEIVED;
- return 0;
+ @EventHandler(field = "innerControl", eventSet = InnerControl.Activity.class, eventName = "readMessage")
+ public int innerControlreadMessage(String message) {
+ innerControlEventHandlerReadMessage = EVENT_RECEIVED;
+ return 0;
}
- @EventHandler(field="innerControl", eventSet=InnerControl.Activity.class, eventName="report")
- public String innerControlreport() {
- innerControlEventHandlerReport=EVENT_RECEIVED;
- return "a report";
+ @EventHandler(field = "innerControl", eventSet = InnerControl.Activity.class, eventName = "report")
+ public String innerControlreport() {
+ innerControlEventHandlerReport = EVENT_RECEIVED;
+ return "a report";
}
- @EventHandler(field="innerControl", eventSet=InnerControl.Action.class, eventName="shopping")
- public Object [] innerControlshopping(double credit) {
- innerControlEventHandlerShopping=EVENT_RECEIVED;
- return null;
+ @EventHandler(field = "innerControl", eventSet = InnerControl.Action.class, eventName = "shopping")
+ public Object [] innerControlshopping(double credit) {
+ innerControlEventHandlerShopping = EVENT_RECEIVED;
+ return null;
}
- @EventHandler(field="innerControl", eventSet=InnerControl.Action.class, eventName="doStuff")
+ @EventHandler(field = "innerControl", eventSet = InnerControl.Action.class, eventName = "doStuff")
public void innerControldoStuff(String vakue) {
- innerControlEventHandlerDoStuff=EVENT_RECEIVED;
+ innerControlEventHandlerDoStuff = EVENT_RECEIVED;
}
- @EventHandler(field="innerControl2", eventSet=InnerControl.Activity.class, eventName="wakeup")
- public void innerControl2wakeup() {}
+ @EventHandler(field = "innerControl2", eventSet = InnerControl.Activity.class, eventName = "wakeup")
+ public void innerControl2wakeup() {
+ }
- @EventHandler(field="innerControl2", eventSet=InnerControl.Activity.class, eventName="readMessage")
- public int innerControl2readMessage(String message) { return 0; }
+ @EventHandler(field = "innerControl2", eventSet = InnerControl.Activity.class, eventName = "readMessage")
+ public int innerControl2readMessage(String message) {
+ return 0;
+ }
- @EventHandler(field="innerControl2", eventSet=InnerControl.Activity.class, eventName="report")
- public String innerControl2report() { return "a report"; }
+ @EventHandler(field = "innerControl2", eventSet = InnerControl.Activity.class, eventName = "report")
+ public String innerControl2report() {
+ return "a report";
+ }
- @EventHandler(field="innerControl2", eventSet=InnerControl.Action.class, eventName="shopping")
- public Object [] innerControl2shopping(double credit) { return null; }
+ @EventHandler(field = "innerControl2", eventSet = InnerControl.Action.class, eventName = "shopping")
+ public Object [] innerControl2shopping(double credit) {
+ return null;
+ }
- @EventHandler(field="innerControl2", eventSet=InnerControl.Action.class, eventName="doStuff")
- public void innerControl2doStuff(String vakue) {}
+ @EventHandler(field = "innerControl2", eventSet = InnerControl.Action.class, eventName = "doStuff")
+ public void innerControl2doStuff(String vakue) {
+ }
- public void fireOuterEvents( String message )
- {
- outerEvents.report( message );
+ public void fireOuterEvents(String message) {
+ outerEvents.report(message);
}
-
- public InnerControlBean getDeclaredNestedControl(){
- return innerControl;
+
+ public InnerControlBean getDeclaredNestedControl() {
+ return innerControl;
}
- public InnerControlBean getDeclaredNestedControl2(){
- return innerControl2;
+ public InnerControlBean getDeclaredNestedControl2() {
+ return innerControl2;
}
-
- public InnerControlBean instantiateNestedControlProgrammatically()
- {
- try
- {
- InnerControlBean inner=(InnerControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader(),
- "org.apache.beehive.controls.test.controls.composition.InnerControlBean");
+
+ public InnerControlBean instantiateNestedControlProgrammatically() {
+ try {
+ InnerControlBean inner =
+ (InnerControlBean) java.beans.Beans.instantiate(Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.composition.InnerControlBean");
return inner;
- }
- catch ( Exception e )
- {
- return null;
+ }
+ catch (Exception e) {
+ return null;
}
}
- public InnerControlBean instantiateNestedControlWithProperty(){
- try
- {
+ public InnerControlBean instantiateNestedControlWithProperty() {
+ try {
BeanPropertyMap props = new BeanPropertyMap(InnerControl.Identity.class);
- props.setProperty( InnerControlBean.NameKey, "ken" );
- props.setProperty( InnerControlBean.JobKey, "engineer");
- props.setProperty( InnerControlBean.RankKey, new Integer(2));
- InnerControlBean inner=(InnerControlBean)org.apache.beehive.controls.api.bean.Controls.instantiate(
+ props.setProperty(InnerControlBean.NameKey, "ken");
+ props.setProperty(InnerControlBean.JobKey, "engineer");
+ props.setProperty(InnerControlBean.RankKey, new Integer(2));
+ InnerControlBean inner = (InnerControlBean) org.apache.beehive.controls.api.bean.Controls.instantiate(
Thread.currentThread().getContextClassLoader(),
"org.apache.beehive.controls.test.controls.composition.InnerControlBean", props);
- return inner;
+ return inner;
}
- catch(Exception e)
- {
+ catch (Exception e) {
throw new RuntimeException("Failed to instantiate nested control", e);
}
}
- public String testActivityWakeup(){
-
- String result="";
- if (innerControl==null)
- result="inner control is NULL";
- else{
- innerControl.fireEvent("Activity","wakeup");
- /*Wait for the events*/
- try{
- Thread.currentThread().sleep(1000);
- if (innerControlEventHandlerWakeUp.equals(EVENT_RECEIVED))
- result="0";
- else
- result="Acivity.wakeup not received by EventHandler";
- }
- catch(Exception e){
- result="Thread sleep interrupted."+e.toString();
- }
- }
- return result;
- }
- public String testActivityReadMessage(){
-
- String result="";
- if (innerControl==null)
- result="inner control is NULL";
- else{
- innerControl.fireEvent("Activity","readMessage");
- /*Wait for the events*/
- try{
- Thread.currentThread().sleep(1000);
-
- if (innerControlEventHandlerReadMessage.equals(EVENT_RECEIVED))
- result="0";
- else
- result="Acivity.readMessage not received by EventHandler";
- }
- catch(Exception e){
- result="Thread sleep interrupted."+e.toString();
- }
- }
- return result;
-
- }
- public String testActivityReport(){
-
- String result="";
- if (innerControl==null)
- result="inner control is NULL";
- else{
- innerControl.fireEvent("Activity","report");
- /*Wait for the events*/
- try{
- Thread.currentThread().sleep(1000);
-
- if (innerControlEventHandlerReport.equals(EVENT_RECEIVED))
- result="0";
- else
- result="Acivity.report not received by EventHandler";
- }
- catch(Exception e){
- result="Thread sleep interrupted."+e.toString();
- }
- }
- return result;
-
- }
- public String testActionShopping(){
-
- String result="";
- if (innerControl==null)
- result="inner control is NULL";
- else{
- innerControl.fireEvent("Action","shopping");
- /*Wait for the events*/
- try{
- Thread.currentThread().sleep(1000);
-
- if (innerControlEventHandlerShopping.equals(EVENT_RECEIVED))
- result="0";
- else
- result="Action.shopping not received by EventHandler";
- }
- catch(Exception e){
- result="Thread sleep interrupted."+e.toString();
- }
- }
- return result;
-
- }
- public String testActionDostuff(){
-
- String result="";
- if (innerControl==null)
- result="inner control is NULL";
- else{
- innerControl.fireEvent("Action","doStuff");
- /*Wait for the events*/
- try{
- Thread.currentThread().sleep(1000);
-
- if (innerControlEventHandlerDoStuff.equals(EVENT_RECEIVED))
- result="0";
- else
- result="Action.doStuff not received by EventHandler";
- }
- catch(Exception e){
- result="Thread sleep interrupted."+e.toString();
- }
- }
- return result;
-
+ public String testActivityWakeup() {
+
+ String result = "";
+ if (innerControl == null)
+ result = "inner control is NULL";
+ else {
+ innerControl.fireEvent("Activity", "wakeup");
+ /*Wait for the events*/
+ try {
+ Thread.sleep(1000);
+ if (innerControlEventHandlerWakeUp.equals(EVENT_RECEIVED))
+ result = "0";
+ else
+ result = "Acivity.wakeup not received by EventHandler";
+ }
+ catch (Exception e) {
+ result = "Thread sleep interrupted." + e.toString();
+ }
+ }
+ return result;
+ }
+
+ public String testActivityReadMessage() {
+
+ String result = "";
+ if (innerControl == null)
+ result = "inner control is NULL";
+ else {
+ innerControl.fireEvent("Activity", "readMessage");
+ /*Wait for the events*/
+ try {
+ Thread.sleep(1000);
+
+ if (innerControlEventHandlerReadMessage.equals(EVENT_RECEIVED))
+ result = "0";
+ else
+ result = "Acivity.readMessage not received by EventHandler";
+ }
+ catch (Exception e) {
+ result = "Thread sleep interrupted." + e.toString();
+ }
+ }
+ return result;
+
+ }
+
+ public String testActivityReport() {
+
+ String result = "";
+ if (innerControl == null)
+ result = "inner control is NULL";
+ else {
+ innerControl.fireEvent("Activity", "report");
+ /*Wait for the events*/
+ try {
+ Thread.sleep(1000);
+
+ if (innerControlEventHandlerReport.equals(EVENT_RECEIVED))
+ result = "0";
+ else
+ result = "Acivity.report not received by EventHandler";
+ }
+ catch (Exception e) {
+ result = "Thread sleep interrupted." + e.toString();
+ }
+ }
+ return result;
+
+ }
+
+ public String testActionShopping() {
+
+ String result = "";
+ if (innerControl == null)
+ result = "inner control is NULL";
+ else {
+ innerControl.fireEvent("Action", "shopping");
+ /*Wait for the events*/
+ try {
+ Thread.sleep(1000);
+
+ if (innerControlEventHandlerShopping.equals(EVENT_RECEIVED))
+ result = "0";
+ else
+ result = "Action.shopping not received by EventHandler";
+ }
+ catch (Exception e) {
+ result = "Thread sleep interrupted." + e.toString();
+ }
+ }
+ return result;
+
+ }
+
+ public String testActionDostuff() {
+
+ String result = "";
+ if (innerControl == null)
+ result = "inner control is NULL";
+ else {
+ innerControl.fireEvent("Action", "doStuff");
+ /*Wait for the events*/
+ try {
+ Thread.sleep(1000);
+
+ if (innerControlEventHandlerDoStuff.equals(EVENT_RECEIVED))
+ result = "0";
+ else
+ result = "Action.doStuff not received by EventHandler";
+ }
+ catch (Exception e) {
+ result = "Thread sleep interrupted." + e.toString();
+ }
+ }
+ return result;
+
}
/*Tests outer control receiving event from nested control using
* event listener. The nested control is instantiated programmatically
*/
- public String testEventListener(){
+ public String testEventListener() {
+
+ String result = "init";
+ try {
- String result="init";
- try{
-
- InnerControlBean nested=(InnerControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.composition.InnerControlBean");
- if (nested==null)
- result="Nested control instantiated programmatically is NULL.";
- else{
- //Create an Event Listener
- InnerControlEventListener listener=new InnerControlEventListener();
- nested.addActivityListener(listener);
- nested.addActionListener(listener);
- nested.fireAllEvents();
- try{
- Thread.currentThread().sleep(1000);
- result=listener.getFinalResult();
- }
- catch(Exception e){
- result="Thread sleep interrupted."+e.toString();
- }
-
-
- }
- }
- catch(Exception e){
- result="Exception caught:"+e.toString();
- }
- return result;
+ InnerControlBean nested = (InnerControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.composition.InnerControlBean");
+ if (nested == null)
+ result = "Nested control instantiated programmatically is NULL.";
+ else {
+ //Create an Event Listener
+ InnerControlEventListener listener = new InnerControlEventListener();
+ nested.addActivityListener(listener);
+ nested.addActionListener(listener);
+ nested.fireAllEvents();
+ try {
+ Thread.sleep(1000);
+ result = listener.getFinalResult();
+ }
+ catch (Exception e) {
+ result = "Thread sleep interrupted." + e.toString();
+ }
+
+
+ }
+ }
+ catch (Exception e) {
+ result = "Exception caught:" + e.toString();
+ }
+ return result;
}
/*Tests outer control receiving event from nested control using
* event listener. The nested control is instantiated decalratively
*/
- public String testEventListenerByDeclare(){
+ public String testEventListenerByDeclare() {
+
+ String result = "init";
+
+ if (innerControl == null)
+ result = "Nested control instantiated declaratively is NULL.";
+ else {
+ try {
+ //Create an Event Listener
+ InnerControlEventListener listener = new InnerControlEventListener();
+ innerControl.addActivityListener(listener);
+ innerControl.addActionListener(listener);
+ innerControl.fireAllEvents();
+
+ Thread.sleep(1000);
+ result = listener.getFinalResult();
+ }
+ catch (Exception e) {
+ result = "Thread sleep interrupted." + e.toString();
+ }
+
+
+ }
+ return result;
- String result="init";
-
- if (innerControl==null)
- result="Nested control instantiated declaratively is NULL.";
- else{
- try{
- //Create an Event Listener
- InnerControlEventListener listener=new InnerControlEventListener();
- innerControl.addActivityListener(listener);
- innerControl.addActionListener(listener);
- innerControl.fireAllEvents();
-
- Thread.currentThread().sleep(1000);
- result=listener.getFinalResult();
- }
- catch(Exception e){
- result="Thread sleep interrupted."+e.toString();
- }
-
-
- }
- return result;
-
}
/*Tests outer control receiving event from nested control using
* inner class listener. The nested control is instantiated programmatically
*/
- public String testInnerClassListener(){
-
- String result="init";
- try{
- InnerControlBean nested=(InnerControlBean)java.beans.Beans.instantiate(
- Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.composition.InnerControlBean");
- if (nested==null)
- result="Nested control instantiated programmatically is NULL.";
- else{
- nested.addActivityListener(
- new InnerControl.Activity(){
-
- public void wakeup(){innerClassWakeUp=true;}
- public int readMessage(String message){
- innerClassReadMessage=true;
- return 0;}
- public String report(){
- innerClassReport=true;
- return "event received.";
- }
- }
- );
- nested.addActionListener(
- new InnerControl.Action(){
-
- public Object[] shopping (double credit){
- innerClassShopping=true;
- //return {"food","drinks","candies"};
- return null;
- }
- public void doStuff(String value){
- innerClassDoStuff=true;
- }
- }
- );
- nested.fireAllEvents();
- try{
- Thread.currentThread().sleep(1000);
- }
- catch(Exception e){}
-
- result=getInnerClassListenerResult();
- }
- }
- catch(Exception e){
- result="Exception caught:"+e.toString();
- }
- return result;
+ public String testInnerClassListener() {
+
+ String result = "init";
+ try {
+ InnerControlBean nested = (InnerControlBean) java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.composition.InnerControlBean");
+ if (nested == null)
+ result = "Nested control instantiated programmatically is NULL.";
+ else {
+ nested.addActivityListener(
+ new InnerControl.Activity() {
+
+ public void wakeup() {
+ innerClassWakeUp = true;
+ }
+
+ public int readMessage(String message) {
+ innerClassReadMessage = true;
+ return 0;
+ }
+
+ public String report() {
+ innerClassReport = true;
+ return "event received.";
+ }
+ }
+ );
+ nested.addActionListener(
+ new InnerControl.Action() {
+
+ public Object[] shopping(double credit) {
+ innerClassShopping = true;
+ //return {"food","drinks","candies"};
+ return null;
+ }
+
+ public void doStuff(String value) {
+ innerClassDoStuff = true;
+ }
+ }
+ );
+ nested.fireAllEvents();
+ try {
+ Thread.sleep(1000);
+ }
+ catch (Exception e) {
+ /* ignore */
+ }
+
+ result = getInnerClassListenerResult();
+ }
+ }
+ catch (Exception e) {
+ result = "Exception caught:" + e.toString();
+ }
+ return result;
}
/*Tests outer control receiving event from nested control using
* inner class listener. The nested control is instantiated decalratively
*/
- public String testInnerClassListenerByDeclare(){
+ public String testInnerClassListenerByDeclare() {
+
+ String result = "init";
+
+ if (innerControl == null)
+ result = "Nested control instantiated declaratively is NULL.";
+ else {
+ try {
+ innerControl.addActivityListener(
+ new InnerControl.Activity() {
+ public void wakeup() {
+ innerControlInnerClassWakeUp = true;
+ }
+
+ public int readMessage(String message) {
+ innerControlInnerClassReadMessage = true;
+ return 0;
+ }
+
+ public String report() {
+ innerControlInnerClassReport = true;
+ return "event received.";
+ }
+ }
+ );
+ innerControl.addActionListener(
+ new InnerControl.Action() {
+
+ public Object[] shopping(double credit) {
+ innerControlInnerClassShopping = true;
+ //return {"food","drinks","candies"};
+ return null;
+ }
+
+ public void doStuff(String value) {
+ innerControlInnerClassDoStuff = true;
+ }
+ }
+ );
+ innerControl.fireAllEvents();
+
+ Thread.currentThread().sleep(1000);
+ }
+ catch (Exception e) {
+ }
+
+ result = getInnerControlInnerClassListenerResult();
+ }
+ return result;
+
+ }
+
+ private String getInnerClassListenerResult() {
- String result="init";
-
- if (innerControl==null)
- result="Nested control instantiated declaratively is NULL.";
- else{
- try{
- innerControl.addActivityListener(
- new InnerControl.Activity(){
-
- public void wakeup(){innerControlInnerClassWakeUp=true;}
- public int readMessage(String message){
- innerControlInnerClassReadMessage=true;
- return 0;}
- public String report(){
- innerControlInnerClassReport=true;
- return "event received.";
- }
- }
- );
- innerControl.addActionListener(
- new InnerControl.Action(){
-
- public Object[] shopping (double credit){
- innerControlInnerClassShopping=true;
- //return {"food","drinks","candies"};
- return null;
- }
- public void doStuff(String value){
- innerControlInnerClassDoStuff=true;
- }
- }
- );
- innerControl.fireAllEvents();
-
- Thread.currentThread().sleep(1000);
- }
- catch(Exception e){}
-
- result=getInnerControlInnerClassListenerResult();
- }
- return result;
-
- }
-
- private String getInnerClassListenerResult(){
-
- String result="";
-
- if (!innerClassWakeUp)
- result="WakeUp not received.";
- if (!innerClassReadMessage)
- result=result+"readMessage not received.";
- if (!innerClassReport)
- result=result+"report not received.";
- if (!innerClassShopping)
- result=result+"shopping not received.";
- if (!innerClassDoStuff)
- result=result+"dostuff not received.";
-
- if (result.length()==0)
- result="0";
-
- return result;
- }
-
- private String getInnerControlInnerClassListenerResult(){
-
- String result="";
-
- if (!innerControlInnerClassWakeUp)
- result="WakeUp not received.";
- if (!innerControlInnerClassReadMessage)
- result=result+"readMessage not received.";
- if (!innerControlInnerClassReport)
- result=result+"report not received.";
- if (!innerControlInnerClassShopping)
- result=result+"shopping not received.";
- if (!innerControlInnerClassDoStuff)
- result=result+"dostuff not received.";
+ String result = "";
- if (result.length()==0)
- result="0";
+ if (!innerClassWakeUp)
+ result = "WakeUp not received.";
+ if (!innerClassReadMessage)
+ result = result + "readMessage not received.";
+ if (!innerClassReport)
+ result = result + "report not received.";
+ if (!innerClassShopping)
+ result = result + "shopping not received.";
+ if (!innerClassDoStuff)
+ result = result + "dostuff not received.";
- return result;
+ if (result.length() == 0)
+ result = "0";
+
+ return result;
}
-}
+ private String getInnerControlInnerClassListenerResult() {
+
+ String result = "";
+
+ if (!innerControlInnerClassWakeUp)
+ result = "WakeUp not received.";
+ if (!innerControlInnerClassReadMessage)
+ result = result + "readMessage not received.";
+ if (!innerControlInnerClassReport)
+ result = result + "report not received.";
+ if (!innerControlInnerClassShopping)
+ result = result + "shopping not received.";
+ if (!innerControlInnerClassDoStuff)
+ result = result + "dostuff not received.";
+
+ if (result.length() == 0)
+ result = "0";
+
+ return result;
+ }
+}
Modified: beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/ComposerBeanDriver.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/ComposerBeanDriver.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/ComposerBeanDriver.java (original)
+++ beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/composition/ComposerBeanDriver.java Wed Apr 26 09:19:58 2006
@@ -15,27 +15,25 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.driver.composition;
+import java.util.Arrays;
+
import org.apache.beehive.controls.test.controls.composition.Composer;
import org.apache.beehive.test.tools.milton.junit.MiltonControlContext;
import org.apache.beehive.test.tools.milton.common.Report;
-import java.util.Arrays;
-
-/* This class contains the logic to test HelloControlBean
- It will exercise the control in a certain way and generate a
- test result report
+/**
+ * This class contains logic to test HelloControlBean. It will exercise the control
+ * in a certain way and generate a test result report.
*/
+public class ComposerBeanDriver {
-public class ComposerBeanDriver
-{
/**
* Returns a new MiltonControlContext to act as a container for control testing.
*/
- private MiltonControlContext createMiltonControlContext() throws Exception
- {
+ private MiltonControlContext createMiltonControlContext()
+ throws Exception {
return new MiltonControlContext();
}
@@ -71,8 +69,7 @@
testContext.endContext();
}
if(checkEvents(testContext.getEvents(),
- new String [] { "nested1ReturnVoid", "nested1ReturnInt",
- "nested1ReturnString" }))
+ new String [] { "nested1ReturnVoid", "nested1ReturnInt", "nested1ReturnString" }))
report.setStatus(Report.PASS);
else{
report.setStatus(Report.FAIL);
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControl.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControl.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControl.java Wed Apr 26 09:19:58 2006
@@ -19,7 +19,6 @@
package org.apache.beehive.controls.test.controls.interfaceHint.c;
import org.apache.beehive.controls.api.bean.ControlInterface;
-import org.apache.beehive.controls.test.controls.interfaceHint.a.FooControlBean;
@ControlInterface
public interface BarControl {
Modified: beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControlImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControlImpl.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControlImpl.java (original)
+++ beehive/trunk/controls/test/src/junit-controls/org/apache/beehive/controls/test/controls/interfaceHint/c/BarControlImpl.java Wed Apr 26 09:19:58 2006
@@ -15,7 +15,6 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.controls.interfaceHint.c;
import org.apache.beehive.controls.api.bean.ControlImplementation;
Modified: beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleSerializationTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleSerializationTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleSerializationTest.java (original)
+++ beehive/trunk/controls/test/src/junit-tests/org/apache/beehive/controls/test/junit/SimpleSerializationTest.java Wed Apr 26 09:19:58 2006
@@ -49,6 +49,8 @@
/* intentionally, this does not call super */
}
+ public void testFoo() {}
+/*
public void testSimpleSerialization() throws Exception {
//
@@ -114,6 +116,7 @@
getControlContainerContextManager().endContext();
}
+*/
public static Test suite() {
return new TestSuite(SimpleSerializationTest.class);
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/assembly/AssemblyTests.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/assembly/AssemblyTests.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/assembly/AssemblyTests.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/assembly/AssemblyTests.java Wed Apr 26 09:19:58 2006
@@ -15,11 +15,8 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.assembly;
-import junit.framework.TestCase;
-
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.api.bean.ControlReferences;
@@ -28,7 +25,6 @@
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
import org.apache.beehive.test.tools.mantis.annotations.tch.Desc;
-
import org.apache.beehive.test.tools.milton.junit.ReportTestCase;
@Freq("checkin")
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/beaninfo/BeanInfoTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/beaninfo/BeanInfoTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/beaninfo/BeanInfoTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/beaninfo/BeanInfoTest.java Wed Apr 26 09:19:58 2006
@@ -15,7 +15,6 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.beaninfo;
import java.io.FileOutputStream;
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ComposerTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ComposerTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ComposerTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ComposerTest.java Wed Apr 26 09:19:58 2006
@@ -15,30 +15,27 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.composition;
-import junit.framework.Assert;
-import junit.framework.TestCase;
import java.beans.Beans;
+import junit.framework.TestCase;
+
import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.test.controls.context.BaseContextBean;
import org.apache.beehive.controls.test.controls.composition.ComposerBean;
import org.apache.beehive.controls.test.driver.composition.ComposerBeanDriver;
import org.apache.beehive.test.tools.milton.common.Report;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-
/**
* A TestCase that tests controls context services
*/
@Freq("checkin")
-public class ComposerTest extends TestCase
+public class ComposerTest
+ extends TestCase
{
- public ComposerTest( String s ) { super( s ); }
-
- public void setUp() { }
-
+ public ComposerTest(String s) {
+ super(s);
+ }
/**
* Creates a new ControlBean instance based upon the specified class name
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=397228&r1=397227&r2=397228&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 Wed Apr 26 09:19:58 2006
@@ -15,7 +15,6 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.composition;
import java.io.ByteArrayInputStream;
@@ -32,7 +31,6 @@
import org.apache.beehive.controls.test.controls.composition.InnerControlBean;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-
import org.apache.beehive.test.tools.milton.junit.ReportTestCase;
/**
@@ -45,19 +43,14 @@
*/
@Freq("checkin")
public class DeclarativeTest
- extends ReportTestCase
-{
+ extends ReportTestCase {
- /**
- * A control that contains a nested control
- */
@Control
private OuterControlBean outerControl;
- private String _reportMsg;
+ private String _onReportMessage;
- public DeclarativeTest(String name)
- {
+ public DeclarativeTest(String name) {
super(name);
}
@@ -74,9 +67,8 @@
/**
* Tests outer control getting inner control property from control context
*/
- public void testGetPropertyByContext()
- throws Exception {
- Assert.assertNotNull(outerControl);
+ public void testGetPropertyByContext() {
+ Assert.assertNotNull(outerControl);
InnerControlBean innercontrol=outerControl.getDeclaredNestedControl();
Assert.assertNotNull(innercontrol);
Assert.assertEquals("Bob",innercontrol.getNameFromContext());
@@ -87,8 +79,7 @@
* Tests reconfigured property.
* Outer control reconfigures the inner control's property when instantiating it
*/
- public void testReconfiguredProperty()
- throws Exception {
+ public void testReconfiguredProperty() {
Assert.assertNotNull(outerControl);
InnerControlBean innercontrol=outerControl.getDeclaredNestedControl2();
Assert.assertNotNull(innercontrol);
@@ -100,8 +91,7 @@
* Tests outer control receiving events from nested control using
* EventHandler
*/
- public void testEventHandler()
- throws Exception {
+ public void testEventHandler() {
Assert.assertNotNull(outerControl);
Assert.assertEquals("0",outerControl.testActivityWakeup());
Assert.assertEquals("0",outerControl.testActivityReadMessage());
@@ -113,13 +103,12 @@
/**
* Tests outer control firing events to us
*/
- public void testOuterEvents()
- throws Exception {
- System.out.println( "_reportMsg=" + _reportMsg );
+ public void testOuterEvents() {
+ System.out.println( "_onReportMessage=" + _onReportMessage );
Assert.assertNotNull(outerControl);
outerControl.fireOuterEvents("this is the reported msg");
- Assert.assertEquals("this is the reported msg", _reportMsg );
- System.out.println( "_reportMsg=" + _reportMsg );
+ Assert.assertEquals("this is the reported msg", _onReportMessage );
+ System.out.println( "_onReportMessage=" + _onReportMessage );
}
/**
@@ -128,12 +117,9 @@
public void testControlIDs()
throws Exception {
Assert.assertEquals("outerControl", outerControl.getControlID());
- Assert.assertEquals("outerControl/innerControl",
- outerControl.getDeclaredNestedControl().getControlID());
-
- // Test the relationships and identifiers are preserved across serialization and
- // deserialization
+ Assert.assertEquals("outerControl/innerControl", outerControl.getDeclaredNestedControl().getControlID());
+ // Test the relationships and identifiers are preserved across serialization and deserialization
ByteArrayOutputStream baos = null;
ObjectOutputStream oos = null;
try {
@@ -150,9 +136,10 @@
baos.close();
}
+ OuterControlBean outerCopy = null;
+
ByteArrayInputStream bais = null;
ObjectInputStream ois = null;
- OuterControlBean outerCopy = null;
try {
bais = new ByteArrayInputStream(baos.toByteArray());
ois = new ObjectInputStream(bais);
@@ -165,15 +152,13 @@
bais.close();
}
- ois.close();
-
Assert.assertEquals("outerControl", outerCopy.getControlID());
Assert.assertEquals("outerControl/innerControl", outerCopy.getDeclaredNestedControl().getControlID());
}
@EventHandler(field="outerControl", eventSet=OuterControl.OuterEvents.class, eventName="report")
public int onReport( String msg ) {
- _reportMsg = msg;
+ _onReportMessage = msg;
return 0;
}
}
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ProgrammaticTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ProgrammaticTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ProgrammaticTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/composition/ProgrammaticTest.java Wed Apr 26 09:19:58 2006
@@ -15,53 +15,53 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.composition;
+import java.io.IOException;
+
import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.beehive.controls.test.controls.composition.OuterControlBean;
import org.apache.beehive.controls.test.controls.composition.InnerControlBean;
+import org.apache.beehive.controls.api.bean.Controls;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
/**
- * A TeseCase that tests control composition.
- * The outer control is instantiated programmatically, and the outer
+ * A TeseCase that tests control composition. The outer control is instantiated programmatically, and the outer
* control instantiates the nested control programmatically
*/
-public class ProgrammaticTest extends TestCase
-{
+public class ProgrammaticTest
+ extends TestCase {
- public ProgrammaticTest(String name) throws Exception
- {super(name);}
+ public ProgrammaticTest(String name) {
+ super(name);
+ }
/**
* A control that contains a nested control
*/
- private OuterControlBean outerControl;
+ private OuterControlBean outerControl;
private OuterControlBean outerControl2;
- /* Instantiate the outerControl once*/
- protected void setUp() throws Exception {
+ /* Instantiate the outerControl once*/
+ protected void setUp()
+ throws IOException, ClassNotFoundException {
+ outerControl=(OuterControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
+ "org.apache.beehive.controls.test.controls.composition.OuterControlBean");
- outerControl=(OuterControlBean)java.beans.Beans.instantiate( Thread.currentThread().getContextClassLoader() ,
- "org.apache.beehive.controls.test.controls.composition.OuterControlBean");
-
- outerControl2=(OuterControlBean)org.apache.beehive.controls.api.bean.Controls.instantiate( Thread.currentThread().getContextClassLoader(),
- "org.apache.beehive.controls.test.controls.composition.OuterControlBean", null );
- }
+ outerControl2=(OuterControlBean)Controls.instantiate( Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.composition.OuterControlBean", null );
+ }
/**
* Tests outer control instantiats nested control by declaration
*/
@Freq("checkin")
- public void testInstantiate() throws Exception
- {
- Assert.assertNotNull(outerControl);
- Assert.assertNotNull(outerControl.instantiateNestedControlProgrammatically());
+ public void testInstantiate() {
+ Assert.assertNotNull(outerControl);
+ Assert.assertNotNull(outerControl.instantiateNestedControlProgrammatically());
InnerControlBean innerBean = outerControl.instantiateNestedControlWithProperty();
Assert.assertNotNull(innerBean);
@@ -76,41 +76,38 @@
* Tests outer control getting inner control property from control context
*/
@Freq("checkin")
- public void testGetProppertyByContext() throws Exception
- {
- Assert.assertNotNull(outerControl);
- InnerControlBean innercontrol=outerControl.instantiateNestedControlProgrammatically();
- Assert.assertNotNull(innercontrol);
- Assert.assertEquals("Bob",innercontrol.getNameFromContext());
- Assert.assertNull(innercontrol.getJobFromContext());
+ public void testGetProppertyByContext() {
+ Assert.assertNotNull(outerControl);
+ InnerControlBean innercontrol=outerControl.instantiateNestedControlProgrammatically();
+ Assert.assertNotNull(innercontrol);
+ Assert.assertEquals("Bob",innercontrol.getNameFromContext());
+ Assert.assertNull(innercontrol.getJobFromContext());
}
/**
* Tests outer control getting inner control property by getter
*/
@Freq("checkin")
- public void testGetProppertyByGetter() throws Exception
- {
- Assert.assertNotNull(outerControl);
- InnerControlBean innercontrol=outerControl.instantiateNestedControlProgrammatically();
- Assert.assertNotNull(innercontrol);
- Assert.assertEquals("Bob",innercontrol.getName());
- Assert.assertNull(innercontrol.getJob());
+ public void testGetProppertyByGetter() {
+ Assert.assertNotNull(outerControl);
+ InnerControlBean innercontrol=outerControl.instantiateNestedControlProgrammatically();
+ Assert.assertNotNull(innercontrol);
+ Assert.assertEquals("Bob",innercontrol.getName());
+ Assert.assertNull(innercontrol.getJob());
}
/**
* Tests outer control setting inner control property by setter
*/
@Freq("checkin")
- public void testSetProppertyBySetter() throws Exception
- {
- Assert.assertNotNull(outerControl);
- InnerControlBean innercontrol=outerControl.instantiateNestedControlProgrammatically();
- Assert.assertNotNull(innercontrol);
- innercontrol.setName("new name");
- innercontrol.setJob("new job");
- Assert.assertEquals("new name",innercontrol.getNameFromContext());
- Assert.assertEquals("new job",innercontrol.getJobFromContext());
+ public void testSetProppertyBySetter() {
+ Assert.assertNotNull(outerControl);
+ InnerControlBean innercontrol=outerControl.instantiateNestedControlProgrammatically();
+ Assert.assertNotNull(innercontrol);
+ innercontrol.setName("new name");
+ innercontrol.setJob("new job");
+ Assert.assertEquals("new name",innercontrol.getNameFromContext());
+ Assert.assertEquals("new job",innercontrol.getJobFromContext());
}
/**
@@ -119,13 +116,12 @@
* Deactivated by CR190302
*/
@Freq("checkin")
- public void testReconfiguredProperty() throws Exception
- {
- Assert.assertNotNull(outerControl);
- InnerControlBean innercontrol=outerControl.instantiateNestedControlWithProperty();
- Assert.assertNotNull(innercontrol);
- Assert.assertEquals("ken",innercontrol.getNameFromContext());
- Assert.assertEquals("engineer",innercontrol.getJobFromContext());
+ public void testReconfiguredProperty() {
+ Assert.assertNotNull(outerControl);
+ InnerControlBean innercontrol=outerControl.instantiateNestedControlWithProperty();
+ Assert.assertNotNull(innercontrol);
+ Assert.assertEquals("ken",innercontrol.getNameFromContext());
+ Assert.assertEquals("engineer",innercontrol.getJobFromContext());
}
/**
@@ -134,14 +130,13 @@
* This is deactivated, as declarative instantiating control in java is not supported
*/
@Freq("checkin")
- public void testEventHandler() throws Exception
- {
- Assert.assertNotNull(outerControl);
- Assert.assertEquals("0",outerControl.testActivityWakeup());
- Assert.assertEquals("0",outerControl.testActivityReadMessage());
- Assert.assertEquals("0",outerControl.testActivityReport());
- Assert.assertEquals("0",outerControl.testActionShopping());
- Assert.assertEquals("0",outerControl.testActionDostuff());
+ public void testEventHandler() {
+ Assert.assertNotNull(outerControl);
+ Assert.assertEquals("0",outerControl.testActivityWakeup());
+ Assert.assertEquals("0",outerControl.testActivityReadMessage());
+ Assert.assertEquals("0",outerControl.testActivityReport());
+ Assert.assertEquals("0",outerControl.testActionShopping());
+ Assert.assertEquals("0",outerControl.testActionDostuff());
}
@@ -150,10 +145,9 @@
* inner class
*/
@Freq("checkin")
- public void testEventInnerClass() throws Exception
- {
- Assert.assertNotNull(outerControl);
- Assert.assertEquals("0",outerControl.testInnerClassListener());
+ public void testEventInnerClass() {
+ Assert.assertNotNull(outerControl);
+ Assert.assertEquals("0",outerControl.testInnerClassListener());
}
/**
@@ -161,10 +155,9 @@
* event listener
*/
@Freq("checkin")
- public void testEventListener() throws Exception
- {
- Assert.assertNotNull(outerControl);
- Assert.assertEquals("0",outerControl.testEventListener());
+ public void testEventListener() {
+ Assert.assertNotNull(outerControl);
+ Assert.assertEquals("0",outerControl.testEventListener());
}
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextParamTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextParamTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextParamTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextParamTest.java Wed Apr 26 09:19:58 2006
@@ -15,7 +15,6 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.context;
import java.beans.Beans;
@@ -27,9 +26,7 @@
import org.apache.beehive.controls.test.controls.context.ContextParam;
import org.apache.beehive.controls.test.controls.context.ContextParamExt;
import org.apache.beehive.controls.test.controls.context.ContextParamExtBean;
-import org.apache.beehive.test.tools.milton.common.Report;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-
/**
* A TestCase that tests controls context services
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/ContextTest.java Wed Apr 26 09:19:58 2006
@@ -15,7 +15,6 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.context;
import java.beans.Beans;
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java Wed Apr 26 09:19:58 2006
@@ -15,14 +15,9 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.context;
-import javax.servlet.ServletContext;
-import java.beans.Beans;
import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.api.bean.ControlBean;
-import org.apache.beehive.controls.api.context.ControlBeanContext;
import org.apache.beehive.controls.test.controls.context.ServiceGetterBean;
import org.apache.beehive.controls.test.driver.context.DriveServiceGetter;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/ContextEventTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/ContextEventTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/ContextEventTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/ContextEventTest.java Wed Apr 26 09:19:58 2006
@@ -15,14 +15,12 @@
*
* $Header:$
*/
-
package org.apache.beehive.controls.test.java.contextevent;
+import java.beans.Beans;
import junit.framework.Assert;
-import java.beans.Beans;
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.controls.contextevent.BeanContextRecorderBean;
import org.apache.beehive.controls.test.driver.contextevent.DriveBeanRecorder;
@@ -66,10 +64,9 @@
@Freq("checkin")
public void testRecordedByImplDeclaration() throws Exception
{
- Report report=new Report();
DriveBeanContextRecorder driver=new DriveBeanContextRecorder();
driver.setControl(myRecorder);
- report=driver.doTest();
+ Report report=driver.doTest();
String result=report.getStatus();
@@ -85,13 +82,12 @@
@Freq("checkin")
public void testRecordedByImplProgram() throws Exception
{
- Report report=new Report();
DriveBeanContextRecorder driver=new DriveBeanContextRecorder();
BeanContextRecorderBean recorderbean=(BeanContextRecorderBean)Beans.instantiate(
Thread.currentThread().getContextClassLoader(),
"org.apache.beehive.controls.test.controls.contextevent.BeanContextRecorderBean");
driver.setControl(recorderbean);
- report=driver.doTest();
+ Report report=driver.doTest();
String result=report.getStatus();
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/encoding/EncodingTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/encoding/EncodingTest.java?rev=397228&r1=397227&r2=397228&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/encoding/EncodingTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/encoding/EncodingTest.java Wed Apr 26 09:19:58 2006
@@ -18,15 +18,15 @@
package org.apache.beehive.controls.test.java.encoding;
-import junit.framework.Assert;
+import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
+import java.beans.XMLEncoder;
+import java.beans.XMLDecoder;
+
import junit.framework.TestCase;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
-import java.beans.*;
-import java.io.*;
-
-import org.apache.beehive.controls.test.controls.basic.HelloBean;
import org.apache.beehive.controls.test.controls.property.Props;
import org.apache.beehive.controls.test.controls.property.PropsBean;
import org.apache.beehive.controls.test.controls.property.NestPropsBean;