Clean up OAuthSignatureCalculator test: override generation methods

Author: slandelle

api/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculator.java

@@ -71,10 +71,6 @@ public class OAuthSignatureCalculator implements SignatureCalculator {
 
  protected final RequestToken userAuth;
 
- protected final Long testTimestamp;
-
- protected final String testNonce;
-
  /**
  * @param consumerAuth Consumer key to use for signature calculation
  * @param userAuth Request/access token to use for signature calculation
@@ -83,26 +79,13 @@ public OAuthSignatureCalculator(ConsumerKey consumerAuth, RequestToken userAuth)
  mac = new ThreadSafeHMAC(consumerAuth, userAuth);
  this.consumerAuth = consumerAuth;
  this.userAuth = userAuth;
- this.testTimestamp = 0L;
- this.testNonce = null;
- random = new Random(System.identityHashCode(this) + System.currentTimeMillis());
- }
-
- OAuthSignatureCalculator(ConsumerKey consumerAuth, RequestToken userAuth, Long testTimestamp, String testNonce) {
- mac = new ThreadSafeHMAC(consumerAuth, userAuth);
- this.consumerAuth = consumerAuth;
- this.userAuth = userAuth;
- this.testTimestamp = testTimestamp;
- this.testNonce = testNonce;
  random = new Random(System.identityHashCode(this) + System.currentTimeMillis());
  }
 
-
- //@Override // silly 1.5; doesn't allow this for interfaces
-
+ @Override
  public void calculateAndAddSignature(Request request, RequestBuilderBase<?> requestBuilder) {
- String nonce = (this.testNonce != null) ? this.testNonce : generateNonce();
- long timestamp = (this.testTimestamp > 0L) ? this.testTimestamp : System.currentTimeMillis() / 1000L;
+ String nonce = generateNonce();
+ long timestamp = generateTimestamp();
  String signature = calculateSignature(request.getMethod(), request.getUri(), timestamp, nonce, request.getFormParams(), request.getQueryParams());
  String headerValue = constructAuthHeader(signature, nonce, timestamp);
  requestBuilder.setHeader(HEADER_AUTHORIZATION, headerValue);
@@ -202,13 +185,17 @@ public String constructAuthHeader(String signature, String nonce, long oauthTime
  return sb.toString();
  }
 
- private synchronized String generateNonce() {
+ protected synchronized String generateNonce() {
  random.nextBytes(nonceBuffer);
  // let's use base64 encoding over hex, slightly more compact than hex or decimals
  return Base64.encode(nonceBuffer);
 // return String.valueOf(Math.abs(random.nextLong()));
  }
 
+ protected long generateTimestamp() {
+ return System.currentTimeMillis() / 1000L;
+ }
+
  /**
  * Container for parameters used for calculating OAuth signature.
  * About the only confusing aspect is that of whether entries are to be sorted
@@ -265,8 +252,7 @@ public String value() {
  return value;
  }
 
- //@Override // silly 1.5; doesn't allow this for interfaces
-
+ @Override
  public int compareTo(Parameter other) {
  int diff = key.compareTo(other.key);
  if (diff == 0) {

api/src/test/java/org/asynchttpclient/oauth/TestSignatureCalculator.java

@@ -16,7 +16,6 @@
 package org.asynchttpclient.oauth;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.fail;
 
 import java.io.UnsupportedEncodingException;
@@ -26,7 +25,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.asynchttpclient.FluentCaseInsensitiveStringsMap;
 import org.asynchttpclient.Param;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.RequestBuilder;
@@ -53,6 +51,28 @@ public class TestSignatureCalculator {
 
  final static long TIMESTAMP = 1191242096;
 
+ private static class StaticOAuthSignatureCalculator extends OAuthSignatureCalculator {
+ 
+ private final long timestamp;
+ private final String nonce;
+ 
+ public StaticOAuthSignatureCalculator(ConsumerKey consumerAuth, RequestToken userAuth, long timestamp, String nonce) {
+ super(consumerAuth, userAuth);
+ this.timestamp = timestamp; 
+ this.nonce = nonce;
+ }
+ 
+ @Override
+ protected long generateTimestamp() {
+ return timestamp;
+ }
+
+ @Override
+ protected String generateNonce() {
+ return nonce;
+ }
+ }
+ 
  // based on the reference test case from
  // http://oauth.pbwiki.com/TestCases
  @Test(groups = "fast")
@@ -73,7 +93,7 @@ public void testGetCalculateSignature() {
  public void testPostCalculateSignature() {
  ConsumerKey consumer = new ConsumerKey(CONSUMER_KEY, CONSUMER_SECRET);
  RequestToken user = new RequestToken(TOKEN_KEY, TOKEN_SECRET);
- OAuthSignatureCalculator calc = new OAuthSignatureCalculator(consumer, user, TIMESTAMP, NONCE);
+ OAuthSignatureCalculator calc = new StaticOAuthSignatureCalculator(consumer, user, TIMESTAMP, NONCE);
 
  List<Param> formParams = new ArrayList<Param>();
  formParams.add(new Param("file", "vacation.jpg"));
@@ -108,7 +128,7 @@ public void testPostCalculateSignature() {
  public void testGetWithRequestBuilder() {
  ConsumerKey consumer = new ConsumerKey(CONSUMER_KEY, CONSUMER_SECRET);
  RequestToken user = new RequestToken(TOKEN_KEY, TOKEN_SECRET);
- OAuthSignatureCalculator calc = new OAuthSignatureCalculator(consumer, user, TIMESTAMP, NONCE);
+ OAuthSignatureCalculator calc = new StaticOAuthSignatureCalculator(consumer, user, TIMESTAMP, NONCE);
 
  List<Param> queryParams = new ArrayList<Param>();
  queryParams.add(new Param("file", "vacation.jpg"));