Changeset 10201 in josm

Timestamp:

2016-05-13T04:02:38+02:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/data/oauth/OAuthParametersTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/oauth/OAuthTokenTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java (added)

trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java

@@ -20 +20 @@
     }
 
+    /**
+     * OAuth provider.
+     */
     public static class OAuthProvider extends AbstractOAuthProvider {
 
+        /**
+         * Constructs a new {@code OAuthProvider}.
+         * @param requestTokenEndpointUrl request token endpoint URL
+         * @param accessTokenEndpointUrl access token endpoint URL
+         * @param authorizationWebsiteUrl authorization website URL
+         */
         public OAuthProvider(String requestTokenEndpointUrl, String accessTokenEndpointUrl, String authorizationWebsiteUrl) {
             super(requestTokenEndpointUrl, accessTokenEndpointUrl, authorizationWebsiteUrl);
@@ -46 +55 @@
     }
 
+    /**
+     * OAuth consumer.
+     */
     public static class OAuthConsumer extends AbstractOAuthConsumer {
 
+        /**
+         * Constructs a new {@code OAuthConsumer}.
+         * @param consumerKey consumer key
+         * @param consumerSecret consumer secret
+         */
         public OAuthConsumer(String consumerKey, String consumerSecret) {
             super(consumerKey, consumerSecret);
@@ -58 +75 @@
     }
 
-    private static class HttpRequest implements oauth.signpost.http.HttpRequest {
-        private final HttpClient request;
+    static final class HttpRequest implements oauth.signpost.http.HttpRequest {
+        final HttpClient request;
 
         HttpRequest(HttpClient request) {
@@ -111 +128 @@
     }
 
-    private static class HttpResponse implements oauth.signpost.http.HttpResponse {
-        private final HttpClient.Response response;
+    static final class HttpResponse implements oauth.signpost.http.HttpResponse {
+        final HttpClient.Response response;
 
         HttpResponse(HttpClient.Response response) {
@@ -138 +155 @@
         }
     }
-
 }

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.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.io.OsmApi;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
 
 /**
@@ -15 +18 @@
  */
 public class OAuthParametersTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
 
     /**
@@ -34 +45 @@
 
     /**
+     * Unit test of method {@link OAuthParameters#createFromPreferences}.
+     */
+    @Test
+    public void testCreateFromPreferences() {
+        assertNotNull(OAuthParameters.createFromPreferences(Main.pref));
+    }
+
+    /**
      * Unit test of methods {@link OAuthParameters#equals} and {@link OAuthParameters#hashCode}.
      */

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 org.junit.Test;
+
 import nl.jqno.equalsverifier.EqualsVerifier;
 import oauth.signpost.OAuthConsumer;
-
-import org.junit.Test;
 
 /**
@@ -25 +26 @@
         assertEquals(defCon.getToken(), defTok.getKey());
         assertEquals(defCon.getTokenSecret(), defTok.getSecret());
+        assertEquals(defTok, new OAuthToken(defTok));
     }