RATIS-2078. Correct timeout unit for tests (#1083)
diff --git a/ratis-test/src/test/java/org/apache/ratis/conf/TestRaftProperties.java b/ratis-test/src/test/java/org/apache/ratis/conf/TestRaftProperties.java
index 29bfc32..d17d6fb 100644
--- a/ratis-test/src/test/java/org/apache/ratis/conf/TestRaftProperties.java
+++ b/ratis-test/src/test/java/org/apache/ratis/conf/TestRaftProperties.java
@@ -41,7 +41,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testUnderscore() {
final RaftProperties p = new RaftProperties();
diff --git a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
index 879b9ea..b244691 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
@@ -172,7 +172,7 @@
}
@Test
- @Timeout(value = 10000)
+ @Timeout(value = 10)
public void testRetryOnResourceUnavailableException()
throws InterruptedException, IOException {
RaftProperties properties = new RaftProperties();
diff --git a/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftServerJmx.java b/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftServerJmx.java
index 39a1f88..6302c7e 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftServerJmx.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/impl/TestRaftServerJmx.java
@@ -40,7 +40,7 @@
public class TestRaftServerJmx extends BaseTest {
@Test
- @Timeout(value = 30000)
+ @Timeout(value = 30)
public void testJmxBeans() throws Exception {
final int NUM_SERVERS = 3;
final MiniRaftClusterWithSimulatedRpc cluster
@@ -60,7 +60,7 @@
}
@Test
- @Timeout(value = 30000)
+ @Timeout(value = 30)
public void testRegister() throws JMException {
{
final JmxRegister jmx = new JmxRegister();
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestDataBlockingQueue.java b/ratis-test/src/test/java/org/apache/ratis/util/TestDataBlockingQueue.java
index e9dcf61..3ad40d4 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestDataBlockingQueue.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestDataBlockingQueue.java
@@ -38,25 +38,25 @@
final TimeDuration fast = TimeDuration.valueOf(10, TimeUnit.MILLISECONDS);
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testElementLimit() {
TestDataQueue.runTestElementLimit(q);
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testByteLimit() {
TestDataQueue.runTestByteLimit(q);
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 10)
public void testSlowOfferFastPoll() throws Exception {
runTestBlockingCalls(slow, fast, q);
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 10)
public void testFastOfferSlowPoll() throws Exception {
runTestBlockingCalls(fast, slow, q);
}
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestDataQueue.java b/ratis-test/src/test/java/org/apache/ratis/util/TestDataQueue.java
index 2dafa7e..42a55d9 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestDataQueue.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestDataQueue.java
@@ -47,7 +47,7 @@
final DataQueue<Long> q = new DataQueue<>(null, byteLimit, elementLimit, Long::longValue);
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testElementLimit() {
runTestElementLimit(q);
}
@@ -82,7 +82,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testByteLimit() {
runTestByteLimit(q);
}
@@ -140,7 +140,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testIteratorAndRemove() {
runTestIteratorAndRemove(q);
}
@@ -185,7 +185,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testTimeout() {
assertSizes(0, 0, q);
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestExitUtils.java b/ratis-test/src/test/java/org/apache/ratis/util/TestExitUtils.java
index 1dd5b27..3c7cc02 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestExitUtils.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestExitUtils.java
@@ -26,7 +26,7 @@
public class TestExitUtils extends BaseTest {
/** Test if {@link BaseTest} can handle uncaught exception. */
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testUncaughtException() throws Exception {
Assertions.assertFalse(ExitUtils.isTerminated());
Assertions.assertFalse(ExitUtils.clear());
@@ -43,7 +43,7 @@
/** Test if {@link BaseTest} can handle ExitUtils.terminate(..). */
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testExitStatus() {
Assertions.assertFalse(ExitUtils.isTerminated());
Assertions.assertFalse(ExitUtils.clear());
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestLifeCycle.java b/ratis-test/src/test/java/org/apache/ratis/util/TestLifeCycle.java
index f817449..f08ceb3 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestLifeCycle.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestLifeCycle.java
@@ -35,7 +35,7 @@
* while this test uses successors.
*/
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testIsValid() {
final Map<LifeCycle.State, List<LifeCycle.State>> successors
= new EnumMap<>(LifeCycle.State.class);
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestMinMax.java b/ratis-test/src/test/java/org/apache/ratis/util/TestMinMax.java
index 050d997..07a9882 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestMinMax.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestMinMax.java
@@ -29,7 +29,7 @@
public class TestMinMax {
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testMinMax() {
runTestMinMax(LongStream.empty());
runTestMinMax(LongStream.iterate(0, n -> n).limit(10));
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestPeerProxyMap.java b/ratis-test/src/test/java/org/apache/ratis/util/TestPeerProxyMap.java
index 118830b..a225504 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestPeerProxyMap.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestPeerProxyMap.java
@@ -53,7 +53,7 @@
}
@Test
- @Timeout(value = 10_000)
+ @Timeout(value = 10)
public void testCloseDeadLock() throws Exception {
final PeerProxyMap<DummyProxy> map = new PeerProxyMap<>("test", DummyProxy::new);
final RaftPeerId id = RaftPeerId.valueOf("s0");
@@ -118,7 +118,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testStackTrace() {
final RaftPeerId id = RaftPeerId.valueOf("s0");
final RaftPeer peer = RaftPeer.newBuilder().setId(id).build();
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestPreconditions.java b/ratis-test/src/test/java/org/apache/ratis/util/TestPreconditions.java
index e99c11f..73cf4c1 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestPreconditions.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestPreconditions.java
@@ -30,7 +30,7 @@
public class TestPreconditions extends BaseTest {
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testAssertUnique() {
final Set<Integer> empty = Collections.emptySet();
Preconditions.assertUnique(empty);
@@ -56,7 +56,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testAssertNull() {
final Map<String, String> map = new HashMap<>();
final String key = "abc1234";
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestReferenceCountedObject.java b/ratis-test/src/test/java/org/apache/ratis/util/TestReferenceCountedObject.java
index 502261e..2436310 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestReferenceCountedObject.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestReferenceCountedObject.java
@@ -41,7 +41,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testWrap() {
final String value = "testWrap";
final AtomicInteger retained = new AtomicInteger();
@@ -116,7 +116,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testReleaseWithoutRetaining() {
final ReferenceCountedObject<String> ref = ReferenceCountedObject.wrap("");
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestResourceSemaphore.java b/ratis-test/src/test/java/org/apache/ratis/util/TestResourceSemaphore.java
index 0f3612d..72c811d 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestResourceSemaphore.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestResourceSemaphore.java
@@ -29,7 +29,7 @@
public class TestResourceSemaphore extends BaseTest {
@Test
- @Timeout(value = 5000)
+ @Timeout(value = 5)
public void testGroup() throws InterruptedException, TimeoutException {
final int FAILED_IN_ELEMENT_LIMIT = 0;
final int FAILED_IN_BYTE_SIZE_LIMIT = 1;
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestTimeDuration.java b/ratis-test/src/test/java/org/apache/ratis/util/TestTimeDuration.java
index f2d58f4..9ba5e57 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestTimeDuration.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestTimeDuration.java
@@ -40,7 +40,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testAbbreviation() {
Arrays.asList(TimeUnit.values())
.forEach(a -> assertNotNull(Abbreviation.valueOf(a.name())));
@@ -57,7 +57,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testParse() {
assertEquals(1L, parse("1_000_000 ns", TimeUnit.MILLISECONDS));
assertEquals(10L, parse("10_000_000 nanos", TimeUnit.MILLISECONDS));
@@ -97,7 +97,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testRoundUp() {
final long nanosPerSecond = 1_000_000_000L;
final TimeDuration oneSecond = TimeDuration.valueOf(1, TimeUnit.SECONDS);
@@ -113,7 +113,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testTo() {
final TimeDuration oneSecond = TimeDuration.valueOf(1, TimeUnit.SECONDS);
assertTo(1000, "1000ms", oneSecond, TimeUnit.MILLISECONDS);
@@ -137,7 +137,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testAddAndSubtract() {
final TimeDuration oneSecond = TimeDuration.valueOf(1, TimeUnit.SECONDS);
final TimeDuration tenSecond = TimeDuration.valueOf(10, TimeUnit.SECONDS);
@@ -191,7 +191,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testNegate() {
assertNegate(0);
assertNegate(1);
@@ -213,7 +213,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testMultiply() {
assertMultiply(0, TimeDuration.ONE_SECOND, TimeDuration.valueOf(0, TimeUnit.SECONDS));
assertMultiply(0.001, TimeDuration.ONE_SECOND, TimeDuration.ONE_MILLISECOND);
@@ -244,7 +244,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testHigherLower() {
final TimeUnit[] units = {TimeUnit.NANOSECONDS, TimeUnit.MICROSECONDS, TimeUnit.MILLISECONDS,
TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS, TimeUnit.DAYS};
@@ -257,7 +257,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testCompareTo() {
assertTimeDurationCompareTo(TimeDuration.ONE_MINUTE, TimeDuration.ONE_SECOND);
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestTimeoutScheduler.java b/ratis-test/src/test/java/org/apache/ratis/util/TestTimeoutScheduler.java
index 79c97a6..e8e9d6e 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestTimeoutScheduler.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestTimeoutScheduler.java
@@ -47,7 +47,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testSingleTask() throws Exception {
final TimeoutScheduler scheduler = TimeoutScheduler.newInstance();
final TimeDuration grace = TimeDuration.valueOf(100, TimeUnit.MILLISECONDS);
@@ -84,7 +84,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testMultipleTasks() throws Exception {
final TimeoutScheduler scheduler = TimeoutScheduler.newInstance();
final TimeDuration grace = TimeDuration.valueOf(100, TimeUnit.MILLISECONDS);
@@ -131,7 +131,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testExtendingGracePeriod() throws Exception {
final TimeoutScheduler scheduler = TimeoutScheduler.newInstance();
final TimeDuration grace = TimeDuration.valueOf(100, TimeUnit.MILLISECONDS);
@@ -182,7 +182,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testRestartingScheduler() throws Exception {
final TimeoutScheduler scheduler = TimeoutScheduler.newInstance();
final TimeDuration grace = TimeDuration.valueOf(100, TimeUnit.MILLISECONDS);
@@ -216,7 +216,7 @@
}
@Test
- @Timeout(value = 10_000)
+ @Timeout(value = 10)
public void testShutdown() throws Exception {
final TimeoutScheduler scheduler = TimeoutScheduler.newInstance();
Assertions.assertEquals(TimeoutScheduler.DEFAULT_GRACE_PERIOD, scheduler.getGracePeriod());
diff --git a/ratis-test/src/test/java/org/apache/ratis/util/TestTraditionalBinaryPrefix.java b/ratis-test/src/test/java/org/apache/ratis/util/TestTraditionalBinaryPrefix.java
index 988cc5c..a699b91 100644
--- a/ratis-test/src/test/java/org/apache/ratis/util/TestTraditionalBinaryPrefix.java
+++ b/ratis-test/src/test/java/org/apache/ratis/util/TestTraditionalBinaryPrefix.java
@@ -28,7 +28,7 @@
public class TestTraditionalBinaryPrefix {
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testTraditionalBinaryPrefix() {
//test string2long(..)
String[] symbol = {"k", "m", "g", "t", "p", "e"};
@@ -147,7 +147,7 @@
}
@Test
- @Timeout(value = 1000)
+ @Timeout(value = 1)
public void testUnderscore() {
final SizeInBytes value = SizeInBytes.valueOf("1_000_000_000_000_000");
assertEquals(1_000_000_000_000_000L, value.getSize());
