Merge pull request #15 from cs0320-2021/profit-optimization

Profit optimization

1 files changed, 10 insertions, 10 deletions

diff --git a/src/test/java/edu/brown/cs/student/ProfitCalculationTest.java b/src/test/java/edu/brown/cs/student/ProfitCalculationTest.java
index 0721052..0d22109 100644
--- a/src/test/java/edu/brown/cs/student/ProfitCalculationTest.java
+++ b/src/test/java/edu/brown/cs/student/ProfitCalculationTest.java
@@ -67,7 +67,7 @@ public class ProfitCalculationTest {
             new Date(1618698807000l));
     trade = profitCalculation.getHoldingsList();
     assertTrue(trade.isEmpty());
-    assertEquals(profitCalculation.calculateGains(), 0, 0.001);
+    assertEquals(profitCalculation.calculateGainsSingle(), 0, 0.001);
 
     tearDown();
   }
@@ -80,16 +80,18 @@ public class ProfitCalculationTest {
         new ProfitCalculation(DatabaseQuerier.getConn(), "concurrentBS", new Date(1518010558000l),
             new Date(1715629591000l));
 
-    assertEquals(profitCalculation.getProfitMap().get(100), 1, .01);
+    Map<Integer, Double> map = profitCalculation.getProfitMap();
+
+    assertEquals(map.get(100), 1, .01);
 
     //buys at multiple prices
     profitCalculation =
         new ProfitCalculation(DatabaseQuerier.getConn(), "mulitpleBuyPrices",
             new Date(1518010558000l),
             new Date(1715629591000l));
-    assertEquals(profitCalculation.getProfitMap().get(101), 1, .01);
-    assertEquals(profitCalculation.getMoneyInput(), 3750, .01);
+
     assertEquals(profitCalculation.getHoldingsList().get(0).getRealizedGain(), 3750, 0.01);
+    assertEquals(profitCalculation.getMoneyInput(), 3750, .01);
 
     //left over holdings
     profitCalculation =
@@ -133,12 +135,10 @@ public class ProfitCalculationTest {
 
 
     //invalid stock ticker
-    //profitCalculation =
-        //new ProfitCalculation(DatabaseQuerier.getConn(), "invalidTicker", new Date(1518010558000l),
-            ///new Date(1618698807000l));
-    //assertEquals(profitCalculation.getHoldingsList().get(0).getRealizedGain(), 0, .01);
-    //assertEquals(profitCalculation.getHoldingsList().get(0).getUnrealizedGain(), 0, .01);
+    profitCalculation =
+        new ProfitCalculation(DatabaseQuerier.getConn(), "invalidTicker", new Date(1518010558000l),
+            new Date(1618698807000l));
+    assertTrue(profitCalculation.getHoldingsList().isEmpty());
   }
 
-
 }
\ No newline at end of file