diff --git a/src/client/spark_test/System/IcebergAlgoTests.cs b/src/client/spark_test/System/IcebergAlgoTests.cs index 1680654ae..e91ca574f 100644 --- a/src/client/spark_test/System/IcebergAlgoTests.cs +++ b/src/client/spark_test/System/IcebergAlgoTests.cs @@ -13,7 +13,6 @@ using bts.api.orderman; using mbts; using mbts.tests; using bts.co2; -using bts.api.orderman.algo; namespace bts.tests { @@ -99,22 +98,6 @@ namespace bts.tests { return security_with_no_market; } - public OrderDefinition create_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user) { - return new OrderDefinition { - SecurityKey = security_id, - Side = side, - TimeInForce = TimeInForce.Day, - CustomDef = new CustomOrderDefinition { Limit = new LimitOrderDefinition { } }, - CtiCode = CTICode.CtiCode1, - CustomerOrFirm = CustomerOrFirm.Firm, - ManualOrderIndicator = ManualOrderIndicator.Yes, - Account = account.name, - AccountId = account.id, - User = user.name, - UserId = user.id - }; - } - public OrderDefinition create_iceberg_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user) { return new OrderDefinition { SecurityKey = security_id, @@ -138,27 +121,6 @@ namespace bts.tests { }; } - private async Task> get_filtered_orders(Func predicate, int count = 1) { - int current_count = 0; - int it = 0; - do { - if (_orders != null) { - var ords = _orders.all.Where(predicate); - current_count = ords.Count(); - - if (current_count >= count) { - return ords; - } - it++; - } - await Task.Delay(100); - } - while (it < 100 && (_orders == null || current_count < count)); - - return null; - - } - [Test(Timeout = 25)] public async Task test_ib_create_and_takeout_market() { var test_user = (name: "bts", id: 0u); @@ -180,25 +142,26 @@ namespace bts.tests { // create a market in the instrument List> orders_response_list = new List>(); - var bid_order_def = create_order_def(s.Value.Id, Side.Buy, test_account, test_user); - var ask_order_def = create_order_def(s.Value.Id, Side.Sell, test_account, test_user); + var bid_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Buy, test_account, test_user); + var ask_order_def = OrderDefinitionUtilities.create_limit_order_def(s.Value.Id, Side.Sell, test_account, test_user); orders_response_list.Add(await OrderUtilities.send_order(_order_service, bid_order_def, 55.00, 50)); - orders_response_list.Add( await OrderUtilities.send_order(_order_service, ask_order_def, 55.05, 50)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, ask_order_def, 55.05, 50)); + await Task.Delay(new TimeSpan(0, 0, 3)); List test_orders = new List(); foreach (var i in orders_response_list) { - var iret = await get_filtered_orders(x => x.Key == i.value.OrderKey); - Assert.IsTrue(iret.First().State.Status == OrderStatus.Working, "This order should have been 'working'"); + var iret = await OrderUtilities.get_filtered_orders(_orders, x => x.Key == i.value.OrderKey); + Assert.IsTrue(iret.Count() > 0 && iret.First().State.Status == OrderStatus.Working, "This order should have been 'working'"); test_orders.AddRange(iret); } // create an IB that will cross this market var ib_order_def = create_iceberg_order_def(s.Value.Id, Side.Buy, test_account, test_user); var ib_order_result = await OrderUtilities.send_order(_order_service, ib_order_def, 55.05, 30); - await Task.Delay(new TimeSpan(0, 0, 3)); - var ib_filtered_order = await get_filtered_orders(x => x.Key == ib_order_result.value.OrderKey); - var ib_child_orders = await get_filtered_orders(x => x.ParentKey == ib_order_result.value.OrderKey, 10); + await Task.Delay(new TimeSpan(0, 0, 6)); + var ib_filtered_order = await OrderUtilities.get_filtered_orders(_orders, x => x.Key == ib_order_result.value.OrderKey); + var ib_child_orders = await OrderUtilities.get_filtered_orders(_orders, x => x.ParentKey == ib_order_result.value.OrderKey, 10); - Assert.IsTrue(ib_filtered_order.First().State.Status == OrderStatus.Completed, "This IB order should have been 'Completed'"); + Assert.IsTrue(ib_filtered_order.Count() > 0 && ib_filtered_order.First().State.Status == OrderStatus.Completed, "This IB order should have been 'Completed'"); Assert.IsTrue(ib_child_orders.Count() == 10, "There should have been 10 child orders"); Assert.IsTrue(ib_child_orders.All(x => x.HasState && x.State.Status == OrderStatus.Completed), "All child orders should be completed"); diff --git a/src/client/spark_test/Utils/OrderUtilities.cs b/src/client/spark_test/Utils/OrderUtilities.cs index 5f22667bf..fe099deba 100644 --- a/src/client/spark_test/Utils/OrderUtilities.cs +++ b/src/client/spark_test/Utils/OrderUtilities.cs @@ -44,5 +44,46 @@ namespace bts.tests } } + public static async Task> get_filtered_orders(Update orders, Func predicate, int count = 1) { + int current_count = 0; + int it = 0; + do { + if (orders != null) { + var ords = orders.all.Where(predicate); + current_count = ords.Count(); + + if (current_count >= count) { + return ords; + } + it++; + } + await Task.Delay(100); + } + while (it < 100 && (orders == null || current_count < count)); + + return new List(); + } + + } + + /// + /// We should replace with something like the OrderDataHeler from the Spark project. + /// + public static class OrderDefinitionUtilities { + public static OrderDefinition create_limit_order_def(uint security_id, Side side, (String name, uint id) account, (String name, uint id) user) { + return new OrderDefinition { + SecurityKey = security_id, + Side = side, + TimeInForce = TimeInForce.Day, + CustomDef = new CustomOrderDefinition { Limit = new LimitOrderDefinition { } }, + CtiCode = CTICode.CtiCode1, + CustomerOrFirm = CustomerOrFirm.Firm, + ManualOrderIndicator = ManualOrderIndicator.Yes, + Account = account.name, + AccountId = account.id, + User = user.name, + UserId = user.id + }; + } } } \ No newline at end of file