Index: /trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 9224)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 9225)
@@ -11,4 +11,6 @@
 import java.util.Set;
 
+import nl.jqno.equalsverifier.EqualsVerifier;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -16,4 +18,5 @@
 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,3 +58,13 @@
         }
     }
+
+    /**
+     * 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();
+    }
 }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java	(revision 9225)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java	(revision 9225)
@@ -0,0 +1,21 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+import org.junit.Test;
+
+/**
+ * Unit tests for class {@link ExtensionFileFilter}.
+ */
+public class ExtensionFileFilterTest {
+
+    /**
+     * Unit test of methods {@link ExtensionFileFilter#equals} and {@link ExtensionFileFilter#hashCode}.
+     */
+    @Test
+    public void equalsContract() {
+        EqualsVerifier.forClass(ExtensionFileFilter.class).usingGetClass()
+            .verify();
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 9224)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 9225)
@@ -5,4 +5,6 @@
 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,4 +15,5 @@
 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,3 +57,17 @@
         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();
+    }
 }
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java	(revision 9225)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java	(revision 9225)
@@ -0,0 +1,27 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.command.conflict;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
+
+import org.junit.Test;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+
+/**
+ * Unit tests of {@link ConflictResolveCommand} class.
+ */
+public class ConflictResolveCommandTest {
+
+    /**
+     * Unit test of methods {@link ConflictResolveCommand#equals} and {@link ConflictResolveCommand#hashCode}.
+     */
+    @Test
+    public void equalsContract() {
+        EqualsVerifier.forClass(ConflictResolveCommand.class).usingGetClass()
+            .withPrefabValues(OsmDataLayer.class,
+                    new OsmDataLayer(new DataSet(), "1", null), new OsmDataLayer(new DataSet(), "2", null))
+            .suppress(Warning.NONFINAL_FIELDS)
+            .verify();
+    }
+}
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java	(revision 9224)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java	(revision 9225)
@@ -5,4 +5,6 @@
 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,4 +16,5 @@
 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,3 +72,17 @@
         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();
+    }
 }
Index: /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java	(revision 9224)
+++ /trunk/test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java	(revision 9225)
@@ -29,4 +29,6 @@
         Main.logLevel = 5; // enable trace for line coverage
         assertEquals(def, OAuthParameters.createDefault("wrong_url"));
+        OAuthParameters dev2 = new OAuthParameters(dev);
+        assertEquals(dev, dev2);
     }