Ticket #16010: v2-0018-TestUtils-add-assertFileContentsEqual-use-in-Plug.patch

test/unit/org/openstreetmap/josm/TestUtils.java

@@ -2 +2 @@
 package org.openstreetmap.josm;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Graphics2D;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
@@ -45 +48 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 
+import com.google.common.io.ByteStreams;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -428 +433 @@
     public static String getHTTPDate(long time) {
         return getHTTPDate(Instant.ofEpochMilli(time));
     }
+
+    /**
+     * Throws AssertionError if contents of both files are not equal
+     * @param fileA File A
+     * @param fileB File B
+     */
+    public static void assertFileContentsEqual(final File fileA, final File fileB) {
+        assertTrue(fileA.exists());
+        assertTrue(fileA.canRead());
+        assertTrue(fileB.exists());
+        assertTrue(fileB.canRead());
+        try {
+            try (
+                FileInputStream streamA = new FileInputStream(fileA);
+                FileInputStream streamB = new FileInputStream(fileB);
+            ) {
+                assertArrayEquals(
+                    ByteStreams.toByteArray(streamA),
+                    ByteStreams.toByteArray(streamB)
+                );
+            }
+        } catch (IOException e) {
+            fail(e.toString());
+        }
+    }
 }

test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java

@@ -86 +86 @@
 
         // the ".jar.new" file should have been deleted
         assertFalse(pluginFileNew.exists());
-        // the ".jar" file should still exist
-        assertTrue(pluginFile.exists());
-        try (
-            FileInputStream pluginDirPluginStream = new FileInputStream(pluginFile);
-            FileInputStream srcPluginStream = new FileInputStream(srcPluginFile);
-        ) {
-            // and its contents should equal those that were served to the task
-            assertArrayEquals(
-                ByteStreams.toByteArray(pluginDirPluginStream),
-                ByteStreams.toByteArray(srcPluginStream)
-            );
-        }
+        // the ".jar" file should still exist and its contents should equal those that were served to the task
+        TestUtils.assertFileContentsEqual(pluginFile, srcPluginFile);
     }
 
     /**
@@ -139 +129 @@
             pluginDownloadTask.run();
         }
 
-        // the ".jar.new" file should exist, even though invalid
-        assertTrue(pluginFileNew.exists());
+        // assert that the "corrupt" jar file made it through in tact
+        TestUtils.assertFileContentsEqual(pluginFileNew, srcPluginFile);
         // the ".jar" file should still exist
         assertTrue(pluginFile.exists());
         try (
-            FileInputStream pluginDirPluginNewStream = new FileInputStream(pluginFileNew);
             FileInputStream pluginDirPluginStream = new FileInputStream(pluginFile);
-            FileInputStream srcPluginStream = new FileInputStream(srcPluginFile);
         ) {
             // the ".jar" file's contents should be as before
             assertArrayEquals(
                 existingPluginContents,
                 ByteStreams.toByteArray(pluginDirPluginStream)
             );
-            // just assert that the "corrupt" jar file made it through in tact
-            assertArrayEquals(
-                ByteStreams.toByteArray(pluginDirPluginNewStream),
-                ByteStreams.toByteArray(srcPluginStream)
-            );
         }
     }
 }