summaryrefslogtreecommitdiffstats
path: root/controlloop/common/controller-tdjam/src/test
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-09-14 09:42:02 -0400
committerJim Hahn <jrh3@att.com>2020-09-14 12:57:15 -0400
commite8e477ab80c6762fb05aebfe9becc630d2d51e39 (patch)
treed7374b73e6807b517ae660531c6f7c3dd0a67ccd /controlloop/common/controller-tdjam/src/test
parent0a8b8fb5291495471c9568d59164188091465f36 (diff)
Release locks between junit tests
Tdjam junits were randomly failing. Traced it down to the fact that the locks were being released asynchronously and thus were not always released when the next test cases requested them. Also simplified logging for tdjam junit tests. Fixed the property file so it isn't overwritten by the junit tests. Changes per review comments: - changed "Pattern" to "pattern" in logback xml Issue-ID: POLICY-2789 Change-Id: I325ec69cf7affa531d3c575e3a34bc0b0e1edac7 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/controller-tdjam/src/test')
-rw-r--r--controlloop/common/controller-tdjam/src/test/java/org/onap/policy/controlloop/TdjamTest.java6
-rw-r--r--controlloop/common/controller-tdjam/src/test/resources/config/tdjam-controller.properties2
-rw-r--r--controlloop/common/controller-tdjam/src/test/resources/logback-test.xml6
3 files changed, 6 insertions, 8 deletions
diff --git a/controlloop/common/controller-tdjam/src/test/java/org/onap/policy/controlloop/TdjamTest.java b/controlloop/common/controller-tdjam/src/test/java/org/onap/policy/controlloop/TdjamTest.java
index 8e286c44e..917e9adbd 100644
--- a/controlloop/common/controller-tdjam/src/test/java/org/onap/policy/controlloop/TdjamTest.java
+++ b/controlloop/common/controller-tdjam/src/test/java/org/onap/policy/controlloop/TdjamTest.java
@@ -26,7 +26,6 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.controlloop.common.rules.test.BaseTest;
@@ -54,7 +53,6 @@ import org.onap.policy.simulators.Util;
@RunWith(NamedRunner.class)
@TestNames(prefixes = {"test"})
-@Ignore
public class TdjamTest extends BaseTest {
protected static final String CONTROLLER_NAME = "tdjam";
protected static PolicyController controller;
@@ -95,7 +93,7 @@ public class TdjamTest extends BaseTest {
*/
@Before
public void setUp() {
- topics = topicMaker.get();
+ init();
}
/**
@@ -103,7 +101,7 @@ public class TdjamTest extends BaseTest {
*/
@After
public void tearDown() {
- topics.destroy();
+ finish();
}
protected static PolicyEngine makeEngine() {
diff --git a/controlloop/common/controller-tdjam/src/test/resources/config/tdjam-controller.properties b/controlloop/common/controller-tdjam/src/test/resources/config/tdjam-controller.properties
index 41db06c51..135fa05cd 100644
--- a/controlloop/common/controller-tdjam/src/test/resources/config/tdjam-controller.properties
+++ b/controlloop/common/controller-tdjam/src/test/resources/config/tdjam-controller.properties
@@ -23,7 +23,7 @@ controller.type=tdjam
rules.groupId=NonDroolsPolicyController
rules.artifactId=tdjam
-rules.version=1.0.0
+rules.version=1.0
noop.source.topics=DCAE_TOPIC,APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP,POLICY-CL-MGT,APPC-LCM-READ
diff --git a/controlloop/common/controller-tdjam/src/test/resources/logback-test.xml b/controlloop/common/controller-tdjam/src/test/resources/logback-test.xml
index 656cb8136..84b02f2e7 100644
--- a/controlloop/common/controller-tdjam/src/test/resources/logback-test.xml
+++ b/controlloop/common/controller-tdjam/src/test/resources/logback-test.xml
@@ -23,16 +23,16 @@
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
- <pattern>%d{dd-MMM-yyyy HH:mm:ss.SSS} %-5level [%thread] %logger{36} - %msg%n</pattern>
+ <pattern>%d %level %msg%n</pattern>
</encoder>
</appender>
<!-- the following line doesn't seem necessary, but it is needed for some reason -->
- <logger name="org.onap.policy.controlloop.tdjam" level="debug" additivity="false">
+ <logger name="org.onap.policy.controlloop.tdjam" level="info" additivity="false">
<appender-ref ref="STDOUT" />
</logger>
- <root level="debug">
+ <root level="info">
<appender-ref ref="STDOUT" />
</root>
</configuration>