[prev in list] [next in list] [prev in thread] [next in thread]
List: avalon-cvs
Subject: cvs commit: avalon-excalibur/component/src/test/org/apache/avalon/excalibur/testcase/test ComponentT
From: leosimons () apache ! org
Date: 2003-03-30 19:35:40
[Download RAW message or body]
leosimons 2003/03/30 11:35:40
Modified: component build.xml
component/src/java/org/apache/avalon/excalibur/testcase
CascadingAssertionFailedError.java
FullLifecycleComponent.java
component/src/test/org/apache/avalon/excalibur/component/test
ExcaliburComponentManagerTestCase.java
component/src/test/org/apache/avalon/excalibur/testcase/test
ComponentTestCase.java
Log:
fix testcase test
Revision Changes Path
1.41 +1 -1 avalon-excalibur/component/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/component/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 28 Mar 2003 16:16:04 -0000 1.40
+++ build.xml 30 Mar 2003 19:35:40 -0000 1.41
@@ -43,7 +43,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the \
project"/>
<!-- Checks the environment for existing resources -->
1.5 +15 -15 \
avalon-excalibur/component/src/java/org/apache/avalon/excalibur/testcase/CascadingAssertionFailedError.java
Index: CascadingAssertionFailedError.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/component/src/java/org/apache/avalon/excalibur/testcase/CascadingAssertionFailedError.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CascadingAssertionFailedError.java 22 Mar 2003 12:46:25 -0000 1.4
+++ CascadingAssertionFailedError.java 30 Mar 2003 19:35:40 -0000 1.5
@@ -3,34 +3,34 @@
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
+
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
- must not be used to endorse or promote products derived from this software
- without prior written permission. For written permission, please contact
+
+ 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
+ must not be used to endorse or promote products derived from this software
+ without prior written permission. For written permission, please contact
apache@apache.org.
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -41,11 +41,11 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
+ on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
-
+
*/
package org.apache.avalon.excalibur.testcase;
1.5 +16 -16 \
avalon-excalibur/component/src/java/org/apache/avalon/excalibur/testcase/FullLifecycleComponent.java
Index: FullLifecycleComponent.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/component/src/java/org/apache/avalon/excalibur/testcase/FullLifecycleComponent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FullLifecycleComponent.java 22 Mar 2003 12:46:25 -0000 1.4
+++ FullLifecycleComponent.java 30 Mar 2003 19:35:40 -0000 1.5
@@ -3,34 +3,34 @@
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
+
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
- must not be used to endorse or promote products derived from this software
- without prior written permission. For written permission, please contact
+
+ 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
+ must not be used to endorse or promote products derived from this software
+ without prior written permission. For written permission, please contact
apache@apache.org.
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -41,11 +41,11 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
+ on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
-
+
*/
package org.apache.avalon.excalibur.testcase;
@@ -126,7 +126,7 @@
throws ServiceException
{
m_validator.checkNotAssigned( m_manager );
- m_validator.checkComposed();
+ m_validator.checkServiced();
m_manager = manager;
}
1.8 +15 -15 \
avalon-excalibur/component/src/test/org/apache/avalon/excalibur/component/test/ExcaliburComponentManagerTestCase.java
Index: ExcaliburComponentManagerTestCase.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/component/src/test/org/apache/avalon/excalibur/component/test/ExcaliburComponentManagerTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExcaliburComponentManagerTestCase.java 4 Mar 2003 17:15:06 -0000 1.7
+++ ExcaliburComponentManagerTestCase.java 30 Mar 2003 19:35:40 -0000 1.8
@@ -3,34 +3,34 @@
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
+
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
- must not be used to endorse or promote products derived from this software
- without prior written permission. For written permission, please contact
+
+ 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
+ must not be used to endorse or promote products derived from this software
+ without prior written permission. For written permission, please contact
apache@apache.org.
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -41,11 +41,11 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
+ on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
-
+
*/
package org.apache.avalon.excalibur.component.test;
1.5 +21 -15 \
avalon-excalibur/component/src/test/org/apache/avalon/excalibur/testcase/test/ComponentTestCase.java
Index: ComponentTestCase.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/component/src/test/org/apache/avalon/excalibur/testcase/test/ComponentTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComponentTestCase.java 22 Mar 2003 12:46:26 -0000 1.4
+++ ComponentTestCase.java 30 Mar 2003 19:35:40 -0000 1.5
@@ -3,34 +3,34 @@
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
+
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
+
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
- must not be used to endorse or promote products derived from this software
- without prior written permission. For written permission, please contact
+
+ 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
+ must not be used to endorse or promote products derived from this software
+ without prior written permission. For written permission, please contact
apache@apache.org.
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -41,11 +41,11 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
+ on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
-
+
*/
package org.apache.avalon.excalibur.testcase.test;
@@ -56,6 +56,7 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.NullLogger;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.DefaultServiceManager;
/**
* This class provides basic facilities for enforcing Avalon's contracts
@@ -79,6 +80,7 @@
component.enableLogging( new NullLogger() );
component.contextualize( new DefaultContext() );
+ component.service( new DefaultServiceManager() );
component.configure( new DefaultConfiguration( "", "" ) );
component.parameterize( new Parameters() );
component.initialize();
@@ -131,6 +133,7 @@
component.enableLogging( new NullLogger() );
component.contextualize( new DefaultContext() );
+ component.service( new DefaultServiceManager() );
component.configure( new DefaultConfiguration( "", "" ) );
component.parameterize( new Parameters() );
component.initialize();
@@ -194,6 +197,7 @@
component.enableLogging( new NullLogger() );
component.contextualize( new DefaultContext() );
+ component.service( new DefaultServiceManager() );
component.configure( new DefaultConfiguration( "", "" ) );
try
@@ -216,6 +220,8 @@
component.enableLogging( new NullLogger() );
component.contextualize( new DefaultContext() );
+ component.service( new DefaultServiceManager() );
+
try
{
component.configure( new DefaultConfiguration( "", "" ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic