test: verify custom converters do not leak across ExcelReader instances

Author: YangSiJun528

fesod/src/test/java/org/apache/fesod/sheet/converter/ConverterIsolationTest.java

@@ -21,11 +21,15 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 import java.io.File;
+import java.util.ArrayList;
+
+import org.apache.fesod.sheet.ExcelReader;
 import org.apache.fesod.sheet.ExcelWriter;
 import org.apache.fesod.sheet.FesodSheet;
 import org.apache.fesod.sheet.converters.Converter;
 import org.apache.fesod.sheet.enums.CellDataTypeEnum;
 import org.apache.fesod.sheet.metadata.GlobalConfiguration;
+import org.apache.fesod.sheet.metadata.data.ReadCellData;
 import org.apache.fesod.sheet.metadata.data.WriteCellData;
 import org.apache.fesod.sheet.metadata.property.ExcelContentProperty;
 import org.apache.fesod.sheet.util.TestFileUtil;
@@ -35,7 +39,7 @@ public class ConverterIsolationTest {
 
     public static class TestData {}
 
-    public static class ConverterA implements Converter<String> {
+    public static class WriteConverterA implements Converter<String> {
 
         @Override
         public Class<String> supportJavaTypeKey() {
@@ -53,21 +57,64 @@ public WriteCellData<?> convertToExcelData(String value, ExcelContentProperty p,
         }
     }
 
+    public static class ReadConverterA implements Converter<String> {
+
+        @Override
+        public Class<String> supportJavaTypeKey() {
+            return String.class;
+        }
+
+        @Override
+        public CellDataTypeEnum supportExcelTypeKey() {
+            return CellDataTypeEnum.STRING;
+        }
+
+        @Override
+        public String convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty p, GlobalConfiguration g) {
+            return "A-" + cellData.getStringValue();
+        }
+    }
+
     @Test
-    public void testConverterIsolation() {
+    public void testWriterConverterIsolation() {
         ExcelWriter writer1 = FesodSheet.write(new File(TestFileUtil.getPath() + "writer1.xlsx"), TestData.class)
-                .registerConverter(new ConverterA())
+                .registerConverter(new WriteConverterA())
                 .build();
 
         ExcelWriter writer2 = FesodSheet.write(new File(TestFileUtil.getPath() + "writer2.xlsx"), TestData.class)
                 .build();
 
         boolean writer2HasConverterA = writer2.writeContext().currentWriteHolder().converterMap().values().stream()
-                .anyMatch(c -> c instanceof ConverterA);
+                .anyMatch(c -> c instanceof WriteConverterA);
 
         writer1.finish();
         writer2.finish();
 
         assertFalse(writer2HasConverterA, "Custom converter should not leak between ExcelWriter instances");
     }
+
+    @Test
+    public void testReaderConverterIsolation() {
+        File testFile = TestFileUtil.createNewFile("converter_isolation_test.xlsx");
+
+        FesodSheet.write(testFile, TestData.class)
+                .sheet()
+                .doWrite(new ArrayList<>());
+
+        ExcelReader reader1 = FesodSheet.read(testFile, TestData.class, null)
+                .registerConverter(new ReadConverterA())
+                .build();
+
+        ExcelReader reader2 = FesodSheet.read(testFile, TestData.class, null)
+                .build();
+
+        boolean leaked = reader2.analysisContext().currentReadHolder()
+                .converterMap().values().stream()
+                .anyMatch(c -> c instanceof ReadConverterA);
+
+        reader1.finish();
+        reader2.finish();
+
+        assertFalse(leaked);
+    }
 }