From cdeb31301b42c7593965a60e3fa5955fb7d73ef8 Mon Sep 17 00:00:00 2001
From: Jan Molak <1089173+jan-molak@users.noreply.github.com>
Date: Thu, 28 Dec 2023 14:43:41 +0100
Subject: [PATCH] Clean up the state of global singletons in
 WhenReadingRequirementsFromThePackageStructure

---
 .../requirements/AggregateRequirementsTest.java   |  1 -
 ...eadingRequirementsFromThePackageStructure.java | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/serenity-model/src/test/java/net/thucydides/model/requirements/AggregateRequirementsTest.java b/serenity-model/src/test/java/net/thucydides/model/requirements/AggregateRequirementsTest.java
index 451272c3b..3e2ff8f1b 100644
--- a/serenity-model/src/test/java/net/thucydides/model/requirements/AggregateRequirementsTest.java
+++ b/serenity-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/serenity-model/src/test/java/net/thucydides/model/requirements/WhenReadingRequirementsFromThePackageStructure.java b/serenity-model/src/test/java/net/thucydides/model/requirements/WhenReadingRequirementsFromThePackageStructure.java
index 3414ce476..a7d75d3b1 100644
--- a/serenity-model/src/test/java/net/thucydides/model/requirements/WhenReadingRequirementsFromThePackageStructure.java
+++ b/serenity-model/src/test/java/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() {