cvs commit: cocoon-2.1/src/test/org/apache/cocoon/components/resolver/test ResolverImplTestCase.java

[ugo]

ugo         2003/10/09 05:01:08

  Modified:    .        status.xml
               src/test/org/apache/cocoon/components/resolver/test
                        ResolverImplTestCase.java
  Log:
  Fixed ResolverImplTestCase so that the "test" build target does not fail.
  
  Revision  Changes    Path
  1.172     +6 -1      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.171
  retrieving revision 1.172
  diff -u -r1.171 -r1.172
  --- status.xml        8 Oct 2003 10:09:41 -0000       1.171
  +++ status.xml        9 Oct 2003 12:01:07 -0000       1.172
  @@ -49,6 +49,7 @@
     <person name="Nicola Ken Barozzi" email="[EMAIL PROTECTED]" id="NKB"/>
     <person name="Ross Burton" email="[EMAIL PROTECTED]" id="RB"/>
     <person name="Mark Butler" email="[EMAIL PROTECTED]" id="MB"/>
  +  <person name="Ugo Cei" email="[EMAIL PROTECTED]" id="UC"/>
     <person name="Marcus Crafter" email="[EMAIL PROTECTED]" id="MC"/>
     <person name="David Crossley" email="[EMAIL PROTECTED]" id="DC"/>
     <person name="Torsten Curdt" email="[EMAIL PROTECTED]" id="TC"/>
  @@ -191,6 +192,10 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="UC" type="fix">
  +    Fixed ResolverImplTestCase so that the "test" build target does not fail 
(it still depends on the
  +    deprecated block, though).
  +   </action>
      <action dev="BRD" type="fix">
        Woody: fixed a bug causing an endless loop during validation of a field 
if
        during the validation of the field the value of the field itself was 
again
  
  
  
  1.8       +6 -6      
cocoon-2.1/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java
  
  Index: ResolverImplTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/components/resolver/test/ResolverImplTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ResolverImplTestCase.java 30 Sep 2003 13:36:33 -0000      1.7
  +++ ResolverImplTestCase.java 9 Oct 2003 12:01:08 -0000       1.8
  @@ -59,12 +59,12 @@
   import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  +import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.cocoon.Constants;
  -import org.apache.excalibur.xml.EntityResolver;
  -import org.apache.excalibur.xml.DefaultEntityResolver;
   import org.apache.cocoon.environment.commandline.CommandLineContext;
   import org.apache.cocoon.util.IOUtils;
  +import org.apache.excalibur.xml.EntityResolver;
   import org.xml.sax.InputSource;
   
   /**
  @@ -231,7 +231,7 @@
           "<!ENTITY shy    \"&#173;\" ><!--=soft hyphen-->\n" +
           "";
       private DefaultContext context;
  -    private DefaultEntityResolver resolverImpl;
  +    private EntityResolver resolverImpl;
       private File workDir;
       private File commandlineContextDir;
   
  @@ -279,7 +279,7 @@
           super.setUp();
   
           String role = EntityResolver.ROLE;
  -        resolverImpl = (DefaultEntityResolver) manager.lookup(role);
  +        resolverImpl = (EntityResolver) manager.lookup(role);
           assertNotNull("ResolverImpl is null", resolverImpl);
       }
   
  @@ -346,7 +346,7 @@
           super.tearDown();
   
           if (resolverImpl != null) {
  -            manager.release(resolverImpl);
  +            manager.release((Component) resolverImpl);
               resolverImpl = null;
           }
       }