diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Data-Integration.iml b/Data-Integration.iml index 6f3b297..242e669 100644 --- a/Data-Integration.iml +++ b/Data-Integration.iml @@ -28,16 +28,16 @@ - + - - - + + - - - - + + + + + diff --git a/out/production/Data-Integration/OrderBook/Cache.class b/out/production/Data-Integration/OrderBook/Cache.class new file mode 100644 index 0000000..7cbccb9 Binary files /dev/null and b/out/production/Data-Integration/OrderBook/Cache.class differ diff --git a/out/production/Data-Integration/OrderBook/Fill.class b/out/production/Data-Integration/OrderBook/Fill.class new file mode 100644 index 0000000..1c0aa7a Binary files /dev/null and b/out/production/Data-Integration/OrderBook/Fill.class differ diff --git a/out/production/Data-Integration/OrderBook/Order.class b/out/production/Data-Integration/OrderBook/Order.class new file mode 100644 index 0000000..be4eaf4 Binary files /dev/null and b/out/production/Data-Integration/OrderBook/Order.class differ diff --git a/out/production/Data-Integration/OrderBook/OrderBook.class b/out/production/Data-Integration/OrderBook/OrderBook.class new file mode 100644 index 0000000..bac9b96 Binary files /dev/null and b/out/production/Data-Integration/OrderBook/OrderBook.class differ diff --git a/out/production/Data-Integration/OrderBook/OrderType.class b/out/production/Data-Integration/OrderBook/OrderType.class new file mode 100644 index 0000000..395e920 Binary files /dev/null and b/out/production/Data-Integration/OrderBook/OrderType.class differ diff --git a/out/production/Data-Integration/OrderBook/Side.class b/out/production/Data-Integration/OrderBook/Side.class new file mode 100644 index 0000000..9d46b21 Binary files /dev/null and b/out/production/Data-Integration/OrderBook/Side.class differ diff --git a/out/production/Data-Integration/OrderBook/TimeInForce.class b/out/production/Data-Integration/OrderBook/TimeInForce.class new file mode 100644 index 0000000..4ce9e10 Binary files /dev/null and b/out/production/Data-Integration/OrderBook/TimeInForce.class differ diff --git a/out/production/Data-Integration/classpath.index b/out/production/Data-Integration/classpath.index new file mode 100644 index 0000000..b80098b Binary files /dev/null and b/out/production/Data-Integration/classpath.index differ diff --git a/out/test/Data-Integration/classpath.index b/out/test/Data-Integration/classpath.index new file mode 100644 index 0000000..17aa303 Binary files /dev/null and b/out/test/Data-Integration/classpath.index differ diff --git a/out/test/Data-Integration/testOrderBook.class b/out/test/Data-Integration/testOrderBook.class new file mode 100644 index 0000000..c5e3688 Binary files /dev/null and b/out/test/Data-Integration/testOrderBook.class differ diff --git a/src/test/testOrderBook.java b/src/test/testOrderBook.java index 30d1653..01bdafb 100644 --- a/src/test/testOrderBook.java +++ b/src/test/testOrderBook.java @@ -2,6 +2,8 @@ import OrderBook.OrderBook; import OrderBook.Side; import org.junit.jupiter.api.Test; +import OrderBook.Fill; +import OrderBook.OrderType; import static org.junit.jupiter.api.Assertions.*; @@ -168,4 +170,26 @@ void placeTwoAsk() { assertEquals(-1f, testSubject.bestBidPrice); assertEquals(1.8f, testSubject.sittingVolume); } + + @Test + void checkBest(){ + OrderBook testSubject = new OrderBook(); + + //Bids: + Order newBidOne = new Order(5.3f, 0.3f, Side.BID, 1677598183L); + testSubject.placeOrder(newBidOne); + Order newBidTwo = new Order(8.3f, 0.7f, Side.BID, 1977598183L); + testSubject.placeOrder(newBidTwo); + assertEquals(5.0, (double)Math.round(testSubject.bestBidPrice)); + + //Asks: + Order newAskOne = new Order(5.3f, 0.4f, Side.ASK, 1777598183L); + testSubject.placeOrder(newAskOne); + Order newAskTwo = new Order(8.3f, 0.2f, Side.ASK, 1877598183L); + testSubject.placeOrder(newAskTwo); + assertEquals(5.0, (double)Math.round(testSubject.bestAskPrice)); + + assertEquals(0.0,(double)Math.round(testSubject.sittingVolume)); + + } }