donaldp     2002/11/11 17:40:11

  Modified:    info/src/test/org/apache/avalon/framework/tools/infobuilder/test
                        InfoBuilderTestCase.java
  Log:
  Unit test writing
  
  Revision  Changes    Path
  1.8       +15 -26    
jakarta-avalon-excalibur/info/src/test/org/apache/avalon/framework/tools/infobuilder/test/InfoBuilderTestCase.java
  
  Index: InfoBuilderTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/info/src/test/org/apache/avalon/framework/tools/infobuilder/test/InfoBuilderTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- InfoBuilderTestCase.java  12 Nov 2002 01:36:10 -0000      1.7
  +++ InfoBuilderTestCase.java  12 Nov 2002 01:40:11 -0000      1.8
  @@ -103,7 +103,7 @@
           final InfoReader reader = new SerializedInfoReader();
           ContainerUtil.enableLogging( reader, new ConsoleLogger() );
           final String implementationKey = 
expected.getServiceDescriptor().getImplementationKey();
  -        final FileInputStream inputStream = new FileInputStream(output );
  +        final FileInputStream inputStream = new FileInputStream( output );
           final ServiceInfo actual = reader.createServiceInfo( implementationKey, 
inputStream );
           inputStream.close();
           output.deleteOnExit();
  @@ -118,41 +118,30 @@
       public void testWriteSerComponent1()
           throws Exception
       {
  -        final ComponentInfo expected = createDummyComponentInfo();
  -        final InfoWriter writer = new SerializedInfoWriter();
  -        ContainerUtil.enableLogging( writer, new ConsoleLogger() );
  -        final File output = File.createTempFile( "info-test", ".ser" );
  -        final FileOutputStream outputStream = new FileOutputStream( output );
  -        writer.writeComponentInfo( expected, outputStream );
  -        outputStream.close();
  -
  -        final InfoReader reader = new SerializedInfoReader();
  -        ContainerUtil.enableLogging( reader, new ConsoleLogger() );
  -        final String implementationKey = 
expected.getComponentDescriptor().getImplementationKey();
  -        final FileInputStream inputStream = new FileInputStream( output );
  -        final ComponentInfo actual = reader.createComponentInfo( implementationKey, 
inputStream );
  -        inputStream.close();
  -        output.deleteOnExit();
  -        output.delete();
  -
  -        InfoAssert.assertEqualInfos( " Dummy ComponentInfo written out and read 
back " +
  -                                     "in again should be equal",
  -                                     expected,
  -                                     actual );
  +        runWriteReadTest( createDummyComponentInfo(),
  +                          new SerializedInfoWriter(),
  +                          new SerializedInfoReader() );
       }
   
       public void testWriteXMLComponent1()
           throws Exception
       {
  -        final ComponentInfo expected = createDummyComponentInfo();
  -        final InfoWriter writer = new XMLInfoWriter();
  +        runWriteReadTest( createDummyComponentInfo(),
  +                          new XMLInfoWriter(),
  +                          new XMLInfoReader() );
  +    }
  +
  +    private void runWriteReadTest( final ComponentInfo expected,
  +                                   final InfoWriter writer,
  +                                   final InfoReader reader )
  +        throws Exception
  +    {
           ContainerUtil.enableLogging( writer, new ConsoleLogger() );
           final File output = File.createTempFile( "info-test", ".xml" );
           final FileOutputStream outputStream = new FileOutputStream( output );
           writer.writeComponentInfo( expected, outputStream );
           outputStream.close();
   
  -        final InfoReader reader = new XMLInfoReader();
           ContainerUtil.enableLogging( reader, new ConsoleLogger() );
           final String implementationKey = 
expected.getComponentDescriptor().getImplementationKey();
           final FileInputStream inputStream = new FileInputStream( output );
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>

Reply via email to