From a670176caac46fb68ef0a8ced0160c980f4cce05 Mon Sep 17 00:00:00 2001 From: ToineSiebelink Date: Wed, 7 Feb 2024 17:07:25 +0000 Subject: Correct use of Spock setup and cleanup methods (no need for @Before @After) - unfortunately we copied the bad test code for logging about 4 times alraedy... - simplified setup for WatchdogSchedulingConfigurerSpec Issue-ID:CPS-465 Signed-off-by: ToineSiebelink Change-Id: I8d068541263272fdf99a6e30d365d85e31726432 --- .../org/onap/cps/ncmp/rest/executor/CpsNcmpTaskExecutorSpec.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'cps-ncmp-rest') diff --git a/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/executor/CpsNcmpTaskExecutorSpec.groovy b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/executor/CpsNcmpTaskExecutorSpec.groovy index 5f62aca68..010eda964 100644 --- a/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/executor/CpsNcmpTaskExecutorSpec.groovy +++ b/cps-ncmp-rest/src/test/groovy/org/onap/cps/ncmp/rest/executor/CpsNcmpTaskExecutorSpec.groovy @@ -24,8 +24,6 @@ import ch.qos.logback.classic.Level import ch.qos.logback.classic.Logger import ch.qos.logback.classic.spi.ILoggingEvent import ch.qos.logback.core.read.ListAppender -import org.junit.jupiter.api.AfterEach -import org.junit.jupiter.api.BeforeEach import org.slf4j.LoggerFactory import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -36,14 +34,12 @@ class CpsNcmpTaskExecutorSpec extends Specification { def logger = Spy(ListAppender) def enoughTime = 100 - @BeforeEach void setup() { ((Logger) LoggerFactory.getLogger(CpsNcmpTaskExecutor.class)).addAppender(logger) logger.start() } - @AfterEach - void teardown() { + void cleanup() { ((Logger) LoggerFactory.getLogger(CpsNcmpTaskExecutor.class)).detachAndStopAllAppenders() } -- cgit 1.2.3-korg