Clean up the state of global singletons in WhenReadingRequirementsFro…

…mThePackageStructure
serenity-bdd · Dec 28, 2023 · cdeb313 · cdeb313
1 parent d8f707e
commit cdeb313
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...nity-model/src/test/java/net/thucydides/model/requirements/AggregateRequirementsTest.java b/...nity-model/src/test/java/net/thucydides/model/requirements/AggregateRequirementsTest.java
@@ -10,7 +10,6 @@
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
-@Disabled("Disabled to debug issues with singletons leaking state between tests")
 class AggregateRequirementsTest {
 
     @BeforeEach

diff --git a/...ava/net/thucydides/model/requirements/WhenReadingRequirementsFromThePackageStructure.java b/...ava/net/thucydides/model/requirements/WhenReadingRequirementsFromThePackageStructure.java
@@ -1,10 +1,13 @@
 package net.thucydides.model.requirements;
 
 import net.serenitybdd.model.environment.ConfiguredEnvironment;
+import net.thucydides.model.domain.RequirementCache;
 import net.thucydides.model.requirements.model.Requirement;
 import net.thucydides.model.util.EnvironmentVariables;
 import net.thucydides.model.environment.MockEnvironmentVariables;
 import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.util.List;
 
@@ -13,6 +16,18 @@
 
 public class WhenReadingRequirementsFromThePackageStructure {
 
+    @BeforeEach
+    void clearCaches() {
+        ConfiguredEnvironment.reset();
+        RequirementCache.getInstance().clear();
+    }
+
+    @AfterAll
+    static void afterAll() {
+        ConfiguredEnvironment.reset();
+        RequirementCache.getInstance().clear();
+    }
+
     @Test
     public void should_read_requirements_from_a_one_level_package_hierarchy() {