You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/02/14 16:48:05 UTC

cvs commit: jakarta-turbine-fulcrum/configuration/impl/src/test/org/apache/fulcrum/configuration ConfigTest.java

epugh       2004/02/14 07:48:05

  Modified:    configuration/impl/conf block.xml config.xml
               configuration/impl/src/test/org/apache/fulcrum/configuration
                        ConfigTest.java
  Log:
  Try and follow pattern of other merlin tests..
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-turbine-fulcrum/configuration/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	14 Feb 2004 14:22:00 -0000	1.2
  +++ block.xml	14 Feb 2004 15:48:05 -0000	1.3
  @@ -1,5 +1,5 @@
   
  -<container name="conf">
  +<container name="test">
   
      <classloader>
        <classpath>
  
  
  
  1.3       +1 -1      jakarta-turbine-fulcrum/configuration/impl/conf/config.xml
  
  Index: config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/conf/config.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.xml	14 Feb 2004 14:22:00 -0000	1.2
  +++ config.xml	14 Feb 2004 15:48:05 -0000	1.3
  @@ -1,7 +1,7 @@
   
   <targets>
   
  -  <target path="/config/conf">
  +  <target path="/test/conf">
       <categories priority="INFO"/>
       <configuration configurationPath="../../../src/test/configuration.xml"/>
     </target>
  
  
  
  1.3       +3 -14     jakarta-turbine-fulcrum/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java
  
  Index: ConfigTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfigTest.java	14 Feb 2004 14:22:00 -0000	1.2
  +++ ConfigTest.java	14 Feb 2004 15:48:05 -0000	1.3
  @@ -57,8 +57,6 @@
   import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
   import org.apache.commons.configuration.Configuration;
   
  -import junit.framework.TestSuite;
  -
   /**
    * Basic testing of the Container
    *
  @@ -79,22 +77,13 @@
       {
           super( name );
       }
  -    /**
  -     * Factory method for creating a TestSuite for this class.
  -     *
  -     * @return the test suite
  -     */
  -    public static TestSuite suite()
  -    {
  -        TestSuite suite = new TestSuite(ConfigTest.class);
  -        return suite;
  -    }
  +
       public void setUp() throws Exception
       {
           super.setUp();
           try
           {
  -            config = (Configuration) this.resolve( "/config/conf" );
  +            config = (Configuration) this.resolve( "test/conf" );
   
           }
           catch (ComponentException e)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org