commit 399a97e4807c608a486f3061c327a906ec4deacc
author Alex Heneveld <alex.heneveld@cloudsoftcorp.com> Thu Nov 28 17:11:32 2013 +0000
committer Andrew Phillips <andrewp@apache.org> Mon Dec 09 16:38:54 2013 -0500
tree 9cb106a70866a0d103048f59e974aa87f4629964
parent e0839de2eb072a9c89f0284214df422f202fafd5

backport of live tests fix for oauth problems re JCLOUDS-360 (from jclouds-lab-google cf7adb8835f0aab4a217d0ec53f2b882afd93810)

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.oauth.v2.OAuthApi;
 import org.testng.annotations.Test;
 
-import com.google.common.base.Ticker;
-
 
 /**
  * @author David Alves
@@ -54,7 +52,7 @@
    }
 
    protected long nowInSeconds() {
-      return TimeUnit.SECONDS.convert(Ticker.systemTicker().read(), TimeUnit.NANOSECONDS);
+      return TimeUnit.SECONDS.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
    }
 
 }

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.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 @@
 
       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)