refactor: revert setting metadataManager as field in extentReporter

giulong · Aug 17, 2024 · a3f4405 · a3f4405
1 parent 42010d8
commit a3f4405
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/spectrum/src/main/java/io/github/giulong/spectrum/utils/ExtentReporter.java b/spectrum/src/main/java/io/github/giulong/spectrum/utils/ExtentReporter.java
@@ -46,8 +46,6 @@ public class ExtentReporter implements SessionHook, CanProduceMetadata {
     protected final FileUtils fileUtils = FileUtils.getInstance();
     protected final Configuration configuration = Configuration.getInstance();
 
-    private final MetadataManager metadataManager = MetadataManager.getInstance();
-
     private ExtentReports extentReports;
 
     public static ExtentReporter getInstance() {
@@ -101,6 +99,7 @@ public Retention getRetention() {
 
     @Override
     public void produceMetadata() {
+        final MetadataManager metadataManager = MetadataManager.getInstance();
         final File file = getReportPathFrom(configuration.getExtent()).toFile();
         final int maxSize = getRetention().getSuccessful();
         final FixedSizeQueue<File> queue = metadataManager.getSuccessfulQueueOf(this);

diff --git a/spectrum/src/test/java/io/github/giulong/spectrum/utils/ExtentReporterTest.java b/spectrum/src/test/java/io/github/giulong/spectrum/utils/ExtentReporterTest.java
@@ -156,7 +156,6 @@ class ExtentReporterTest {
     public void beforeEach() {
         Reflections.setField("fileUtils", extentReporter, fileUtils);
         Reflections.setField("configuration", extentReporter, configuration);
-        Reflections.setField("metadataManager", extentReporter, metadataManager);
         testDataMockedStatic = mockStatic(TestData.class);
         freeMarkerWrapperMockedStatic = mockStatic(FreeMarkerWrapper.class);
         pathMockedStatic = mockStatic(Path.class);
@@ -383,6 +382,7 @@ public void produceMetadata() {
         when(absolutePath.toFile()).thenReturn(file1);
         when(retention.getSuccessful()).thenReturn(retentionSuccessful);
 
+        when(MetadataManager.getInstance()).thenReturn(metadataManager);
         when(metadataManager.getSuccessfulQueueOf(extentReporter)).thenReturn(fileFixedSizeQueue);
         when(fileFixedSizeQueue.shrinkTo(retentionSuccessful - 1)).thenReturn(fileFixedSizeQueue);