[Barcode4j-cvs] barcode4j/src/test/java/org/krysalis/barcode4j/output/bitmap BitmapOutputTest.java, 1.4, 1.5

[Jeremias M. <jm...@us...>]

Update of /cvsroot/barcode4j/barcode4j/src/test/java/org/krysalis/barcode4j/output/bitmap
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13736/src/test/java/org/krysalis/barcode4j/output/bitmap

Modified Files:
	BitmapOutputTest.java 
Log Message:
The default for intl2of5 (per documentation) includes a human-readable part so the bitmap height needs to be adjusted here.

Index: BitmapOutputTest.java
===================================================================
RCS file: /cvsroot/barcode4j/barcode4j/src/test/java/org/krysalis/barcode4j/output/bitmap/BitmapOutputTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BitmapOutputTest.java	7 Nov 2006 16:44:25 -0000	1.4
--- BitmapOutputTest.java	18 Feb 2009 20:28:13 -0000	1.5
***************
*** 1,11 ****
  /*
   * Copyright 2002-2004 Jeremias Maerki.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
   * Copyright 2002-2004 Jeremias Maerki.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 19,24 ****
  import java.io.ByteArrayOutputStream;
  
! import org.apache.avalon.framework.configuration.ConfigurationException;
! import org.apache.avalon.framework.configuration.DefaultConfiguration;
  import org.krysalis.barcode4j.BarcodeDimension;
  import org.krysalis.barcode4j.BarcodeException;
--- 19,24 ----
  import java.io.ByteArrayOutputStream;
  
! import junit.framework.TestCase;
! 
  import org.krysalis.barcode4j.BarcodeDimension;
  import org.krysalis.barcode4j.BarcodeException;
***************
*** 26,34 ****
  import org.krysalis.barcode4j.BarcodeUtil;
  
! import junit.framework.TestCase;
  
  /**
   * Test class for basic bitmap output functionality.
!  * 
   * @author Jeremias Maerki
   * @version $Id$
--- 26,35 ----
  import org.krysalis.barcode4j.BarcodeUtil;
  
! import org.apache.avalon.framework.configuration.ConfigurationException;
! import org.apache.avalon.framework.configuration.DefaultConfiguration;
  
  /**
   * Test class for basic bitmap output functionality.
!  *
   * @author Jeremias Maerki
   * @version $Id$
***************
*** 52,81 ****
          BarcodeGenerator gen = getGenerator();
          BarcodeDimension dim = gen.calcDimensions("123");
!         
!         BufferedImage image = 
!             BitmapBuilder.prepareImage(dim, 200, BufferedImage.TYPE_BYTE_GRAY);
          assertEquals("Width in pixels should be 107", 107, image.getWidth());
!         assertEquals("Height in pixels should be 118", 118, image.getHeight());
      }
  
      public void testBitmapFile() throws Exception {
          BarcodeGenerator gen = getGenerator();
!         
          ByteArrayOutputStream baout = new ByteArrayOutputStream();
!         BitmapCanvasProvider provider = new BitmapCanvasProvider(baout, 
!                 "image/jpeg", 200, BufferedImage.TYPE_BYTE_GRAY, true, 0); 
  
          //Create Barcode and render it to a bitmap
          gen.generateBarcode(provider, "123");
          provider.finish();
!         
          assertTrue(baout.size() > 0);
      }
!     
      public void testBitmapBuffered() throws Exception {
          BarcodeGenerator gen = getGenerator();
!         
!         BitmapCanvasProvider provider = 
!             new BitmapCanvasProvider(200, BufferedImage.TYPE_BYTE_GRAY, true, 0); 
  
          //Create Barcode and render it to a bitmap
--- 53,82 ----
          BarcodeGenerator gen = getGenerator();
          BarcodeDimension dim = gen.calcDimensions("123");
! 
!         BufferedImage image =
!             BitmapBuilder.prepareImage(dim, 200, BufferedImage.TYPE_INT_RGB);
          assertEquals("Width in pixels should be 107", 107, image.getWidth());
!         assertEquals("Height in pixels should be 140", 140, image.getHeight());
      }
  
      public void testBitmapFile() throws Exception {
          BarcodeGenerator gen = getGenerator();
! 
          ByteArrayOutputStream baout = new ByteArrayOutputStream();
!         BitmapCanvasProvider provider = new BitmapCanvasProvider(baout,
!                 "image/jpeg", 200, BufferedImage.TYPE_BYTE_GRAY, true, 0);
  
          //Create Barcode and render it to a bitmap
          gen.generateBarcode(provider, "123");
          provider.finish();
! 
          assertTrue(baout.size() > 0);
      }
! 
      public void testBitmapBuffered() throws Exception {
          BarcodeGenerator gen = getGenerator();
! 
!         BitmapCanvasProvider provider =
!             new BitmapCanvasProvider(200, BufferedImage.TYPE_BYTE_GRAY, true, 0);
  
          //Create Barcode and render it to a bitmap
***************
*** 84,91 ****
          BufferedImage image = provider.getBufferedImage();
  
!         assertNotNull(image);        
          assertEquals("Width in pixels should be 107", 107, image.getWidth());
!         assertEquals("Height in pixels should be 118", 118, image.getHeight());
      }
!     
  }
\ No newline at end of file
--- 85,92 ----
          BufferedImage image = provider.getBufferedImage();
  
!         assertNotNull(image);
          assertEquals("Width in pixels should be 107", 107, image.getWidth());
!         assertEquals("Height in pixels should be 140", 140, image.getHeight());
      }
! 
  }
\ No newline at end of file