Changeset 9225 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2015-12-31T01:38:22+01:00 (9 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/CombineWayActionTest.java (modified) (3 diffs)
• actions/ExtensionFileFilterTest.java (added)
• command/conflict/ConflictAddCommandTest.java (modified) (3 diffs)
• command/conflict/ConflictResolveCommandTest.java (added)
• command/conflict/CoordinateConflictResolveCommandTest.java (modified) (3 diffs)
• data/oauth/OAuthParametersTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java

@@ -11 +11 @@
 import java.util.Set;
 
+import nl.jqno.equalsverifier.EqualsVerifier;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -16 +18 @@
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.CombineWayAction.NodeGraph;
+import org.openstreetmap.josm.actions.CombineWayAction.NodePair;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -55 +58 @@
         }
     }
+
+    /**
+     * Unit test of methods {@link NodePair#equals} and {@link NodePair#hashCode}.
+     */
+    @Test
+    public void equalsContract() {
+        EqualsVerifier.forClass(NodePair.class).usingGetClass()
+            .withPrefabValues(Node.class, new Node(1), new Node(2))
+            .verify();
+    }
 }

trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java

@@ -5 +5 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 import org.junit.BeforeClass;
@@ -13 +15 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -54 +57 @@
         assertNotNull(new ConflictAddCommand(layer, conflict).getDescriptionIcon());
     }
+
+    /**
+     * Unit test of methods {@link ConflictAddCommand#equals} and {@link ConflictAddCommand#hashCode}.
+     */
+    @Test
+    public void equalsContract() {
+        EqualsVerifier.forClass(ConflictAddCommand.class).usingGetClass()
+            .withPrefabValues(Conflict.class,
+                    new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way()))
+            .withPrefabValues(OsmDataLayer.class,
+                    new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null))
+            .suppress(Warning.NONFINAL_FIELDS)
+            .verify();
+    }
 }

trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java

@@ -5 +5 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 import org.junit.BeforeClass;
@@ -14 +16 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -69 +72 @@
         assertNotNull(new CoordinateConflictResolveCommand(conflict, null).getDescriptionIcon());
     }
+
+    /**
+     * Unit test of methods {@link CoordinateConflictResolveCommand#equals} and {@link CoordinateConflictResolveCommand#hashCode}.
+     */
+    @Test
+    public void equalsContract() {
+        EqualsVerifier.forClass(CoordinateConflictResolveCommand.class).usingGetClass()
+            .withPrefabValues(Conflict.class,
+                    new Conflict<>(new Node(), new Node()), new Conflict<>(new Way(), new Way()))
+            .withPrefabValues(OsmDataLayer.class,
+                    new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null))
+            .suppress(Warning.NONFINAL_FIELDS)
+            .verify();
+    }
 }

trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java

@@ -29 +29 @@
         Main.logLevel = 5; // enable trace for line coverage
         assertEquals(def, OAuthParameters.createDefault("wrong_url"));
+        OAuthParameters dev2 = new OAuthParameters(dev);
+        assertEquals(dev, dev2);
     }