Changeset 11392 in josm for trunk/test/unit/org

Timestamp:

2016-12-14T00:52:36+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1206 - "equals(Object obj)" and "hashCode()" should be overridden in pairs (required equalsverifier 2.1.8)

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/StorageTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -9 +8 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 /**
@@ -26 +26 @@
      */
     @Test
-    @Ignore("not ready")
     public void testEqualsContract() {
         EqualsVerifier.forClass(Storage.class).usingGetClass()
-            /*.withPrefabValues(Collection.class, new HashSet<>(Arrays.asList(1)), new HashSet<>(Arrays.asList(2)))
-            .withPrefabValues(AbstractCollection.class, new HashSet<>(Arrays.asList(1)), new HashSet<>(Arrays.asList(2)))
-            .withPrefabValues(Set.class, new HashSet<>(Arrays.asList(1)), new HashSet<>(Arrays.asList(2)))
-            .withPrefabValues(AbstractSet.class, new HashSet<>(Arrays.asList(1)), new HashSet<>(Arrays.asList(2)))*/
+            .suppress(Warning.NONFINAL_FIELDS)
+            .withIgnoredFields("arrayCopyNecessary", "hash", "mask", "modCount", "safeIterator", "size")
             .withPrefabValues(Hash.class, Storage.<Integer>defaultHash(), Storage.<Boolean>defaultHash())
             .verify();