cvs commit: cocoon-2.2/src/test/org/apache/cocoon AbstractCompositeTestCase.java

[cziegeler]

cziegeler    2004/03/31 04:57:02

  Modified:    src/test/org/apache/cocoon/serialization
                        AbstractSerializerTestCase.java
               src/test/org/apache/cocoon/environment/mock
                        MockEnvironment.java
               src/test/org/apache/cocoon AbstractCompositeTestCase.java
  Log:
  Serializers can implement SitemapModelComponent
  Remove unused fields
  
  Revision  Changes    Path
  1.4       +12 -1     
cocoon-2.2/src/test/org/apache/cocoon/serialization/AbstractSerializerTestCase.java
  
  Index: AbstractSerializerTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/serialization/AbstractSerializerTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractSerializerTestCase.java   8 Mar 2004 14:04:20 -0000       1.3
  +++ AbstractSerializerTestCase.java   31 Mar 2004 12:57:02 -0000      1.4
  @@ -25,6 +25,9 @@
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceSelector;
  +import org.apache.cocoon.ProcessingException;
  +import org.apache.cocoon.components.source.SourceResolverAdapter;
  +import org.apache.cocoon.sitemap.SitemapModelComponent;
   import org.apache.cocoon.xml.WhitespaceFilter;
   import org.apache.cocoon.xml.dom.DOMBuilder;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  @@ -94,6 +97,11 @@
               serializer = (Serializer) selector.select(type);
               assertNotNull("Test lookup of serializer", serializer);
   
  +            if ( serializer instanceof SitemapModelComponent ) {
  +                ((SitemapModelComponent)serializer).setup(new 
SourceResolverAdapter(resolver),
  +                    objectmodel, null, parameters);
  +            }
  +
               document = new ByteArrayOutputStream();
               serializer.setOutputStream(document);
   
  @@ -111,6 +119,9 @@
           } catch (IOException ioe) {
               getLogger().error("Could not execute test", ioe);
               fail("Could not execute test:"+ioe.toString());
  +        } catch (ProcessingException pe) {
  +            getLogger().error("Could not execute test", pe);
  +            fail("Could not execute test:"+pe.toString());
           } finally {
               if (serializer!=null) {
                   selector.release(serializer);
  
  
  
  1.10      +0 -2      
cocoon-2.2/src/test/org/apache/cocoon/environment/mock/MockEnvironment.java
  
  Index: MockEnvironment.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/environment/mock/MockEnvironment.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MockEnvironment.java      18 Mar 2004 15:15:10 -0000      1.9
  +++ MockEnvironment.java      31 Mar 2004 12:57:02 -0000      1.10
  @@ -31,8 +31,6 @@
   
       private String uri;
       private String uriprefix;
  -    private String rootcontext;
  -    private String context;
       private String view;
       private String action;
       private String contenttype;
  
  
  
  1.13      +11 -1     
cocoon-2.2/src/test/org/apache/cocoon/AbstractCompositeTestCase.java
  
  Index: AbstractCompositeTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/test/org/apache/cocoon/AbstractCompositeTestCase.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AbstractCompositeTestCase.java    8 Mar 2004 14:04:02 -0000       1.12
  +++ AbstractCompositeTestCase.java    31 Mar 2004 12:57:02 -0000      1.13
  @@ -38,6 +38,7 @@
   import org.apache.cocoon.environment.mock.MockResponse;
   import org.apache.cocoon.generation.Generator;
   import org.apache.cocoon.serialization.Serializer;
  +import org.apache.cocoon.sitemap.SitemapModelComponent;
   import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.xml.WhitespaceFilter;
   import org.apache.cocoon.xml.dom.DOMBuilder;
  @@ -308,6 +309,11 @@
               serializer = (Serializer) lookup(Serializer.ROLE + "/" + type);
               assertNotNull("Test lookup of serializer", serializer);
   
  +            if ( serializer instanceof SitemapModelComponent ) {
  +                ((SitemapModelComponent)serializer).setup(new 
SourceResolverAdapter(resolver),
  +                    objectmodel, null, parameters);
  +            }
  +            
               document = new ByteArrayOutputStream();
               serializer.setOutputStream(document);
   
  @@ -325,6 +331,10 @@
           } catch (IOException ioe) {
               getLogger().error("Could not execute test", ioe);
               fail("Could not execute test:"+ioe.toString());
  +        } catch (ProcessingException pe) {
  +            getLogger().error("Could not execute test", pe);
  +            pe.printStackTrace();
  +            fail("Could not execute test:"+pe.toString());
           } finally {
               if (serializer!=null) {
                   release(serializer);