diff --git a/src/client/spark_test/System/LimitsTests.cs b/src/client/spark_test/System/LimitsTests.cs index ba60f53c8..eb917e950 100644 --- a/src/client/spark_test/System/LimitsTests.cs +++ b/src/client/spark_test/System/LimitsTests.cs @@ -43,6 +43,7 @@ namespace bts.tests Disposable.dispose(ref _order_service); Disposable.dispose(ref _admin_service); Disposable.dispose(ref _context); + Disposable.dispose(ref _order_subscription); } async Task> all_futures(string symbol) { @@ -109,7 +110,7 @@ namespace bts.tests var second_order_def = create_order_def(second_sec.Id, Side.Buy, test_account, test_user); - Result no_limit_order_result = await send_order(first_order_def, 5, 1); + Result no_limit_order_result = await OrderUtilities.send_order(_order_service, first_order_def, 5, 1); IEnumerable no_limit_filtered_orders = await get_filtered_orders(x => x.Key == no_limit_order_result.value.OrderKey); @@ -121,11 +122,11 @@ namespace bts.tests List> orders_response_list = new List>(); for(int i = 0; i <3; i++){ - orders_response_list.Add(await send_order(first_order_def, 5, 10)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, first_order_def, 5, 10)); } for(int i = 0; i <3; i++){ - orders_response_list.Add(await send_order(second_order_def, 5, 10)); + orders_response_list.Add(await OrderUtilities.send_order(_order_service, second_order_def, 5, 10)); } foreach(var i in orders_response_list){ @@ -133,24 +134,24 @@ namespace bts.tests Assert.IsTrue(iret.First().State.Status == OrderStatus.Working, "This order should have been 'working'"); } - var fail_order_result = await send_order(first_order_def, 5, 1); + var fail_order_result = await OrderUtilities.send_order(_order_service, first_order_def, 5, 1); var fail_order_filtered_orders = await get_filtered_orders(x => x.Key == fail_order_result.value.OrderKey); Assert.IsTrue(fail_order_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "This order should have been 'Rejected by Spark'"); bool position_increase_success = await AdminUtilities.set_position_limit(_admin_service, test_account.name, test_symbol, 70, 120); Assert.IsTrue(position_increase_success); - var increased_order_result = await send_order(first_order_def, 5, 10); + var increased_order_result = await OrderUtilities.send_order(_order_service, first_order_def, 5, 10); var increased_order_filtered_orders = await get_filtered_orders(x => x.Key == increased_order_result.value.OrderKey); Assert.IsTrue(increased_order_filtered_orders.First().State.Status == OrderStatus.Working, "This order should have been 'Working'"); - var second_fail_order_result = await send_order(first_order_def, 5, 10); + var second_fail_order_result = await OrderUtilities.send_order(_order_service, first_order_def, 5, 10); var second_fail_filtered_orders = await get_filtered_orders(x => x.Key == second_fail_order_result.value.OrderKey); Assert.IsTrue(second_fail_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "This order should have been 'Rejected by Spark'"); /* Test Short Position Limit */ - Assert.IsTrue(await cancel_orders(), "Unable to cancel orders"); + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, _orders.all), "Unable to cancel orders"); await AdminUtilities.remove_position_limit(_admin_service, test_account.name, test_symbol); @@ -162,7 +163,7 @@ namespace bts.tests uint short_no_limit_order_key; - Result short_no_limit_order_result = await send_order(first_short_order_def, 50000, 7); + Result short_no_limit_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 7); short_no_limit_order_key = short_no_limit_order_result.value.OrderKey; IEnumerable short_no_limit_filtered_orders = await get_filtered_orders(x => x.Key == short_no_limit_order_key); @@ -175,11 +176,11 @@ namespace bts.tests List> short_orders_response_list = new List>(); for(int i = 0; i <3; i++){ - short_orders_response_list.Add(await send_order(first_short_order_def, 50000, 10)); + short_orders_response_list.Add(await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 10)); } for(int i = 0; i <3; i++){ - short_orders_response_list.Add(await send_order(second_short_order_def, 50000, 10)); + short_orders_response_list.Add(await OrderUtilities.send_order(_order_service, second_short_order_def, 50000, 10)); } foreach(var i in short_orders_response_list){ @@ -187,22 +188,22 @@ namespace bts.tests Assert.IsTrue(iret.First().State.Status == OrderStatus.Working, "This order should have been 'working'"); } - var short_fail_order_result = await send_order(first_short_order_def, 50000, 1); + var short_fail_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 1); var short_fail_order_filtered_orders = await get_filtered_orders(x => x.Key == short_fail_order_result.value.OrderKey); Assert.IsTrue(short_fail_order_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "This order should have been 'Rejected by Spark'"); bool short_position_increase_success = await AdminUtilities.set_position_limit(_admin_service, test_account.name, test_symbol, 120, 70); Assert.IsTrue(short_position_increase_success); - var short_increased_order_result = await send_order(first_short_order_def, 50000, 10); + var short_increased_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 10); var short_increased_order_filtered_orders = await get_filtered_orders(x => x.Key == short_increased_order_result.value.OrderKey); Assert.IsTrue(short_increased_order_filtered_orders.First().State.Status == OrderStatus.Working, "This order should have been 'Working'"); - var short_second_fail_order_result = await send_order(first_short_order_def, 50000, 10); + var short_second_fail_order_result = await OrderUtilities.send_order(_order_service, first_short_order_def, 50000, 10); var short_second_fail_filtered_orders = await get_filtered_orders(x => x.Key == short_second_fail_order_result.value.OrderKey); Assert.IsTrue(short_second_fail_filtered_orders.First().State.Status == OrderStatus.RejectedBySpark, "This order should have been 'Rejected by Spark'"); - Assert.IsTrue(await cancel_orders(), "Unable to cancel orders"); + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, _orders.all), "Unable to cancel orders"); } @@ -286,6 +287,7 @@ namespace bts.tests } Assert.IsTrue(success, "Failed to restore Limit"); + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, _orders.all), "Unable to cancel orders"); } @@ -311,34 +313,6 @@ namespace bts.tests } - - public async Task> send_order(OrderDefinition order_def, double price, uint size){ - return await _order_service.create_order_async(new Create() { - NewOrder = order_def, - Price = price, - Quantity = size - }); - } - - public async Task cancel_orders(uint key = 0){ - if (key > 0) { - Result resp = await _order_service.cancel_order_async(new Cancel() { OrderKey = key }); - return resp.success; - } - else { - bool suc = true; - var working_orders = await get_filtered_orders(x => x.State.Status == OrderStatus.Working); - if(working_orders != null){ - foreach (var o in working_orders){ - Result resp = await _order_service.cancel_order_async(new Cancel() { OrderKey = o.Key }); - suc &= resp.success; - } - return suc; - } - return true;// there are no working orders... so true enough - } - } - 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, diff --git a/src/client/spark_test/Utils/OrderUtilities.cs b/src/client/spark_test/Utils/OrderUtilities.cs new file mode 100644 index 000000000..5f22667bf --- /dev/null +++ b/src/client/spark_test/Utils/OrderUtilities.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Text; +using System.Threading.Tasks; +using bts.api; +using bts.api.admin; +using bts.api.core; +using bts.api.test; +using bts.test; +using bts.api.orderman; +using mbts; +using mbts.tests; +using bts.co2; + +namespace bts.tests +{ + public class OrderUtilities { + public static async Task> send_order(OrderService order_service, OrderDefinition order_def, double price, uint size){ + return await order_service.create_order_async(new Create() { + NewOrder = order_def, + Price = price, + Quantity = size + }); + } + + public static async Task cancel_orders(OrderService order_service, IEnumerable orders, uint key = 0){ + if (key > 0) { + Result resp = await order_service.cancel_order_async(new Cancel() { OrderKey = key }); + return resp.success; + } + else { + bool suc = true; + var working_orders = orders.Where(x => x.State.Status == OrderStatus.Working); + if(working_orders != null){ + foreach (var o in working_orders){ + Result resp = await order_service.cancel_order_async(new Cancel() { OrderKey = o.Key }); + suc &= resp.success; + } + return suc; + } + return true;// there are no working orders... so true enough + } + } + + } +} \ No newline at end of file