diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-09-14 09:42:02 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-09-14 12:57:15 -0400 |
| commit | e8e477ab80c6762fb05aebfe9becc630d2d51e39 (patch) | |
| tree | d7374b73e6807b517ae660531c6f7c3dd0a67ccd /controlloop/common/controller-tdjam/src/test/resources | |
| parent | 0a8b8fb5291495471c9568d59164188091465f36 (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/resources')
| -rw-r--r-- | controlloop/common/controller-tdjam/src/test/resources/config/tdjam-controller.properties | 2 | ||||
| -rw-r--r-- | controlloop/common/controller-tdjam/src/test/resources/logback-test.xml | 6 |
2 files changed, 4 insertions, 4 deletions
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> |