From 18a74af007fd9b6cb124a4fa7de87cccdbdd3f61 Mon Sep 17 00:00:00 2001 From: Nikollai Date: Mon, 25 May 2026 13:14:17 +0200 Subject: [PATCH] Fixed CSVStockFileParserTest, moved calculatortests to model to match project structure --- .../controller/fileIO/CSV/CSVStockFileParserTest.java | 5 +++-- .../{ => model}/calculators/PurchaseCalculatorTest.java | 2 +- .../millions/{ => model}/calculators/SaleCalculatorTest.java | 2 +- .../{ => model}/calculators/TransactionCalculatorTest.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) rename src/test/java/millions/{ => model}/calculators/PurchaseCalculatorTest.java (70%) rename src/test/java/millions/{ => model}/calculators/SaleCalculatorTest.java (68%) rename src/test/java/millions/{ => model}/calculators/TransactionCalculatorTest.java (70%) diff --git a/src/test/java/millions/controller/fileIO/CSV/CSVStockFileParserTest.java b/src/test/java/millions/controller/fileIO/CSV/CSVStockFileParserTest.java index 512cfc9..efefb7d 100644 --- a/src/test/java/millions/controller/fileIO/CSV/CSVStockFileParserTest.java +++ b/src/test/java/millions/controller/fileIO/CSV/CSVStockFileParserTest.java @@ -2,6 +2,7 @@ import millions.controller.fileIO.InvalidFormatException; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,8 +17,8 @@ public class CSVStockFileParserTest { static String exampleString; final CSVStockFileParser parser = new CSVStockFileParser(); - @BeforeAll - public static void setUpTestString() { + @BeforeEach + public void setUpTestString() { exampleString = "# Top 500 US Stocks by Market Cap\n"; exampleString += "# Ticker,Name,Price\n"; exampleString += "\n"; diff --git a/src/test/java/millions/calculators/PurchaseCalculatorTest.java b/src/test/java/millions/model/calculators/PurchaseCalculatorTest.java similarity index 70% rename from src/test/java/millions/calculators/PurchaseCalculatorTest.java rename to src/test/java/millions/model/calculators/PurchaseCalculatorTest.java index 2915b5e..37d8cca 100644 --- a/src/test/java/millions/calculators/PurchaseCalculatorTest.java +++ b/src/test/java/millions/model/calculators/PurchaseCalculatorTest.java @@ -1,4 +1,4 @@ -package millions.calculators; +package millions.model.calculators; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/millions/calculators/SaleCalculatorTest.java b/src/test/java/millions/model/calculators/SaleCalculatorTest.java similarity index 68% rename from src/test/java/millions/calculators/SaleCalculatorTest.java rename to src/test/java/millions/model/calculators/SaleCalculatorTest.java index 3d7cebb..ea19922 100644 --- a/src/test/java/millions/calculators/SaleCalculatorTest.java +++ b/src/test/java/millions/model/calculators/SaleCalculatorTest.java @@ -1,4 +1,4 @@ -package millions.calculators; +package millions.model.calculators; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/millions/calculators/TransactionCalculatorTest.java b/src/test/java/millions/model/calculators/TransactionCalculatorTest.java similarity index 70% rename from src/test/java/millions/calculators/TransactionCalculatorTest.java rename to src/test/java/millions/model/calculators/TransactionCalculatorTest.java index ad398f8..b65dc0e 100644 --- a/src/test/java/millions/calculators/TransactionCalculatorTest.java +++ b/src/test/java/millions/model/calculators/TransactionCalculatorTest.java @@ -1,4 +1,4 @@ -package millions.calculators; +package millions.model.calculators; import static org.junit.jupiter.api.Assertions.*;