Changeset 17580 in josm for trunk

Timestamp:

2021-03-17T18:58:40+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20598 - fix ImageEntryTest.testEqualsContract (patch by taylor.smock)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

@@ -106 +106 @@
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), thumbnail);
+        return Objects.hash(super.hashCode(), thumbnail, dataSet);
     }
 

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

@@ -5 +5 @@
 
 import java.io.File;
+import java.util.ArrayList;
 
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.ImageData;
 import org.openstreetmap.josm.data.gpx.GpxImageEntry;
 
@@ -37 +39 @@
             .suppress(Warning.NONFINAL_FIELDS)
             .withPrefabValues(GpxImageEntry.class, new GpxImageEntry(new File("foo")), new GpxImageEntry(new File("bar")))
+            .withPrefabValues(ImageData.class, new ImageData(), new ImageData(new ArrayList<>()))
             .verify();
     }