Fix Live Tests for JCLOUDS-360 which rely on platform-dependent nanoseconds.

This commit is contained in:
Rick Wright 2013-11-18 10:39:55 -08:00 committed by Andrew Phillips
parent f6f901065e
commit 61b99641ac
2 changed files with 3 additions and 6 deletions

View File

@ -29,8 +29,6 @@ import org.jclouds.apis.BaseApiLiveTest;
import org.jclouds.oauth.v2.OAuthApi;
import org.testng.annotations.Test;
import com.google.common.base.Ticker;
/**
* @author David Alves
@ -54,7 +52,7 @@ public class BaseOAuthApiLiveTest extends BaseApiLiveTest<OAuthApi> {
}
protected long nowInSeconds() {
return TimeUnit.SECONDS.convert(Ticker.systemTicker().read(), TimeUnit.NANOSECONDS);
return TimeUnit.SECONDS.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
}
}

View File

@ -17,7 +17,7 @@
package org.jclouds.oauth.v2.internal;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
import static org.jclouds.oauth.v2.config.OAuthProperties.SIGNATURE_OR_MAC_ALGORITHM;
@ -37,7 +37,6 @@ import org.jclouds.oauth.v2.domain.TokenRequest;
import org.testng.annotations.Test;
import com.google.common.base.Function;
import com.google.common.base.Ticker;
import com.google.common.reflect.TypeToken;
import com.google.inject.Injector;
import com.google.inject.Key;
@ -80,7 +79,7 @@ public abstract class BaseOAuthAuthenticatedApiLiveTest<A extends Closeable> ext
Header header = Header.builder().signerAlgorithm(signatureAlgorithm).type("JWT").build();
long now = SECONDS.convert(Ticker.systemTicker().read(), NANOSECONDS);
long now = SECONDS.convert(System.currentTimeMillis(), MILLISECONDS);
ClaimSet claimSet = ClaimSet.builder()
.addClaim("aud", audience)