Changeset 18806 in josm for trunk/test/unit

Timestamp:

2023-08-14T17:56:25+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix #23119: NPE in RemoteEntry.getLastModified

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntryTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntryTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.geoimage;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import java.io.File;
 import java.net.URI;
 import java.util.Objects;
@@ -8 +11 @@
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.TestUtils;
 
 /**
@@ -13 +17 @@
  */
 class RemoteEntryTest {
+    private static final Supplier<RemoteEntry> NULL_SUPPLIER = () -> null;
     @Test
     void testHashCodeEquals() {
-        RemoteEntry remoteEntryA = new RemoteEntry(URI.create("https://somewhere.com/image.png?hash=a"),
-                () -> null, () -> null, () -> null, () -> null);
-        RemoteEntry remoteEntryB = new RemoteEntry(URI.create("https://somewhere.com/image.png?hash=b"),
-                () -> null, () -> null, () -> null, () -> null);
+        final RemoteEntry remoteEntryA = new RemoteEntry(URI.create("https://somewhere.com/image.png?hash=a"),
+                NULL_SUPPLIER, NULL_SUPPLIER, NULL_SUPPLIER, NULL_SUPPLIER);
+        final RemoteEntry remoteEntryB = new RemoteEntry(URI.create("https://somewhere.com/image.png?hash=b"),
+                NULL_SUPPLIER, NULL_SUPPLIER, NULL_SUPPLIER, NULL_SUPPLIER);
         EqualsVerifier.simple().forClass(RemoteEntry.class).usingGetClass()
                 .withIgnoredFields("firstImage", "lastImage", "nextImage", "previousImage" /* These suppliers don't have good == semantics */,
@@ -26 +31 @@
                 .withGenericPrefabValues(Supplier.class,
                         a -> () -> new RemoteEntry(URI.create("https://somewhere.com/image.png?hash=" + Objects.hash(a)),
-                                () -> null, () -> null, () -> null, () -> null)).verify();
+                                NULL_SUPPLIER, NULL_SUPPLIER, NULL_SUPPLIER, NULL_SUPPLIER)).verify();
+    }
+
+    @Test
+    void testNonRegression23119() {
+        final String fileLocation = TestUtils.getRegressionDataFile(11685, "2015-11-08_15-33-27-Xiaomi_YI-Y0030832.jpg");
+        final RemoteEntry remoteEntry = new RemoteEntry(new File(fileLocation).toURI(),
+                NULL_SUPPLIER, NULL_SUPPLIER, NULL_SUPPLIER, NULL_SUPPLIER);
+        assertDoesNotThrow(remoteEntry::getLastModified);
     }
 }