[commons-net] 02/02: Reuse FileUtils#contentEquals(File,File) in tests

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-net.git

commit cd0aa01783cc7c0459f24ac9139b952f144c110b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Sep 16 11:29:20 2023 -0400

    Reuse FileUtils#contentEquals(File,File) in tests
---
 .../java/org/apache/commons/net/tftp/TFTPTest.java | 33 +++-------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java 
b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
index 36c17f80..63f8f0a1 100644
--- a/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
+++ b/src/test/java/org/apache/commons/net/tftp/TFTPTest.java
@@ -76,33 +76,8 @@ public class TFTPTest extends TestCase {
         return file;
     }
 
-    private boolean filesIdentical(final File a, final File b) throws 
IOException {
-        if (!a.exists() || !b.exists()) {
-            return false;
-        }
-
-        if (a.length() != b.length()) {
-            return false;
-        }
-
-        try (final InputStream fisA = new BufferedInputStream(new 
FileInputStream(a));
-                final InputStream fisB = new BufferedInputStream(new 
FileInputStream(b))) {
-
-            int aBit = fisA.read();
-            int bBit = fisB.read();
-
-            while (aBit != -1) {
-                if (aBit != bBit) {
-                    fisA.close();
-                    fisB.close();
-                    return false;
-                }
-                aBit = fisA.read();
-                bBit = fisB.read();
-            }
-
-        }
-        return true;
+    private boolean contentEquals(final File a, final File b) throws 
IOException {
+        return FileUtils.contentEquals(a, b);
     }
 
     @Override
@@ -155,7 +130,7 @@ public class TFTPTest extends TestCase {
             }
 
             assertTrue("file not created", out.exists());
-            assertTrue("FILES not identical on file " + file, 
filesIdentical(out, file));
+            assertTrue("FILES not identical on file " + file, 
contentEquals(out, file));
 
             // delete the downloaded file
             out.delete();
@@ -208,7 +183,7 @@ public class TFTPTest extends TestCase {
             // close out its file buffers, etc.
             Thread.sleep(100);
             assertTrue("file not created", in.exists());
-            assertTrue("FILES not identical on file " + file, 
filesIdentical(file, in));
+            assertTrue("FILES not identical on file " + file, 
contentEquals(file, in));
 
             in.delete();
         }