You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2013/11/20 21:29:32 UTC
git commit: Fix Live Tests for JCLOUDS-360 which rely on
platform-dependent nanoseconds.
Updated Branches:
refs/heads/master 69756496b -> cf7adb883
Fix Live Tests for JCLOUDS-360 which rely on platform-dependent nanoseconds.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/cf7adb88
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/cf7adb88
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/cf7adb88
Branch: refs/heads/master
Commit: cf7adb8835f0aab4a217d0ec53f2b882afd93810
Parents: 6975649
Author: Rick Wright <ri...@google.com>
Authored: Mon Nov 18 10:39:55 2013 -0800
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Nov 20 15:26:30 2013 -0500
----------------------------------------------------------------------
.../org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java | 4 +---
.../oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf7adb88/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
----------------------------------------------------------------------
diff --git a/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java b/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
index 7fc6dad..e4f483e 100644
--- a/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
+++ b/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
@@ -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);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf7adb88/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
----------------------------------------------------------------------
diff --git a/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java b/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
index 0294ff7..d2fbd91 100644
--- a/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
+++ b/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
@@ -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)