adammurdoch 02/04/17 04:57:28
Modified: container/src/test/org/apache/myrmidon
AbstractMyrmidonTest.java
container/src/test/org/apache/myrmidon/components
AbstractComponentTest.java
container/src/test/org/apache/myrmidon/components/configurer/test
DefaultConfigurerTestCase.java
container/src/test/org/apache/myrmidon/components/embeddor/test
DefaultEmbeddorTest.java
Removed: container/src/test/org/apache/myrmidon
AbstractProjectTest.java
Log:
- Axed unused AbstractProjectTest.
- Tidied up configurer tests now that implicit conversion for typed
adders has been removed (boo).
Revision Changes Path
1.15 +0 -9
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java
Index: AbstractMyrmidonTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractMyrmidonTest.java 14 Apr 2002 08:47:26 -0000 1.14
+++ AbstractMyrmidonTest.java 17 Apr 2002 11:57:28 -0000 1.15
@@ -131,15 +131,6 @@
}
/**
- * Returns the directory containing a Myrmidon install.
- */
- protected File getInstallDirectory()
- {
- final File file = new File( m_baseDir, "dist" );
- return getCanonicalFile( file );
- }
-
- /**
* Makes a file canonical
*/
private File getCanonicalFile( final File file )
1.24 +3 -2
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/AbstractComponentTest.java
Index: AbstractComponentTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/AbstractComponentTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractComponentTest.java 11 Apr 2002 12:58:58 -0000 1.23
+++ AbstractComponentTest.java 17 Apr 2002 11:57:28 -0000 1.24
@@ -179,9 +179,10 @@
protected Map getParameters()
{
final Map parameters = new HashMap();
- final File homeDir = getInstallDirectory();
+ final File homeDir = getTestDirectory( "home" );
parameters.put( "myrmidon.home", homeDir );
- parameters.put( "myrmidon.ext.path", new File[] { new File (
homeDir, "ext" ) } );
+ final File extDir = getTestDirectory( "home/ext" );
+ parameters.put( "myrmidon.ext.path", new File[] { extDir } );
return parameters;
}
1.8 +5 -2
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java
Index: DefaultConfigurerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultConfigurerTestCase.java 11 Apr 2002 12:58:58 -0000 1.7
+++ DefaultConfigurerTestCase.java 17 Apr 2002 11:57:28 -0000 1.8
@@ -569,8 +569,10 @@
/**
* Tests conversion with a typed adder.
+ *
+ * @todo - need to get this working again
*/
- public void testTypedAdderConversion()
+ public void fixme_testTypedAdderConversion()
throws Exception
{
// Setup test data
@@ -836,7 +838,8 @@
registerConverter( ObjectToMyRole1Converter.class, String.class,
MyRole1.class );
registerConverter( StringToIntegerConverter.class, String.class,
Integer.class );
- registerType( TestDataType.ROLE, "my-type1", MyType1.class );
+ registerRole( new RoleInfo( MyRole1.ROLE, "myrole1", MyRole1.class )
);
+ registerType( MyRole1.ROLE, "my-type1", MyType1.class );
final ConfigTestIgnoreStringMethods test = new
ConfigTestIgnoreStringMethods();
1.6 +2 -2
jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java
Index: DefaultEmbeddorTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultEmbeddorTest.java 14 Apr 2002 07:45:05 -0000 1.5
+++ DefaultEmbeddorTest.java 17 Apr 2002 11:57:28 -0000 1.6
@@ -24,7 +24,7 @@
* Test cases for the default embeddor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.5 $ $Date: 2002/04/14 07:45:05 $
+ * @version $Revision: 1.6 $ $Date: 2002/04/17 11:57:28 $
*/
public class DefaultEmbeddorTest
extends AbstractMyrmidonTest
@@ -63,7 +63,7 @@
m_embeddor.enableLogging( logger );
final DefaultContext context = new DefaultContext();
- context.put( "myrmidon.home", getInstallDirectory() );
+ context.put( "myrmidon.home", getTestDirectory() );
m_embeddor.contextualize( context );
m_embeddor.initialize();
m_embeddor.start();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
