1 files changed, 82 insertions, 8 deletions
diff --git a/src/test/java/org/apache/commons/io/RandomAccessFilesTest.java b/src/test/java/org/apache/commons/io/RandomAccessFilesTest.java
index d3873599..ce7fa8fd 100644
--- a/src/test/java/org/apache/commons/io/RandomAccessFilesTest.java
+++ b/src/test/java/org/apache/commons/io/RandomAccessFilesTest.java
@@ -19,10 +19,15 @@ package org.apache.commons.io;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
 
@@ -31,32 +36,101 @@ import org.junit.jupiter.api.Test;
  */
 public class RandomAccessFilesTest {
 
-    protected static final String FILE_RES_RO = "/org/apache/commons/io/test-file-20byteslength.bin";
-    protected static final String FILE_NAME_RO = "src/test/resources" + FILE_RES_RO;
+    private static final String FILE_NAME_RO_20 = "src/test/resources/org/apache/commons/io/test-file-20byteslength.bin";
+    private static final String FILE_NAME_RO_0 = "src/test/resources/org/apache/commons/io/test-file-empty.bin";
+    private static final String FILE_NAME_RO_0_BIS = "src/test/resources/org/apache/commons/io/test-file-empty2.bin";
+
+    @Test
+    public void testContentEquals() throws IOException {
+        try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
+            assertEquals(raf1, raf1);
+            assertTrue(RandomAccessFiles.contentEquals(raf1, raf1));
+        }
+        // as above, to make sure resources are OK
+        try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
+            assertEquals(raf1, raf1);
+            assertTrue(RandomAccessFiles.contentEquals(raf1, raf1));
+        }
+        // same 20 bytes
+        try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20);
+                RandomAccessFile raf2 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
+            assertTrue(RandomAccessFiles.contentEquals(raf1, raf2));
+        }
+        // same empty file
+        try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_0);
+                RandomAccessFile raf2 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_0)) {
+            assertTrue(RandomAccessFiles.contentEquals(raf1, raf2));
+            assertTrue(RandomAccessFiles.contentEquals(RandomAccessFiles.reset(raf2), RandomAccessFiles.reset(raf1)));
+        }
+        // diff empty file
+        try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_0);
+                RandomAccessFile raf2 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_0_BIS)) {
+            assertTrue(RandomAccessFiles.contentEquals(raf1, raf2));
+            assertTrue(RandomAccessFiles.contentEquals(RandomAccessFiles.reset(raf2), RandomAccessFiles.reset(raf1)));
+        }
+        try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_0);
+                RandomAccessFile raf2 = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
+            assertFalse(RandomAccessFiles.contentEquals(raf1, raf2));
+            assertFalse(RandomAccessFiles.contentEquals(RandomAccessFiles.reset(raf2), RandomAccessFiles.reset(raf1)));
+        }
+        //
+        final Path bigFile1 = Files.createTempFile(getClass().getSimpleName(), "-1.bin");
+        final Path bigFile2 = Files.createTempFile(getClass().getSimpleName(), "-2.bin");
+        final Path bigFile3 = Files.createTempFile(getClass().getSimpleName(), "-3.bin");
+        try {
+            final int newLength = 1_000_000;
+            final byte[] bytes1 = new byte[newLength];
+            final byte[] bytes2 = new byte[newLength];
+            Arrays.fill(bytes1, (byte) 1);
+            Arrays.fill(bytes2, (byte) 2);
+            Files.write(bigFile1, bytes1);
+            Files.write(bigFile2, bytes2);
+            try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(bigFile1);
+                    RandomAccessFile raf2 = RandomAccessFileMode.READ_ONLY.create(bigFile2)) {
+                assertFalse(RandomAccessFiles.contentEquals(raf1, raf2));
+                assertFalse(RandomAccessFiles.contentEquals(RandomAccessFiles.reset(raf2), RandomAccessFiles.reset(raf1)));
+                assertTrue(RandomAccessFiles.contentEquals(RandomAccessFiles.reset(raf1), RandomAccessFiles.reset(raf1)));
+            }
+            // Make the last byte different
+            final byte[] bytes3 = bytes1.clone();
+            bytes3[bytes3.length - 1] = 9;
+            Files.write(bigFile3, bytes3);
+            try (RandomAccessFile raf1 = RandomAccessFileMode.READ_ONLY.create(bigFile1);
+                    RandomAccessFile raf3 = RandomAccessFileMode.READ_ONLY.create(bigFile3)) {
+                assertFalse(RandomAccessFiles.contentEquals(raf1, raf3));
+                assertFalse(RandomAccessFiles.contentEquals(RandomAccessFiles.reset(raf3), RandomAccessFiles.reset(raf1)));
+            }
+        } finally {
+            // Delete ASAP
+            Files.deleteIfExists(bigFile1);
+            Files.deleteIfExists(bigFile2);
+            Files.deleteIfExists(bigFile3);
+        }
+    }
 
     @Test
     public void testRead() throws IOException {
-        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO)) {
+        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
             final byte[] buffer = RandomAccessFiles.read(raf, 0, 0);
             assertArrayEquals(new byte[] {}, buffer);
         }
-        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO)) {
+        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
             final byte[] buffer = RandomAccessFiles.read(raf, 1, 0);
             assertArrayEquals(new byte[] {}, buffer);
         }
-        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO)) {
+        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
             final byte[] buffer = RandomAccessFiles.read(raf, 0, 1);
             assertArrayEquals(new byte[] { '1' }, buffer);
         }
-        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO)) {
+        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
             final byte[] buffer = RandomAccessFiles.read(raf, 1, 1);
             assertArrayEquals(new byte[] { '2' }, buffer);
         }
-        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO)) {
+        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
             final byte[] buffer = RandomAccessFiles.read(raf, 0, 20);
             assertEquals(20, buffer.length);
         }
-        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO)) {
+        try (final RandomAccessFile raf = RandomAccessFileMode.READ_ONLY.create(FILE_NAME_RO_20)) {
             assertThrows(IOException.class, () -> RandomAccessFiles.read(raf, 0, 21));
         }
     }