You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/04/07 23:38:27 UTC
cvs commit: avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data Component1.java Component2.java Component3.java Component4.java Role1.java Role2.java Role3.java Role4.java test1.roles
bloritsch 2003/04/07 14:38:27
Modified: fortress build.xml
fortress/src/test/org/apache/avalon/fortress/test
HandlersTestCase.java
fortress/src/test/org/apache/avalon/fortress/test/data
Component1.java Component2.java Component3.java
Component4.java Role1.java Role2.java Role3.java
Role4.java
Removed: fortress/src/test/org/apache/avalon/fortress/test/data
test1.roles
Log:
updated tests to use the new tools--need to change service collector to not attempt to work on a prebuilt jar
Revision Changes Path
1.83 +26 -1 avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/build.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- build.xml 5 Apr 2003 20:48:38 -0000 1.82
+++ build.xml 7 Apr 2003 21:38:26 -0000 1.83
@@ -54,6 +54,7 @@
<pathelement location="${excalibur-i18n.jar}"/>
<pathelement location="${xalan.jar}"/>
<pathelement location="${jaxen-full.jar}"/>
+ <pathelement location="${build.dir}/tools"/>
<path refid="project.class.path"/>
</path>
<path id="build.path">
@@ -201,12 +202,33 @@
<include name="**/*.java"/>
</javac>
+ <taskdef name="collect-meta"
+ classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector">
+ <classpath refid="test.class.path"/>
+ </taskdef>
+
+ <collect-meta destdir="${build.testclasses}">
+ <fileset dir="${build.testsrc}"/>
+ </collect-meta>
+
<copy todir="${build.testclasses}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
</copy>
+
+ <jar jarfile="${build.tests}/test-${jar.name}"
+ basedir="${build.testclasses}"
+ compress="${build.compress}"/>
+
+ <taskdef name="collect-services"
+ classname="org.apache.avalon.fortress.tools.ServiceCollector">
+ <classpath refid="test.class.path"/>
+ </taskdef>
+
+ <collect-services inputjar="${build.tests}/test-${jar.name}"
+ outputjar="${build.lib}/test-${jar.name}"/>
</target>
@@ -300,7 +322,10 @@
haltonfailure="${junit.failonerror}"
printsummary="yes"
dir="${build.tests}">
- <classpath refid="test.class.path"/>
+ <classpath>
+ <path refid="test.class.path"/>
+ <pathelement location="${build.lib}/test-${jar.name}"/>
+ </classpath>
<formatter type="xml"/> <!-- xml reports for junitreport -->
<formatter type="plain" usefile="false"/> <!-- text reports for humans -->
1.8 +30 -21 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/HandlersTestCase.java
Index: HandlersTestCase.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/HandlersTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HandlersTestCase.java 29 Mar 2003 18:53:25 -0000 1.7
+++ HandlersTestCase.java 7 Apr 2003 21:38:26 -0000 1.8
@@ -55,6 +55,11 @@
import org.apache.avalon.fortress.ContainerManager;
import org.apache.avalon.fortress.impl.DefaultContainer;
import org.apache.avalon.fortress.impl.DefaultContainerManager;
+import org.apache.avalon.fortress.test.data.BaseRole;
+import org.apache.avalon.fortress.test.data.Role1;
+import org.apache.avalon.fortress.test.data.Role2;
+import org.apache.avalon.fortress.test.data.Role3;
+import org.apache.avalon.fortress.test.data.Role4;
import org.apache.avalon.fortress.util.FortressConfig;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.service.ServiceManager;
@@ -78,10 +83,11 @@
throws Exception
{
final ServiceManager serviceManager = getServiceManager();
- final String key = org.apache.avalon.fortress.test.data.Role1.ROLE;
- final org.apache.avalon.fortress.test.data.BaseRole object1 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
- final org.apache.avalon.fortress.test.data.BaseRole object2 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
+ final String key = Role1.ROLE;
+ final BaseRole object1 = (BaseRole)serviceManager.lookup( key );
+ final BaseRole object2 = (BaseRole)serviceManager.lookup( key );
+ assertSame( "Threadsafe objects (1 vs 2)", object1, object2 );
assertEquals( "Threadsafe object IDs (1 vs 2)", object1.getID(), object2.getID() );
final Thread thread = new Thread()
@@ -90,11 +96,14 @@
{
try
{
- final org.apache.avalon.fortress.test.data.BaseRole object3 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
- final org.apache.avalon.fortress.test.data.BaseRole object4 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
+ final BaseRole object3 = (BaseRole)serviceManager.lookup( key );
+ final BaseRole object4 = (BaseRole)serviceManager.lookup( key );
+ assertSame( "Threadsafe objects (1 vs 3)", object1, object3 );
assertEquals( "Threadsafe object IDs (1 vs 3)", object1.getID(), object3.getID() );
+ assertSame( "Threadsafe objects (2 vs 4)", object2, object4 );
assertEquals( "Threadsafe object IDs (2 vs 4)", object2.getID(), object4.getID() );
+ assertSame( "Threadsafe objects (3 vs 4)", object3, object4 );
assertEquals( "Threadsafe object IDs (3 vs 4)", object3.getID(), object4.getID() );
}
catch( final Exception e )
@@ -112,12 +121,12 @@
public void testPerThread()
throws Exception
{
- final String key = org.apache.avalon.fortress.test.data.Role3.ROLE;
+ final String key = Role3.ROLE;
final String type = "PerThread";
final ServiceManager serviceManager = getServiceManager();
- final org.apache.avalon.fortress.test.data.BaseRole object1 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
- final org.apache.avalon.fortress.test.data.BaseRole object2 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
+ final BaseRole object1 = (BaseRole)serviceManager.lookup( key );
+ final BaseRole object2 = (BaseRole)serviceManager.lookup( key );
assertEquals( type + " object IDs (1 vs 2)", object1.getID(), object2.getID() );
@@ -127,8 +136,8 @@
{
try
{
- final org.apache.avalon.fortress.test.data.BaseRole object3 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
- final org.apache.avalon.fortress.test.data.BaseRole object4 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
+ final BaseRole object3 = (BaseRole)serviceManager.lookup( key );
+ final BaseRole object4 = (BaseRole)serviceManager.lookup( key );
assertTrue( type + " object IDs (1 vs 3)", object1.getID() != object3.getID() );
assertTrue( type + " object IDs (2 vs 4)", object2.getID() != object4.getID() );
@@ -149,12 +158,12 @@
public void testFactory()
throws Exception
{
- final String key = org.apache.avalon.fortress.test.data.Role4.ROLE;
+ final String key = Role4.ROLE;
final String type = "Factory";
final ServiceManager serviceManager = getServiceManager();
- final org.apache.avalon.fortress.test.data.BaseRole object1 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
- final org.apache.avalon.fortress.test.data.BaseRole object2 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
+ final BaseRole object1 = (BaseRole)serviceManager.lookup( key );
+ final BaseRole object2 = (BaseRole)serviceManager.lookup( key );
assertTrue( type + " object IDs (1 vs 2)", object1.getID() != object2.getID() );
@@ -164,8 +173,8 @@
{
try
{
- final org.apache.avalon.fortress.test.data.BaseRole object3 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
- final org.apache.avalon.fortress.test.data.BaseRole object4 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
+ final BaseRole object3 = (BaseRole)serviceManager.lookup( key );
+ final BaseRole object4 = (BaseRole)serviceManager.lookup( key );
assertTrue( type + " object IDs (1 vs 3)", object1.getID() != object3.getID() );
assertTrue( type + " object IDs (2 vs 4)", object2.getID() != object4.getID() );
@@ -197,10 +206,10 @@
throws Exception
{
final ServiceManager serviceManager = getServiceManager();
- final String key = org.apache.avalon.fortress.test.data.Role2.ROLE;
- final org.apache.avalon.fortress.test.data.BaseRole object1 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
- final org.apache.avalon.fortress.test.data.BaseRole object2 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
- final org.apache.avalon.fortress.test.data.BaseRole object3 = (org.apache.avalon.fortress.test.data.BaseRole)serviceManager.lookup( key );
+ final String key = Role2.ROLE;
+ final BaseRole object1 = (BaseRole)serviceManager.lookup( key );
+ final BaseRole object2 = (BaseRole)serviceManager.lookup( key );
+ final BaseRole object3 = (BaseRole)serviceManager.lookup( key );
serviceManager.release( object1 );
@@ -216,7 +225,7 @@
final String BASE = "resource://org/apache/avalon/fortress/test/data/";
config.setContainerConfiguration( BASE + "test1.xconf" );
config.setLoggerManagerConfiguration( BASE + "test1.xlog" );
- config.setRoleManagerConfiguration( BASE + "test1.roles" );
+ //config.setRoleManagerConfiguration( BASE + "test1.roles" );
final ContainerManager cm = new DefaultContainerManager( config.getContext() );
ContainerUtil.initialize( cm );
1.5 +4 -1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Component1.java
Index: Component1.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Component1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Component1.java 22 Mar 2003 12:46:35 -0000 1.4
+++ Component1.java 7 Apr 2003 21:38:27 -0000 1.5
@@ -50,6 +50,9 @@
package org.apache.avalon.fortress.test.data;
/**
+ * @avalon.component
+ * @x-avalon.lifecycle singleton
+ * @x-avalon.name component1
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
1.5 +4 -1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Component2.java
Index: Component2.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Component2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Component2.java 22 Mar 2003 12:46:35 -0000 1.4
+++ Component2.java 7 Apr 2003 21:38:27 -0000 1.5
@@ -50,6 +50,9 @@
package org.apache.avalon.fortress.test.data;
/**
+ * @avalon.component
+ * @x-avalon.lifecycle pooled
+ * @x-avalon.name component2
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
1.5 +4 -1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Component3.java
Index: Component3.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Component3.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Component3.java 22 Mar 2003 12:46:35 -0000 1.4
+++ Component3.java 7 Apr 2003 21:38:27 -0000 1.5
@@ -50,6 +50,9 @@
package org.apache.avalon.fortress.test.data;
/**
+ * @avalon.component
+ * @x-avalon.lifecycle thread
+ * @x-avalon.name component3
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
1.5 +4 -1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Component4.java
Index: Component4.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Component4.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Component4.java 22 Mar 2003 12:46:35 -0000 1.4
+++ Component4.java 7 Apr 2003 21:38:27 -0000 1.5
@@ -50,6 +50,9 @@
package org.apache.avalon.fortress.test.data;
/**
+ * @avalon.component
+ * @x-avalon.lifecycle transient
+ * @x-avalon.name component4
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
1.5 +2 -1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Role1.java
Index: Role1.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Role1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Role1.java 22 Mar 2003 12:46:35 -0000 1.4
+++ Role1.java 7 Apr 2003 21:38:27 -0000 1.5
@@ -50,6 +50,7 @@
package org.apache.avalon.fortress.test.data;
/**
+ * @avalon.role
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
1.5 +2 -1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Role2.java
Index: Role2.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Role2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Role2.java 22 Mar 2003 12:46:35 -0000 1.4
+++ Role2.java 7 Apr 2003 21:38:27 -0000 1.5
@@ -50,6 +50,7 @@
package org.apache.avalon.fortress.test.data;
/**
+ * @avalon.role
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
1.5 +2 -1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Role3.java
Index: Role3.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Role3.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Role3.java 22 Mar 2003 12:46:35 -0000 1.4
+++ Role3.java 7 Apr 2003 21:38:27 -0000 1.5
@@ -50,6 +50,7 @@
package org.apache.avalon.fortress.test.data;
/**
+ * @avalon.role
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
1.5 +2 -1 avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Role4.java
Index: Role4.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/data/Role4.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Role4.java 22 Mar 2003 12:46:35 -0000 1.4
+++ Role4.java 7 Apr 2003 21:38:27 -0000 1.5
@@ -50,6 +50,7 @@
package org.apache.avalon.fortress.test.data;
/**
+ * @avalon.role
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision$ $Date$
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org