adammurdoch 02/02/20 19:23:38
Modified: proposal/myrmidon/src/testcases/org/apache/myrmidon
AbstractMyrmidonTest.java
proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer
DefaultDeployerTest.java
proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor
DefaultEmbeddorTest.java
proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type
TypeFactoryTest.java
Added: proposal/myrmidon/src/testcases/org/apache/myrmidon
AbstractProjectTest.java
Log:
* Added AbstractProjectTest, which allows a sub-class test case to execute
targets from project files.
* AbstractMyrmidonTest.getTestResource() now asserts that the resource exists.
Revision Changes Path
1.3 +5 -3
jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java
Index: AbstractMyrmidonTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMyrmidonTest.java 20 Feb 2002 07:20:22 -0000 1.2
+++ AbstractMyrmidonTest.java 21 Feb 2002 03:23:37 -0000 1.3
@@ -45,12 +45,14 @@
}
/**
- * Locates a test resource.
+ * Locates a test resource, and asserts that the resource exists
*/
protected File getTestResource( final String name )
{
- final File file = new File( m_testBaseDir, name );
- return getCanonicalFile( file );
+ File file = new File( m_testBaseDir, name );
+ file = getCanonicalFile( file );
+ assertTrue( "Test file \"" + file + "\" does not exist.",
file.exists() );
+ return file;
}
/**
1.1
jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractProjectTest.java
Index: AbstractProjectTest.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon;
import java.io.File;
import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.workspace.Workspace;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
/**
* A base class for test cases which need to execute projects.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @version $Revision: 1.1 $ $Date: 2002/02/21 03:23:37 $
*/
public class AbstractProjectTest
extends AbstractMyrmidonTest
{
private DefaultEmbeddor m_embeddor;
public AbstractProjectTest( final String name )
{
super( name );
}
/**
* Tear-down the test.
*/
protected void tearDown() throws Exception
{
if( m_embeddor != null )
{
m_embeddor.dispose();
m_embeddor = null;
}
}
/**
* Returns an embeddor which can be used to build and execute projects.
*/
protected Embeddor getEmbeddor() throws Exception
{
if( m_embeddor == null )
{
final Logger logger = createLogger();
m_embeddor = new DefaultEmbeddor();
m_embeddor.enableLogging( logger );
final Parameters params = new Parameters();
final File instDir = getHomeDirectory();
params.setParameter( "myrmidon.home", instDir.getAbsolutePath() );
m_embeddor.parameterize( params );
m_embeddor.initialize();
m_embeddor.start();
}
return m_embeddor;
}
/**
* Executes a target in a project, and asserts that it does not fail
*/
protected void executeTarget( final File projectFile, final String
targetName )
throws Exception
{
final Embeddor embeddor = getEmbeddor();
final Project project = embeddor.createProject(
projectFile.getAbsolutePath(), null, null );
final Workspace workspace = embeddor.createWorkspace( new
Parameters() );
workspace.executeProject( project, targetName );
}
}
1.6 +0 -2
jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java
Index: DefaultDeployerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultDeployerTest.java 10 Feb 2002 02:34:14 -0000 1.5
+++ DefaultDeployerTest.java 21 Feb 2002 03:23:38 -0000 1.6
@@ -119,8 +119,6 @@
public void testLibDescriptor() throws Exception
{
final File typelib = getTestResource( "test.atl" );
- assertTrue( "File " + typelib + " does not exist", typelib.exists()
);
-
final TypeDeployer typeDeployer = m_deployer.createDeployer( typelib
);
// Make sure the test types have not been deployed
1.2 +10 -37
jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java
Index: DefaultEmbeddorTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultEmbeddorTest.java 20 Feb 2002 07:20:22 -0000 1.1
+++ DefaultEmbeddorTest.java 21 Feb 2002 03:23:38 -0000 1.2
@@ -12,63 +12,35 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.myrmidon.AbstractMyrmidonTest;
import org.apache.myrmidon.TrackingProjectListener;
+import org.apache.myrmidon.AbstractProjectTest;
import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.model.Target;
import org.apache.myrmidon.interfaces.workspace.Workspace;
+import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.listeners.ProjectListener;
/**
* Test cases for the default embeddor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.1 $ $Date: 2002/02/20 07:20:22 $
+ * @version $Revision: 1.2 $ $Date: 2002/02/21 03:23:38 $
*/
public class DefaultEmbeddorTest
- extends AbstractMyrmidonTest
+ extends AbstractProjectTest
{
- private DefaultEmbeddor m_embeddor;
-
public DefaultEmbeddorTest( String name )
{
super( name );
}
/**
- * Setup the test, by creating and initialising the embeddor.
- */
- protected void setUp() throws Exception
- {
- final Logger logger = createLogger();
- m_embeddor = new DefaultEmbeddor();
- m_embeddor.enableLogging( logger );
-
- final Parameters params = new Parameters();
- final File instDir = getHomeDirectory();
- params.setParameter( "myrmidon.home", instDir.getAbsolutePath() );
- m_embeddor.parameterize( params );
- m_embeddor.initialize();
- m_embeddor.start();
- }
-
- /**
- * Tear-down the test.
- */
- protected void tearDown() throws Exception
- {
- m_embeddor.dispose();
- m_embeddor = null;
- }
-
- /**
* Tests that a project is successfully built from a file.
*/
public void testProjectBuilder() throws Exception
{
- final File projectFile = getTestResource( "project-builder.ant" );
- assertTrue( "Project file \"" + projectFile + "\" does not exist.",
projectFile.exists() );
-
// Build the project
- final Project project = m_embeddor.createProject(
projectFile.getAbsolutePath(), null, null );
+ final File projectFile = getTestResource( "project-builder.ant" );
+ final Project project = getEmbeddor().createProject(
projectFile.getAbsolutePath(), null, null );
// Verify the project.
assertEquals( "test-project", project.getProjectName() );
@@ -92,7 +64,7 @@
*/
public void testCreateListener() throws Exception
{
- final ProjectListener listener = m_embeddor.createListener(
"default" );
+ final ProjectListener listener = getEmbeddor().createListener(
"default" );
}
/**
@@ -102,10 +74,11 @@
{
// Build the project
final File projectFile = getTestResource( "project-builder.ant" );
- final Project project = m_embeddor.createProject(
projectFile.getAbsolutePath(), null, null );
+ final Embeddor embeddor = getEmbeddor();
+ final Project project = embeddor.createProject(
projectFile.getAbsolutePath(), null, null );
// Build the workspace
- final Workspace workspace = m_embeddor.createWorkspace( new
Parameters() );
+ final Workspace workspace = embeddor.createWorkspace( new
Parameters() );
// Install a listener
final TrackingProjectListener listener = new
TrackingProjectListener();
1.3 +1 -2
jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java
Index: TypeFactoryTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TypeFactoryTest.java 10 Feb 2002 02:34:14 -0000 1.2
+++ TypeFactoryTest.java 21 Feb 2002 03:23:38 -0000 1.3
@@ -16,7 +16,7 @@
* These are unit tests that test the basic operation of TypeFactories.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.2 $ $Date: 2002/02/10 02:34:14 $
+ * @version $Revision: 1.3 $ $Date: 2002/02/21 03:23:38 $
*/
public class TypeFactoryTest
extends AbstractMyrmidonTest
@@ -63,7 +63,6 @@
throws Exception
{
final File file = getTestResource( "types.jar" );
- assertTrue( "Support Jar " + file + " exists", file.exists() );
final URL[] classpath = new URL[]{file.toURL()};
final ReloadingTypeFactory factory = new ReloadingTypeFactory(
classpath, null );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
