cvs commit: jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/verifier/test VerifierTestCase.java

[donaldp]

donaldp     2002/09/30 23:18:22

  Modified:    src/test/org/apache/avalon/phoenix/tools/verifier/test
                        VerifierTestCase.java
  Log:
  Use abstract test case
  
  Revision  Changes    Path
  1.2       +4 -26     
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/verifier/test/VerifierTestCase.java
  
  Index: VerifierTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/verifier/test/VerifierTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- VerifierTestCase.java     1 Oct 2002 00:08:40 -0000       1.1
  +++ VerifierTestCase.java     1 Oct 2002 06:18:22 -0000       1.2
  @@ -7,14 +7,9 @@
    */
   package org.apache.avalon.phoenix.tools.verifier.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.tools.assembler.Assembler;
  -import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
  +import org.apache.avalon.phoenix.test.AbstractContainerTestCase;
   import org.apache.avalon.phoenix.tools.verifier.SarVerifier;
   
   /**
  @@ -24,7 +19,7 @@
    * @version $Revision$ $Date$
    */
   public class VerifierTestCase
  -    extends TestCase
  +    extends AbstractContainerTestCase
   {
       public VerifierTestCase( final String name )
       {
  @@ -43,29 +38,12 @@
           verify( "assembly2.xml" );
       }
   
  -    private void verify( final String config ) throws Exception
  +    protected void verify( final String config ) throws Exception
       {
           final SarMetaData sarMetaData = assembleSar( config );
           final ClassLoader classLoader = getClass().getClassLoader();
           final SarVerifier verifier = new SarVerifier();
           verifier.enableLogging( new ConsoleLogger() );
           verifier.verifySar( sarMetaData, classLoader );
  -    }
  -
  -    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]>