From 16f627d39daeb9bc8f421d068e78fbdacbc679b6 Mon Sep 17 00:00:00 2001 From: Petr Aubrecht Date: Thu, 14 Mar 2024 10:26:09 +0100 Subject: [PATCH] fix tests depending on static counter by resetting before tests --- .../api/ManagedThreadFactory/ManagedThreadFactoryTests.java | 1 + .../inheritedapi/InheritedAPITests.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/api/ManagedThreadFactory/ManagedThreadFactoryTests.java b/tck/src/main/java/ee/jakarta/tck/concurrent/api/ManagedThreadFactory/ManagedThreadFactoryTests.java index b371a447..bfd36540 100644 --- a/tck/src/main/java/ee/jakarta/tck/concurrent/api/ManagedThreadFactory/ManagedThreadFactoryTests.java +++ b/tck/src/main/java/ee/jakarta/tck/concurrent/api/ManagedThreadFactory/ManagedThreadFactoryTests.java @@ -60,6 +60,7 @@ public void isShutdown() { @Assertion(id = "SPEC:83 SPEC:83.1 SPEC:83.2 SPEC:83.3 SPEC:103 SPEC:96.5 SPEC:96.6 SPEC:105 SPEC:96 SPEC:93 SPEC:96.3", strategy = "Interrupt thread and ensure the thread did not run.") public void interruptThreadApiTest() { + StaticCounter.reset(); CounterRunnableTask task = new CounterRunnableTask(TestConstants.pollInterval); Thread thread = threadFactory.newThread(task); thread.start(); diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ManagedExecutorService/inheritedapi/InheritedAPITests.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ManagedExecutorService/inheritedapi/InheritedAPITests.java index ea7fa30b..41e27ab2 100644 --- a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ManagedExecutorService/inheritedapi/InheritedAPITests.java +++ b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ManagedExecutorService/inheritedapi/InheritedAPITests.java @@ -44,6 +44,7 @@ import ee.jakarta.tck.concurrent.framework.junit.extensions.Wait; import jakarta.annotation.Resource; import jakarta.enterprise.concurrent.ManagedExecutorService; +import org.junit.jupiter.api.BeforeEach; @Web @Common({ PACKAGE.TASKS, PACKAGE.FIXED_COUNTER }) @@ -57,6 +58,11 @@ public static WebArchive createDeployment() { @Resource(lookup = TestConstants.defaultManagedExecutorService) private ManagedExecutorService executor; + @BeforeEach + public void reset() { + StaticCounter.reset(); + } + @Assertion(id = "SPEC:10.2; SPEC:13; SPEC:13.1; SPEC:13.2", strategy = "Test basic function for ManagedExecutorService: execute") public void testExecute() {