summaryrefslogtreecommitdiffstats
path: root/controlloop/common/feature-controlloop-trans/src/test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-06-28 09:53:35 -0400
committerJim Hahn <jrh3@att.com>2019-06-28 10:02:44 -0400
commite6bf601e69e40768efbc934c88b17fd9d4062e49 (patch)
treeece93685ad2fd579403d9c58c5f766269738bf6b /controlloop/common/feature-controlloop-trans/src/test
parentd0932a1a2339a02dab04eedefa0480535e68d31c (diff)
Remove sleep() from junit tests
Replaced sleep() calls with awaitability.await(). Also shortened the timeout, for the test, from 10s to 2s. Change-Id: I5d9cb84b405782f174b6230294e5d6a47938c4b8 Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/feature-controlloop-trans/src/test')
-rw-r--r--controlloop/common/feature-controlloop-trans/src/test/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeatureTest.java15
-rw-r--r--controlloop/common/feature-controlloop-trans/src/test/resources/feature-controlloop-trans.properties8
2 files changed, 13 insertions, 10 deletions
diff --git a/controlloop/common/feature-controlloop-trans/src/test/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeatureTest.java b/controlloop/common/feature-controlloop-trans/src/test/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeatureTest.java
index 661803315..abc5db8e6 100644
--- a/controlloop/common/feature-controlloop-trans/src/test/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeatureTest.java
+++ b/controlloop/common/feature-controlloop-trans/src/test/java/org/onap/policy/drools/apps/controlloop/feature/trans/ControlLoopMetricsFeatureTest.java
@@ -20,6 +20,7 @@
package org.onap.policy.drools.apps.controlloop.feature.trans;
+import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -28,6 +29,7 @@ import static org.junit.Assert.assertTrue;
import java.nio.file.Path;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -65,7 +67,7 @@ public class ControlLoopMetricsFeatureTest {
@Test
public void cacheDefaults() {
assertEquals(3, ControlLoopMetrics.manager.getCacheSize());
- assertEquals(10, ControlLoopMetrics.manager.getTransactionTimeout());
+ assertEquals(2, ControlLoopMetrics.manager.getTransactionTimeout());
assertEquals(0, ControlLoopMetrics.manager.getCacheOccupancy());
}
@@ -98,10 +100,10 @@ public class ControlLoopMetricsFeatureTest {
assertNotNull(ControlLoopMetrics.manager.getTransaction(requestId).getNotificationTime());
assertTrue(ControlLoopMetrics.manager.getCacheOccupancy() == 1);
- /* let the entries expire */
- Thread.sleep((ControlLoopMetrics.manager.getTransactionTimeout() + 1) * 1000L);
+ /* wait for the entries to expire */
+ await().atMost(ControlLoopMetrics.manager.getTransactionTimeout() + 1, TimeUnit.SECONDS)
+ .until(() -> ControlLoopMetrics.manager.getTransaction(requestId) == null);
- assertNull(ControlLoopMetrics.manager.getTransaction(requestId));
this.cacheDefaults();
}
@@ -151,8 +153,9 @@ public class ControlLoopMetricsFeatureTest {
assertFalse(ControlLoopMetrics.manager.getTransactionIds().isEmpty());
assertFalse(ControlLoopMetrics.manager.getTransactions().isEmpty());
- /* let the entries expire */
- Thread.sleep((ControlLoopMetrics.manager.getTransactionTimeout() + 1) * 1000L);
+ /* wait for the entries to expire */
+ await().atMost(ControlLoopMetrics.manager.getTransactionTimeout() + 1, TimeUnit.SECONDS)
+ .until(() -> ControlLoopMetrics.manager.getTransactions().isEmpty());
ControlLoopMetrics.manager.refresh();
assertTrue(ControlLoopMetrics.manager.getTransactionIds().size() == ControlLoopMetrics.manager
diff --git a/controlloop/common/feature-controlloop-trans/src/test/resources/feature-controlloop-trans.properties b/controlloop/common/feature-controlloop-trans/src/test/resources/feature-controlloop-trans.properties
index cc4c0681d..c921e8c27 100644
--- a/controlloop/common/feature-controlloop-trans/src/test/resources/feature-controlloop-trans.properties
+++ b/controlloop/common/feature-controlloop-trans/src/test/resources/feature-controlloop-trans.properties
@@ -2,14 +2,14 @@
# ============LICENSE_START=======================================================
# ONAP
# ================================================================================
-# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,4 +18,4 @@
# ============LICENSE_END=========================================================
###
controlloop.cache.transactions.size=3
-controllop.cache.transactions.timeout.seconds=10 \ No newline at end of file
+controllop.cache.transactions.timeout.seconds=2