ACCUMULO-4440 Fix JUnit 4.12 deprecation warning Use TimeUnit-based constructor instead of implicit millis for Timeout rule.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3bc3c6d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3bc3c6d5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3bc3c6d5 Branch: refs/heads/1.7 Commit: 3bc3c6d5e254b5b70947f051597f2c3b6d784a57 Parents: 775dccd Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Aug 31 19:12:18 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Sep 1 13:13:50 2016 -0400 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/harness/AccumuloIT.java | 3 ++- .../org/apache/accumulo/test/replication/CyclicReplicationIT.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bc3c6d5/test/src/test/java/org/apache/accumulo/harness/AccumuloIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/harness/AccumuloIT.java b/test/src/test/java/org/apache/accumulo/harness/AccumuloIT.java index 03ee44c..46426c3 100644 --- a/test/src/test/java/org/apache/accumulo/harness/AccumuloIT.java +++ b/test/src/test/java/org/apache/accumulo/harness/AccumuloIT.java @@ -19,6 +19,7 @@ package org.apache.accumulo.harness; import static org.junit.Assert.assertTrue; import java.io.File; +import java.util.concurrent.TimeUnit; import org.apache.commons.io.FileUtils; import org.junit.Rule; @@ -92,7 +93,7 @@ public class AccumuloIT { } catch (NumberFormatException exception) { log.warn("Could not parse timeout.factor, defaulting to no timeout."); } - return new Timeout(waitLonger * defaultTimeoutSeconds() * 1000); + return new Timeout(waitLonger * defaultTimeoutSeconds(), TimeUnit.SECONDS); } /** http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bc3c6d5/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java index 25061c9..f6aa89b 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.concurrent.TimeUnit; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; @@ -79,7 +80,7 @@ public class CyclicReplicationIT { log.warn("Could not parse timeout.factor, not scaling timeout"); } - return new Timeout(scalingFactor * 5 * 60 * 1000); + return new Timeout(scalingFactor * 5, TimeUnit.MINUTES); } @Rule
