Added storage.clear

report.csv

@@ -1,6 +1,5 @@
 fruit,quantity
 banana,10
 apple,100
-pineapple,111
 grape,150
 melon,10

src/test/java/core/basesyntax/db/dao/StorageDaoImplTest.java

@@ -4,6 +4,7 @@
 
 import core.basesyntax.db.Storage;
 import java.util.Map;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -44,4 +45,9 @@ void storageDaoGet_twoFruits_Ok() {
 
         assertEquals(expected, actual);
     }
+
+    @AfterEach
+    void tearDown() {
+        Storage.fruitsCount.clear();
+    }
 }

src/test/java/core/basesyntax/service/impl/CreateReportServiceImplTest.java

@@ -2,13 +2,15 @@
 
 import static org.junit.Assert.assertEquals;
 
+import core.basesyntax.db.Storage;
 import core.basesyntax.db.dao.StorageDao;
 import core.basesyntax.db.dao.StorageDaoImpl;
 import core.basesyntax.service.CreateReportService;
 import core.basesyntax.service.DataConvertService;
 import core.basesyntax.service.DataProcessService;
 import core.basesyntax.service.ReadFromCsvFileService;
 import java.util.Map;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -94,4 +96,9 @@ void createReport_fourFruits_Ok() {
 
         assertEquals(expected, actual);
     }
+
+    @AfterEach
+    void tearDown() {
+        Storage.fruitsCount.clear();
+    }
 }

src/test/java/core/basesyntax/service/impl/DataConvertServiceImplTest.java

@@ -3,12 +3,14 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
 
+import core.basesyntax.db.Storage;
 import core.basesyntax.model.FruitTransaction;
 import core.basesyntax.model.Operation;
 import core.basesyntax.service.DataConvertService;
 import core.basesyntax.service.DataProcessService;
 import core.basesyntax.service.ReadFromCsvFileService;
 import java.util.List;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -70,4 +72,9 @@ void dataProcessor_lessThenZero_NotOk() {
         assertThrows(RuntimeException.class, () -> dataProcessor.processFruits(
                 dataConverter.convert(csvReader.readFile(FOURTH_FILENAME))));
     }
+
+    @AfterEach
+    void tearDown() {
+        Storage.fruitsCount.clear();
+    }
 }

src/test/java/core/basesyntax/service/impl/ReadFromCsvFileServiceImplTest.java

@@ -2,8 +2,10 @@
 
 import static org.junit.Assert.assertEquals;
 
+import core.basesyntax.db.Storage;
 import core.basesyntax.service.ReadFromCsvFileService;
 import java.util.List;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -53,4 +55,9 @@ void csvReader_fourFruits_Ok() {
 
         assertEquals(expected, actual);
     }
+
+    @AfterEach
+    void tearDown() {
+        Storage.fruitsCount.clear();
+    }
 }

src/test/java/core/basesyntax/service/impl/WriteToCsvFileServiceImplTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import core.basesyntax.db.Storage;
 import core.basesyntax.service.CreateReportService;
 import core.basesyntax.service.DataConvertService;
 import core.basesyntax.service.DataProcessService;
@@ -10,6 +11,7 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -111,4 +113,9 @@ void csvWriter_fourFruits_Ok() {
 
         assertEquals(expected, actual);
     }
+
+    @AfterEach
+    void tearDown() {
+        Storage.fruitsCount.clear();
+    }
 }