You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by cm...@apache.org on 2009/09/12 22:36:19 UTC
svn commit: r814231 - in
/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan:
SanselanTestConstants.java formats/png/PngMultipleRoundtripTest.java
formats/tiff/TiffRoundtripTest.java
Author: cmchen
Date: Sat Sep 12 20:36:18 2009
New Revision: 814231
URL: http://svn.apache.org/viewvc?rev=814231&view=rev
Log:
Fix for: SANSELAN-29.
I accidentally used a Java 1.5 method in a recent CL.
Modified:
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanTestConstants.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngMultipleRoundtripTest.java
commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffRoundtripTest.java
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanTestConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanTestConstants.java?rev=814231&r1=814230&r2=814231&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanTestConstants.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/SanselanTestConstants.java Sat Sep 12 20:36:18 2009
@@ -22,7 +22,7 @@
public interface SanselanTestConstants {
static final File PHIL_HARVEY_TEST_IMAGE_FOLDER = new File(
- "src\\test\\data\\images\\exif\\philHarvey\\".replace("\\", System
+ "src\\test\\data\\images\\exif\\philHarvey\\".replaceAll("\\\\", System
.getProperty("file.separator")));
static final File SOURCE_FOLDER = new File("src");
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngMultipleRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngMultipleRoundtripTest.java?rev=814231&r1=814230&r2=814231&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngMultipleRoundtripTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/png/PngMultipleRoundtripTest.java Sat Sep 12 20:36:18 2009
@@ -35,7 +35,7 @@
public void test() throws IOException, ImageReadException,
ImageWriteException
{
- String imagesFolderPath = "src\\test\\data\\images\\png\\3".replace("\\", System.getProperty("file.separator"));
+ String imagesFolderPath = "src\\test\\data\\images\\png\\3".replaceAll("\\\\", System.getProperty("file.separator"));
File imagesFolder = new File(imagesFolderPath);
assertTrue(imagesFolder.exists() && imagesFolder.isDirectory());
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffRoundtripTest.java?rev=814231&r1=814230&r2=814231&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffRoundtripTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/sanselan/formats/tiff/TiffRoundtripTest.java Sat Sep 12 20:36:18 2009
@@ -32,15 +32,12 @@
import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.util.Debug;
-public class TiffRoundtripTest extends TiffBaseTest
-{
+public class TiffRoundtripTest extends TiffBaseTest {
public void test() throws IOException, ImageReadException,
- ImageWriteException
- {
+ ImageWriteException {
List images = getTiffImages();
- for (int i = 0; i < images.size(); i++)
- {
+ for (int i = 0; i < images.size(); i++) {
if (i % 10 == 0)
Debug.purgeMemory();
@@ -58,8 +55,9 @@
File tempFile = createTempFile(imageFile.getName() + ".", ".tif");
Map params = new HashMap();
- Sanselan.writeImage(image, tempFile,
- ImageFormat.IMAGE_FORMAT_TIFF, params);
+ Sanselan.writeImage(image, tempFile, ImageFormat.IMAGE_FORMAT_TIFF,
+ params);
+ image = null;
BufferedImage image2 = Sanselan.getBufferedImage(tempFile);
assertNotNull(image2);