You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by js...@apache.org on 2004/07/30 06:59:15 UTC
svn commit: rev 30965 - in incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java: context contextevent event extension instantiate property
Author: jsong
Date: Thu Jul 29 21:59:14 2004
New Revision: 30965
Added:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/test.xml
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/test.xml
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/test.xml
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/LifeCycleTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/EventHandlerTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/instantiate/TestInstantiate.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientAccessTest.java
Log:
adding test.xml for controls tests for extension and contextevent and update java test accordingly.
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/GetServiceTest.java Thu Jul 29 21:59:14 2004
@@ -1,17 +1,15 @@
package org.apache.beehive.controls.test.java.context;
+
import junit.framework.Assert;
import junit.framework.TestCase;
-
+import javax.servlet.ServletContext;
import java.beans.Beans;
import java.beans.beancontext.BeanContextServices;
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.api.bean.ControlBean;
import org.apache.beehive.controls.test.controls.context.ServiceGetterBean;
-import javax.servlet.ServletContext;
-
-import org.apache.beehive.test.tools.milton.common.Report;
/**
* A TestCase that tests accessing available services via control context
@@ -32,21 +30,53 @@
/**
* Tests accessing servlet service via controls' context service
* In java environment, this should be "NULL"
+ * The control is instantiated by declaration
*/
- public void testServletContext() throws Exception
+ public void testGetServletContextByDeclaration() throws Exception
{
+ Assert.assertNotNull(serviceGetter);
String result=serviceGetter.getService(ServletContext.class, null);
- Assert.assertEquals(result,"-1");
+ Assert.assertEquals("-1",result);
}
/**
* Tests accessing BeanContextServices via controls' context service.
* In java environment, this should be "0"
+ * The control is instantiated by declaration
*/
- public void testBeanContextServices() throws Exception
+ public void testGetBeanContextServicesByDeclaration() throws Exception
{
+ Assert.assertNotNull(serviceGetter);
String result=serviceGetter.getService(BeanContextServices.class, null);
- Assert.assertEquals(result,"0");
+ Assert.assertEquals("0",result);
+ }
+
+ /**
+ * Tests accessing servlet service via controls' context service
+ * In java environment, this should be "NULL"
+ * The control is instantiated programmatically
+ */
+ public void testGetServletContextByProgram() throws Exception
+ {
+ ServiceGetterBean getterbean=(ServiceGetterBean)java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader() ,
+ "org.apache.beehive.controls.test.controls.context.ServiceGetterBean");
+ String result=getterbean.getService(ServletContext.class, null);
+ Assert.assertEquals("-1",result);
+ }
+
+ /**
+ * Tests accessing BeanContextServices via controls' context service.
+ * In java environment, this should be "0"
+ * The control is instantiated programmatically
+ */
+ public void testGetBeanContextServicesByProgram() throws Exception
+ {
+ ServiceGetterBean getterbean=(ServiceGetterBean)java.beans.Beans.instantiate(
+ Thread.currentThread().getContextClassLoader() ,
+ "org.apache.beehive.controls.test.controls.context.ServiceGetterBean");
+ String result=getterbean.getService(BeanContextServices.class, null);
+ Assert.assertEquals("0",result);
}
}
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/test.xml
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/test.xml (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/context/test.xml Thu Jul 29 21:59:14 2004
@@ -8,6 +8,13 @@
</test-metadata>
<junit testclass="org.apache.beehive.controls.test.java.context.ContextTest" />
</test>
+ <test name="Test access other service" timeoutSeconds="300" >
+ <test-metadata>
+ <freq>daily</freq>
+ <status>active</status>
+ </test-metadata>
+ <junit testclass="org.apache.beehive.controls.test.java.context.GetServiceTest" />
+ </test>
</test-suite>
</target>
</project>
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/LifeCycleTest.java
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/LifeCycleTest.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/LifeCycleTest.java Thu Jul 29 21:59:14 2004
@@ -25,11 +25,26 @@
/**
* Tests control impl listening to its lifecycle events.
+ * The control is instantiated by declaration
*/
- public void testRecordFromImpl() throws Exception
+ public void testRecordedByImplDeclaration() throws Exception
{
+ Assert.assertNotNull(myRecorder);
String record=myRecorder.getRecord();
- Assert.assertEquals(record,"onCreateonInstantiate");
+ Assert.assertEquals("onCreateonInstantiate",record);
+ }
+
+ /**
+ * Tests control impl listening to its lifecycle events.
+ * The control is instantiated programmatically
+ */
+ public void testRecordedByImplProgram() throws Exception
+ {
+ RecorderBean recorderbean=(RecorderBean)Beans.instantiate(
+ Thread.currentThread().getContextClassLoader(),
+ "org.apache.beehive.controls.test.controls.contextevent.RecorderBean");
+ String record=recorderbean.getRecord();
+ Assert.assertEquals("onCreateonInstantiate",record);
}
/**
Added: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/test.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/contextevent/test.xml Thu Jul 29 21:59:14 2004
@@ -0,0 +1,13 @@
+<project name="org.apache.beehive.controls.test.java.context" default="org-apache-beehive-controls-test-java-context" >
+ <target name="org-apache-beehive-controls-test-java-context" >
+ <test-suite testunit="org-apache-beehive-controls-test-java-context" >
+ <test name="Tests Control LifeCycle Event" timeoutSeconds="300" >
+ <test-metadata>
+ <freq>daily</freq>
+ <status>active</status>
+ </test-metadata>
+ <junit testclass="org.apache.beehive.controls.test.java.contextevent.LifeCycleTest" />
+ </test>
+ </test-suite>
+ </target>
+</project>
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/EventHandlerTest.java
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/EventHandlerTest.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/EventHandlerTest.java Thu Jul 29 21:59:14 2004
@@ -75,8 +75,8 @@
/*Verified result*/
- Assert.assertEquals(event1Received,true);
- Assert.assertEquals(event2Received,true);
+ Assert.assertEquals(true,event1Received);
+ Assert.assertEquals(true,event2Received);
}
catch(Exception e){
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/event/ListenerTest.java Thu Jul 29 21:59:14 2004
@@ -60,8 +60,8 @@
Thread.currentThread().sleep(1000);
/*Verified result*/
- Assert.assertEquals(innerClassReceiveEvent_program,true);
- Assert.assertEquals(event2listener.getMethod2Result(),"0");
+ Assert.assertEquals(true,innerClassReceiveEvent_program);
+ Assert.assertEquals("0",event2listener.getMethod2Result());
}
catch(Exception e){
@@ -101,8 +101,8 @@
/*Verified result*/
- Assert.assertEquals(innerClassReceiveEvent_declare,true);
- Assert.assertEquals(event2listener.getMethod2Result(),"0");
+ Assert.assertEquals(true,innerClassReceiveEvent_declare);
+ Assert.assertEquals("0",event2listener.getMethod2Result());
}
catch(Exception e){
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java Thu Jul 29 21:59:14 2004
@@ -28,8 +28,9 @@
*/
public void testInheritedMethod() throws Exception
{
+ Assert.assertNotNull(subcontrol);
String s=subcontrol.hello();
- Assert.assertEquals(s,"Hello from super control");
+ Assert.assertEquals("Hello from super control",s);
}
@@ -43,7 +44,7 @@
"org.apache.beehive.controls.test.controls.extension.SubControlBean");
Assert.assertNotNull(sub);
- Assert.assertEquals(sub.hello(),"Hello from super control");
+ Assert.assertEquals("Hello from super control",sub.hello());
}
/**
@@ -51,8 +52,9 @@
*/
public void testExtendedMethod() throws Exception
{
+ Assert.assertNotNull(subcontrol);
String s=subcontrol.hello2();
- Assert.assertEquals(s,"Hello from subcontrol");
+ Assert.assertEquals("Hello from subcontrol",s);
}
@@ -66,7 +68,7 @@
"org.apache.beehive.controls.test.controls.extension.SubControlBean");
Assert.assertNotNull(sub);
- Assert.assertEquals(sub.hello2(),"Hello from subcontrol");
+ Assert.assertEquals("Hello from subcontrol",sub.hello2());
}
@@ -76,8 +78,9 @@
*/
public void testInheritedProperty() throws Exception
{
+ Assert.assertNotNull(subcontrol);
String s=subcontrol.accessInheritedProperty();
- Assert.assertEquals(s,"In_ExtensibleControl_Interface");
+ Assert.assertEquals("In_ExtensibleControl_Interface",s);
}
@@ -91,7 +94,7 @@
"org.apache.beehive.controls.test.controls.extension.SubControlBean");
Assert.assertNotNull(sub);
- Assert.assertEquals(sub.accessInheritedProperty(),"In_ExtensibleControl_Interface");
+ Assert.assertEquals("In_ExtensibleControl_Interface",sub.accessInheritedProperty());
}
Added: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/test.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/test.xml Thu Jul 29 21:59:14 2004
@@ -0,0 +1,13 @@
+<project name="org.apache.beehive.controls.test.java.context" default="org-apache-beehive-controls-test-java-context" >
+ <target name="org-apache-beehive-controls-test-java-context" >
+ <test-suite testunit="org-apache-beehive-controls-test-java-context" >
+ <test name="Tests Control Inheritance" timeoutSeconds="300" >
+ <test-metadata>
+ <freq>daily</freq>
+ <status>active</status>
+ </test-metadata>
+ <junit testclass="org.apache.beehive.controls.test.java.extension.SubControlTest" />
+ </test>
+ </test-suite>
+ </target>
+</project>
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/instantiate/TestInstantiate.java
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/instantiate/TestInstantiate.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/instantiate/TestInstantiate.java Thu Jul 29 21:59:14 2004
@@ -43,7 +43,7 @@
"org.apache.beehive.controls.test.controls.instantiate.HelloControlBean");
Assert.assertNotNull(hc);
- Assert.assertEquals(hc.hello("Bob"),"Bob");
+ Assert.assertEquals("Bob",hc.hello("Bob"));
}
/**
@@ -52,7 +52,7 @@
public void testDeclarativeInstantiation() throws Exception
{
Assert.assertNotNull(myHelloBean);
- Assert.assertEquals(myHelloBean.hello("Bob"),"Bob");
+ Assert.assertEquals("Bob",myHelloBean.hello("Bob"));
}
/**
@@ -61,7 +61,7 @@
public void testDeclareWithProperty() throws Exception
{
Assert.assertNotNull(myPropertyBean);
- Assert.assertEquals(myPropertyBean.sayHello(),"Good evening!");
+ Assert.assertEquals("Good evening!",myPropertyBean.sayHello());
}
/**
@@ -78,7 +78,7 @@
Assert.assertNotNull(spbean);
- Assert.assertEquals(spbean.sayHello(),"Good afternoon!");
+ Assert.assertEquals("Good afternoon!",spbean.sayHello());
*/
}
Modified: incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientAccessTest.java
==============================================================================
--- incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientAccessTest.java (original)
+++ incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/property/ClientAccessTest.java Thu Jul 29 21:59:14 2004
@@ -32,7 +32,7 @@
{
String s=myControl.getGreetingGreetWord();
- Assert.assertEquals("Hello",s);
+ Assert.assertEquals(s,"Hello");
}
/**
@@ -46,7 +46,7 @@
"org.apache.beehive.controls.test.controls.properties.SingleProperty2Bean");
String s=sbean.getGreetingGreetWord();
- Assert.assertEquals("Hello",s);
+ Assert.assertEquals(s,"Hello");
}
*/
}