Changeset 9220 in josm for trunk/test/unit

Timestamp:

2015-12-30T03:21:52+01:00 (8 years ago)

Author:

Don-vip

Message:

update unitils-core to 3.4.2, increase unit test coverage with EqualsVerifier, make OAuthParameters immutable

Location:

trunk/test/unit/org/openstreetmap/josm/data/oauth

Files:

• OAuthParametersTest.java (modified) (2 diffs)
• OAuthTokenTest.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+import nl.jqno.equalsverifier.EqualsVerifier;
 
 import org.junit.Test;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.OsmApi;
 
@@ -25 +27 @@
         assertNotNull(dev);
         assertNotEquals(def, dev);
+        Main.logLevel = 5; // enable trace for line coverage
         assertEquals(def, OAuthParameters.createDefault("wrong_url"));
     }
 
     /**
-     * Unit test of method {@link OAuthParameters#equals}.
+     * Unit test of methods {@link OAuthParameters#equals} and {@link OAuthParameters#hashCode}.
      */
     @Test
-    public void testEquals() {
-        OAuthParameters dev = OAuthParameters.createDefault("http://master.apis.dev.openstreetmap.org/api");
-        OAuthParameters dev2 = new OAuthParameters(dev);
-        assertEquals(dev, dev2);
+    public void equalsContract() {
+        EqualsVerifier.forClass(OAuthParameters.class).usingGetClass().verify();
     }
 }

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import nl.jqno.equalsverifier.EqualsVerifier;
 import oauth.signpost.OAuthConsumer;
 
@@ -27 +28 @@
 
     /**
-     * Unit test of method {@link OAuthToken#equals}.
+     * Unit test of methods {@link OAuthToken#equals} and {@link OAuthToken#hashCode}.
      */
     @Test
-    public void testEquals() {
-        OAuthToken tok = new OAuthToken(
-                OAuthParameters.DEFAULT_JOSM_CONSUMER_KEY,
-                OAuthParameters.DEFAULT_JOSM_CONSUMER_SECRET);
-        OAuthToken tok2 = new OAuthToken(tok);
-        assertEquals(tok, tok2);
+    public void equalsContract() {
+        EqualsVerifier.forClass(OAuthToken.class).usingGetClass().verify();
     }
 }