From 642c60e9a93fad39f99e5d1bdc3df8d9877eec48 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Thu, 18 Jul 2024 12:43:53 -0500 Subject: [PATCH] State argument removed from execute_command --- unittest/DFOModule_test.cxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/unittest/DFOModule_test.cxx b/unittest/DFOModule_test.cxx index 4f7fc2c..56ccfaa 100644 --- a/unittest/DFOModule_test.cxx +++ b/unittest/DFOModule_test.cxx @@ -154,10 +154,10 @@ BOOST_AUTO_TEST_CASE(Commands) auto start_json = "{\"run\": 1}"_json; auto null_json = "{}"_json; - dfo->execute_command("conf", "INITIAL", conf_json); - dfo->execute_command("start", "CONFIGURED", start_json); - dfo->execute_command("drain_dataflow", "RUNNING", null_json); - dfo->execute_command("scrap", "CONFIGURED", null_json); + dfo->execute_command("conf", conf_json); + dfo->execute_command("start", start_json); + dfo->execute_command("drain_dataflow", null_json); + dfo->execute_command("scrap", null_json); auto info = get_dfo_info(dfo); BOOST_REQUIRE_EQUAL(info.tokens_received, 0); @@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE(DataFlow) auto start_json = "{\"run\": 1}"_json; auto null_json = "{}"_json; - dfo->execute_command("conf", "INITIAL", conf_json); + dfo->execute_command("conf", conf_json); auto iom = iomanager::IOManager::get(); auto dec_recv = iom->get_receiver("trigdec_0"); @@ -198,7 +198,7 @@ BOOST_AUTO_TEST_CASE(DataFlow) auto info = get_dfo_info(dfo); BOOST_REQUIRE_EQUAL(info.tokens_received, 0); - dfo->execute_command("start", "CONFIGURED", start_json); + dfo->execute_command("start", start_json); send_init_token(); std::this_thread::sleep_for(std::chrono::milliseconds(150)); @@ -227,8 +227,8 @@ BOOST_AUTO_TEST_CASE(DataFlow) BOOST_REQUIRE_EQUAL(info.decisions_sent, 1); BOOST_REQUIRE(!busy_signal_recvd.load()); - dfo->execute_command("drain_dataflow", "RUNNING", null_json); - dfo->execute_command("scrap", "CONFIGURED", null_json); + dfo->execute_command("drain_dataflow", null_json); + dfo->execute_command("scrap", null_json); dec_recv->remove_callback(); inh_recv->remove_callback(); @@ -244,9 +244,9 @@ BOOST_AUTO_TEST_CASE(SendTrigDecFailed) auto start_json = "{\"run\": 1}"_json; auto null_json = "{}"_json; - dfo->execute_command("conf", "INITIAL", conf_json); + dfo->execute_command("conf", conf_json); - dfo->execute_command("start", "CONFIGURED", start_json); + dfo->execute_command("start", start_json); send_init_token("invalid_connection"); @@ -267,8 +267,8 @@ BOOST_AUTO_TEST_CASE(SendTrigDecFailed) send_token(1000); std::this_thread::sleep_for(std::chrono::milliseconds(50)); - dfo->execute_command("drain_dataflow", "RUNNING", null_json); - dfo->execute_command("scrap", "CONFIGURED", null_json); + dfo->execute_command("drain_dataflow", null_json); + dfo->execute_command("scrap", null_json); } BOOST_AUTO_TEST_SUITE_END()