You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/11/26 12:45:44 UTC
svn commit: r1545623 - in /commons/proper/imaging/trunk: ./
src/main/java/org/apache/commons/imaging/util/
src/test/java/org/apache/commons/imaging/common/bytesource/
src/test/java/org/apache/commons/imaging/examples/
src/test/java/org/apache/commons/i...
Author: ebourg
Date: Tue Nov 26 11:45:43 2013
New Revision: 1545623
URL: http://svn.apache.org/r1545623
Log:
Removed the methods in IoUtils used only in the tests and replaced them with equivalent methods of commons-io
Modified:
commons/proper/imaging/trunk/pom.xml
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
Modified: commons/proper/imaging/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/pom.xml?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/pom.xml (original)
+++ commons/proper/imaging/trunk/pom.xml Tue Nov 26 11:45:43 2013
@@ -197,7 +197,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java Tue Nov 26 11:45:43 2013
@@ -16,18 +16,8 @@
*/
package org.apache.commons.imaging.util;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.channels.FileChannel;
import org.apache.commons.imaging.ImagingConstants;
@@ -50,154 +40,6 @@ public final class IoUtils implements Im
throw firstException;
}
}
-
- public static boolean copyFileNio(final File src, final File dst)
- throws IOException {
- FileChannel srcChannel = null, dstChannel = null;
- boolean canThrow = false;
- try {
- // Create channel on the source
- srcChannel = new FileInputStream(src).getChannel();
-
- // Create channel on the destination
- dstChannel = new FileOutputStream(dst).getChannel();
-
- // // Copy file contents from source to destination
- // dstChannel.transferFrom(srcChannel, 0, srcChannel.size());
-
- {
- // long theoretical_max = (64 * 1024 * 1024) - (32 * 1024);
- final int safe_max = (64 * 1024 * 1024) / 4;
- final long size = srcChannel.size();
- long position = 0;
- while (position < size) {
- position += srcChannel.transferTo(position, safe_max,
- dstChannel);
- }
- }
- canThrow = true;
- return true;
- } finally {
- IoUtils.closeQuietly(canThrow, srcChannel, dstChannel);
- }
- }
-
- public static void copyStreamToStream(final InputStream src, final OutputStream dst)
- throws IOException {
- copyStreamToStream(src, dst, true);
- }
-
- public static void copyStreamToStream(final InputStream src, final OutputStream dst,
- final boolean close_streams) throws IOException {
- BufferedInputStream bis = null;
- BufferedOutputStream bos = null;
- boolean canThrow = false;
- try {
- bis = new BufferedInputStream(src);
- bos = new BufferedOutputStream(dst);
-
- int count;
- final byte[] buffer = new byte[4096];
- while ((count = bis.read(buffer, 0, buffer.length)) > 0) {
- dst.write(buffer, 0, count);
- }
- bos.flush();
- canThrow = true;
- } finally {
- if (close_streams) {
- IoUtils.closeQuietly(canThrow, bis, bos);
- }
- }
-
- }
-
- /**
- * Reads a File into memory.
- * <p>
- *
- * @param file
- * The File to read.
- * @return A byte array containing the contents of the File
- * @see InputStream
- */
- public static byte[] getFileBytes(final File file) throws IOException {
- InputStream is = null;
- boolean canThrow = false;
- try {
- is = new FileInputStream(file);
-
- final byte[] ret = getInputStreamBytes(is);
- canThrow = true;
- return ret;
- } finally {
- IoUtils.closeQuietly(canThrow, is);
- }
- }
-
- /**
- * Reads an InputStream to the end.
- * <p>
- *
- * @param is
- * The InputStream to read.
- * @return A byte array containing the contents of the InputStream
- * @see InputStream
- */
- public static byte[] getInputStreamBytes(InputStream is) throws IOException {
- ByteArrayOutputStream os = null;
- boolean canThrow = false;
- try {
- os = new ByteArrayOutputStream(4096);
-
- is = new BufferedInputStream(is);
-
- int count;
- final byte[] buffer = new byte[4096];
- while ((count = is.read(buffer, 0, 4096)) > 0) {
- os.write(buffer, 0, count);
- }
-
- os.flush();
-
- final byte[] ret = os.toByteArray();
- canThrow = true;
- return ret;
- } finally {
- IoUtils.closeQuietly(canThrow, os);
- }
- }
-
- public static void putInputStreamToFile(final InputStream src, final File file)
- throws IOException {
- FileOutputStream stream = null;
- boolean canThrow = false;
- try {
- if (file.getParentFile() != null && !file.getParentFile().exists() &&
- !file.getParentFile().mkdirs()) {
- throw new IOException(
- "Could not create directory for file " + file);
- }
- stream = new FileOutputStream(file);
-
- copyStreamToStream(src, stream);
- canThrow = true;
- } finally {
- IoUtils.closeQuietly(canThrow, stream);
- }
- }
-
- public static void writeToFile(final byte[] src, final File file) throws IOException {
- ByteArrayInputStream stream = null;
- boolean canThrow = false;
- try {
- stream = new ByteArrayInputStream(src);
-
- putInputStreamToFile(stream, file);
- canThrow = true;
- } finally {
- IoUtils.closeQuietly(canThrow, stream);
- }
- }
/**
* This class should never be instantiated.
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java Tue Nov 26 11:45:43 2013
@@ -23,10 +23,8 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.imaging.common.bytesource.ByteSource;
-import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
-import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.IOUtils;
public class ByteSourceDataTest extends ByteSourceTest {
@@ -94,7 +92,7 @@ public class ByteSourceDataTest extends
// test cache by completely reading InputStream N times.
for (int j = 0; j < 5; j++) {
final InputStream is = byteSource.getInputStream();
- final byte dst[] = IoUtils.getInputStreamBytes(is);
+ final byte dst[] = IOUtils.toByteArray(is);
compareByteArrays(src, dst);
}
@@ -114,7 +112,7 @@ public class ByteSourceDataTest extends
boolean canThrow = false;
try {
is = byteSource.getInputStream(start);
- final byte dst[] = IoUtils.getInputStreamBytes(is);
+ final byte dst[] = IOUtils.toByteArray(is);
assertTrue(src.length == dst.length + start);
for (int i = 0; i < dst.length; i++) {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java Tue Nov 26 11:45:43 2013
@@ -34,7 +34,7 @@ import org.apache.commons.imaging.ImageI
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.util.Debug;
-import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class ByteSourceImageTest extends ByteSourceTest {
@@ -49,7 +49,7 @@ public class ByteSourceImageTest extends
Debug.debug("imageFile", imageFile);
assertNotNull(imageFile);
- final byte imageFileBytes[] = IoUtils.getFileBytes(imageFile);
+ final byte imageFileBytes[] = FileUtils.readFileToByteArray(imageFile);
assertNotNull(imageFileBytes);
assertTrue(imageFileBytes.length == imageFile.length());
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java Tue Nov 26 11:45:43 2013
@@ -34,6 +34,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class WriteExifMetadataExample {
public void removeExifMetadata(final File jpegImageFile, final File dst)
@@ -193,7 +194,7 @@ public class WriteExifMetadataExample {
if (null == outputSet) {
// file does not contain any exif metadata. We don't need to
// update the file; just copy it.
- IoUtils.copyFileNio(jpegImageFile, dst);
+ FileUtils.copyFile(jpegImageFile, dst);
return;
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java Tue Nov 26 11:45:43 2013
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.util.Debug;
-import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class BmpRoundtripTest extends BmpBaseTest {
@@ -142,7 +142,7 @@ public class BmpRoundtripTest extends Bm
// Debug.debug("bytes", bytes);
final File tempFile = createTempFile("temp", ".bmp");
- IoUtils.writeToFile(bytes, tempFile);
+ FileUtils.writeByteArrayToFile(tempFile, bytes);
final BufferedImage dstImage = Imaging.getBufferedImage(bytes);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java Tue Nov 26 11:45:43 2013
@@ -21,13 +21,13 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.nio.ByteOrder;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import java.nio.ByteOrder;
import org.apache.commons.imaging.util.Debug;
-import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class IcnsRoundTripTest extends IcnsBaseTest {
// 16x16 test image
@@ -408,7 +408,7 @@ public class IcnsRoundTripTest extends I
ImageReadException {
final File exportFile = new File(createTempDirectory(), description + ".icns");
exportFile.deleteOnExit();
- IoUtils.writeToFile(rawData, exportFile);
+ FileUtils.writeByteArrayToFile(exportFile, rawData);
final BufferedImage dstImage = Imaging.getBufferedImage(exportFile);
assertNotNull(dstImage);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java Tue Nov 26 11:45:43 2013
@@ -21,6 +21,7 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.nio.ByteOrder;
import java.util.HashMap;
import java.util.Map;
@@ -28,9 +29,8 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.BinaryOutputStream;
-import java.nio.ByteOrder;
import org.apache.commons.imaging.util.Debug;
-import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class IcoRoundtripTest extends IcoBaseTest {
// 16x16 test image
@@ -525,7 +525,7 @@ public class IcoRoundtripTest extends Ic
// IoUtils.writeToFile(rawData, exportFile);
final File tempFile = createTempFile("temp", ".ico");
- IoUtils.writeToFile(rawData, tempFile);
+ FileUtils.writeByteArrayToFile(tempFile, rawData);
final BufferedImage dstImage = Imaging.getBufferedImage(tempFile);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Tue Nov 26 11:45:43 2013
@@ -43,7 +43,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
import org.apache.commons.imaging.util.Debug;
-import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class ExifRewriteTest extends ExifBaseTest implements AllTagConstants {
// public ExifRewriteTest(String name)
@@ -82,7 +82,7 @@ public class ExifRewriteTest extends Exi
final byte bytes[] = baos.toByteArray();
final File tempFile = createTempFile("test", ".jpg");
Debug.debug("tempFile", tempFile);
- IoUtils.writeToFile(bytes, tempFile);
+ FileUtils.writeByteArrayToFile(tempFile, bytes);
Debug.debug("Output Segments:");
new JpegUtils().dumpJFIF(new ByteSourceArray(bytes));
@@ -125,7 +125,7 @@ public class ExifRewriteTest extends Exi
final byte bytes[] = baos.toByteArray();
final File tempFile = createTempFile("removed", ".jpg");
Debug.debug("tempFile", tempFile);
- IoUtils.writeToFile(bytes, tempFile);
+ FileUtils.writeByteArrayToFile(tempFile, bytes);
Debug.debug("Output Segments:");
stripped = new ByteSourceArray(bytes);
@@ -146,7 +146,7 @@ public class ExifRewriteTest extends Exi
final byte bytes[] = baos.toByteArray();
final File tempFile = createTempFile("inserted" + "_", ".jpg");
Debug.debug("tempFile", tempFile);
- IoUtils.writeToFile(bytes, tempFile);
+ FileUtils.writeByteArrayToFile(tempFile, bytes);
Debug.debug("Output Segments:");
new JpegUtils().dumpJFIF(new ByteSourceArray(bytes));
@@ -220,7 +220,7 @@ public class ExifRewriteTest extends Exi
final byte bytes[] = baos.toByteArray();
final File tempFile = createTempFile(name + "_", ".jpg");
Debug.debug("tempFile", tempFile);
- IoUtils.writeToFile(bytes, tempFile);
+ FileUtils.writeByteArrayToFile(tempFile, bytes);
Debug.debug("Output Segments:");
new JpegUtils().dumpJFIF(new ByteSourceArray(bytes));
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java Tue Nov 26 11:45:43 2013
@@ -27,10 +27,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.formats.png.PngConstants;
-import org.apache.commons.imaging.formats.png.PngImageInfo;
-import org.apache.commons.imaging.formats.png.PngText;
-import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class PngTextTest extends PngBaseTest {
@@ -69,15 +66,14 @@ public class PngTextTest extends PngBase
ImageFormats.PNG, writeParams);
final File tempFile = createTempFile("temp", ".png");
- IoUtils.writeToFile(bytes, tempFile);
+ FileUtils.writeByteArrayToFile(tempFile, bytes);
final PngImageInfo imageInfo = (PngImageInfo) Imaging.getImageInfo(bytes);
assertNotNull(imageInfo);
final List<PngText> readTexts = imageInfo.getTextChunks();
assertEquals(readTexts.size(), 3);
- for (int i = 0; i < readTexts.size(); i++) {
- final PngText text = readTexts.get(i);
+ for (PngText text : readTexts) {
if (text.keyword.equals("a")) {
assertEquals(text.text, "b");
} else if (text.keyword.equals("c")) {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java Tue Nov 26 11:45:43 2013
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.ImageR
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingTest;
-import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class PngWriteReadTest extends ImagingTest {
// public PngWriteReadTest(String name)
@@ -142,7 +142,7 @@ public class PngWriteReadTest extends Im
// Debug.debug("bytes", bytes);
final File tempFile = createTempFile("temp", ".png");
- IoUtils.writeToFile(bytes, tempFile);
+ FileUtils.writeByteArrayToFile(tempFile, bytes);
final BufferedImage dstImage = Imaging.getBufferedImage(bytes);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java?rev=1545623&r1=1545622&r2=1545623&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java Tue Nov 26 11:45:43 2013
@@ -35,6 +35,7 @@ import org.apache.commons.imaging.PixelD
import org.apache.commons.imaging.common.RgbBufferedImageFactory;
import org.apache.commons.imaging.util.Debug;
import org.apache.commons.imaging.util.IoUtils;
+import org.apache.commons.io.FileUtils;
public class RoundtripTest extends ImagingTest {
private static final int COLOR_FULL_RGB = 0;
@@ -252,8 +253,8 @@ public class RoundtripTest extends Imagi
assertTrue(b.exists() && b.isFile());
assertEquals(a.length(), b.length());
- final byte aData[] = IoUtils.getFileBytes(a);
- final byte bData[] = IoUtils.getFileBytes(b);
+ final byte aData[] = FileUtils.readFileToByteArray(a);
+ final byte bData[] = FileUtils.readFileToByteArray(b);
for (int i = 0; i < a.length(); i++) {
final int aByte = 0xff & aData[i];