Fixed CSVStockFileParserTest, moved calculatortests to model to match…

… project structure

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";

src/test/java/millions/calculators/PurchaseCalculatorTest.java → 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.*;
 

src/test/java/millions/calculators/SaleCalculatorTest.java → 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.*;
 

src/test/java/millions/calculators/TransactionCalculatorTest.java → 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.*;