donaldp 2002/09/30 23:17:59
Modified: src/test/org/apache/avalon/phoenix/tools/assembler/test
AssemblerTestCase.java
Log:
Use abstract test case
Revision Changes Path
1.6 +5 -29
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java
Index: AssemblerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AssemblerTestCase.java 30 Sep 2002 23:52:48 -0000 1.5
+++ AssemblerTestCase.java 1 Oct 2002 06:17:58 -0000 1.6
@@ -7,20 +7,14 @@
*/
package org.apache.avalon.phoenix.tools.assembler.test;
-import java.io.File;
-import java.net.URL;
-import junit.framework.TestCase;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
-import org.apache.avalon.phoenix.tools.assembler.Assembler;
+import org.apache.avalon.phoenix.metadata.SarMetaData;
+import org.apache.avalon.phoenix.test.AbstractContainerTestCase;
import org.apache.avalon.phoenix.test.data.Component1;
-import org.apache.avalon.phoenix.test.data.Service2;
import org.apache.avalon.phoenix.test.data.Component2;
import org.apache.avalon.phoenix.test.data.Component3;
-import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
+import org.apache.avalon.phoenix.test.data.Service2;
/**
* An basic test case for the LogManager.
@@ -29,7 +23,7 @@
* @version $Revision$ $Date$
*/
public class AssemblerTestCase
- extends TestCase
+ extends AbstractContainerTestCase
{
public AssemblerTestCase( final String name )
{
@@ -139,23 +133,5 @@
assertTrue( "Block4 getBlockInfo non null",
null != block4.getBlockInfo() );
assertEquals( "Block4 isDisableProxy", false, block4.isDisableProxy() );
-
- }
-
- private SarMetaData assembleSar( final String config ) throws Exception
- {
- final Assembler assembler = new Assembler();
- assembler.enableLogging( new ConsoleLogger() );
- final ClassLoader classLoader = getClass().getClassLoader();
- final Configuration assembly = loadConfig( config );
- return assembler.assembleSar( "test", assembly,
- new File( "." ), classLoader );
- }
-
- private Configuration loadConfig( final String config )
- throws Exception
- {
- final URL resource = getClass().getResource( config );
- return ConfigurationBuilder.build( resource.toExternalForm() );
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
