You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ad...@apache.org on 2002/05/19 12:50:31 UTC
cvs commit: jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test InstantiatingServiceManagerTestCase.java LifecycleValidator.java
adammurdoch 02/05/19 03:50:31
Modified: container/src/test/org/apache/myrmidon/components/service/test
InstantiatingServiceManagerTestCase.java
LifecycleValidator.java
Log:
Fix test for InstantiatingServiceManager.
Revision Changes Path
1.6 +1 -2 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java
Index: InstantiatingServiceManagerTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InstantiatingServiceManagerTestCase.java 6 May 2002 09:29:44 -0000 1.5
+++ InstantiatingServiceManagerTestCase.java 19 May 2002 10:50:31 -0000 1.6
@@ -23,7 +23,7 @@
* Test cases for the default service manager.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.5 $ $Date: 2002/05/06 09:29:44 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/19 10:50:31 $
*/
public class InstantiatingServiceManagerTestCase
extends AbstractComponentTest
@@ -48,7 +48,6 @@
m_serviceManager.enableLogging( getLogger() );
m_serviceManager.contextualize( new DefaultContext() );
m_serviceManager.service( getServiceManager() );
- m_serviceManager.parameterize( new Parameters() );
}
/**
1.4 +7 -17 jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/LifecycleValidator.java
Index: LifecycleValidator.java
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/service/test/LifecycleValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LifecycleValidator.java 6 May 2002 09:29:44 -0000 1.3
+++ LifecycleValidator.java 19 May 2002 10:50:31 -0000 1.4
@@ -8,36 +8,32 @@
package org.apache.myrmidon.components.service.test;
import junit.framework.Assert;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameterizable;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
/**
* A basic class that asserts that the object is correctly set-up.
*
* @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
- * @version $Revision: 1.3 $ $Date: 2002/05/06 09:29:44 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/19 10:50:31 $
*/
public class LifecycleValidator
extends Assert
- implements LogEnabled, Contextualizable, Serviceable, Parameterizable, Initializable, Disposable
+ implements LogEnabled, Contextualizable, Serviceable, Initializable, Disposable
{
private String m_state = STATE_NOT_INIT;
private static final String STATE_NOT_INIT = "not-prepared";
private static final String STATE_LOG_ENABLED = "log-enabled";
private static final String STATE_SERVICED = "serviced";
- private static final String STATE_PARAMETERISED = "parameterised";
private static final String STATE_INITIALISED = "initialised";
private static final String STATE_CONTEXTUALISED = "contextualised";
private static final String STATE_DISPOSED = "disposed";
@@ -60,15 +56,9 @@
m_state = STATE_SERVICED;
}
- public void parameterize( final Parameters parameters ) throws ParameterException
- {
- assertEquals( STATE_SERVICED, m_state );
- m_state = STATE_PARAMETERISED;
- }
-
public void initialize() throws Exception
{
- assertEquals( STATE_PARAMETERISED, m_state );
+ assertEquals( STATE_SERVICED, m_state );
m_state = STATE_INITIALISED;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>