From e72691c51e0393f12d1c9d7f0220e108e24b54e6 Mon Sep 17 00:00:00 2001 From: Jonathan Stein Date: Thu, 23 Jan 2025 13:52:51 +0100 Subject: [PATCH 1/4] fix: fix some incorrect module names in imports --- mf_plugin/parser/pfdl_tree_visitor.py | 4 ++-- mf_plugin/scheduling/__init__.py | 0 tests/integration_tests/test_lexer_and_parser.py | 4 ++-- tests/integration_tests/test_semantic_error_checker.py | 4 ++-- tests/unit_tests/test_mfdl_visitor.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 mf_plugin/scheduling/__init__.py diff --git a/mf_plugin/parser/pfdl_tree_visitor.py b/mf_plugin/parser/pfdl_tree_visitor.py index f098512..98d6d75 100644 --- a/mf_plugin/parser/pfdl_tree_visitor.py +++ b/mf_plugin/parser/pfdl_tree_visitor.py @@ -35,7 +35,7 @@ from pfdl_scheduler.validation.error_handler import ErrorHandler ### only for unit tests -from pfdl_scheduler.plugins.parser.PFDLParserVisitor import PFDLParserVisitor +from pfdl_scheduler.parser.PFDLParserVisitor import PFDLParserVisitor ## MF-Plugin sources @@ -51,7 +51,7 @@ from pfdl_scheduler.plugins.mf_plugin.mf_plugin.model.action_order_step import ActionOrderStep from pfdl_scheduler.plugins.mf_plugin.mf_plugin.model.rule import Rule -from pfdl_scheduler.plugins.parser.PFDLParser import PFDLParser +from pfdl_scheduler.parser.PFDLParser import PFDLParser import pfdl_scheduler.plugins.mf_plugin.mf_plugin.helpers as mf_plugin_helpers diff --git a/mf_plugin/scheduling/__init__.py b/mf_plugin/scheduling/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/integration_tests/test_lexer_and_parser.py b/tests/integration_tests/test_lexer_and_parser.py index 1b4771f..fb28ccf 100644 --- a/tests/integration_tests/test_lexer_and_parser.py +++ b/tests/integration_tests/test_lexer_and_parser.py @@ -21,8 +21,8 @@ # local sources ## MF-Plugin sources -from pfdl_scheduler.plugins.parser.PFDLLexer import PFDLLexer -from pfdl_scheduler.plugins.parser.PFDLParser import PFDLParser +from pfdl_scheduler.parser.PFDLLexer import PFDLLexer +from pfdl_scheduler.parser.PFDLParser import PFDLParser VALID_FOLDER_PATH = "pfdl_scheduler/plugins/mf_plugin/tests/test_files/valid/" INVALID_FOLDER_PATH = "pfdl_scheduler/plugins/mf_plugin/tests/test_files/invalid/syntax/" diff --git a/tests/integration_tests/test_semantic_error_checker.py b/tests/integration_tests/test_semantic_error_checker.py index 3122962..68060a2 100644 --- a/tests/integration_tests/test_semantic_error_checker.py +++ b/tests/integration_tests/test_semantic_error_checker.py @@ -19,8 +19,8 @@ from pfdl_scheduler.validation.error_handler import ErrorHandler ## MF-Plugin sources -from pfdl_scheduler.plugins.parser.PFDLLexer import PFDLLexer -from pfdl_scheduler.plugins.parser.PFDLParser import PFDLParser +from pfdl_scheduler.parser.PFDLLexer import PFDLLexer +from pfdl_scheduler.parser.PFDLParser import PFDLParser from pfdl_scheduler.plugins.mf_plugin.mf_plugin.parser.pfdl_tree_visitor import PFDLTreeVisitor from pfdl_scheduler.plugins.mf_plugin.mf_plugin.validation.semantic_error_checker import ( SemanticErrorChecker, diff --git a/tests/unit_tests/test_mfdl_visitor.py b/tests/unit_tests/test_mfdl_visitor.py index 92c0a66..6cbc936 100644 --- a/tests/unit_tests/test_mfdl_visitor.py +++ b/tests/unit_tests/test_mfdl_visitor.py @@ -51,7 +51,7 @@ from pfdl_scheduler.plugins.mf_plugin.mf_plugin.model.action_order import ActionOrder from pfdl_scheduler.plugins.mf_plugin.mf_plugin.model.transport_order_step import TransportOrderStep from pfdl_scheduler.plugins.mf_plugin.mf_plugin.model.action_order_step import ActionOrderStep -from pfdl_scheduler.plugins.parser.PFDLParser import PFDLParser +from pfdl_scheduler.parser.PFDLParser import PFDLParser from pfdl_scheduler.plugins.mf_plugin.mf_plugin.parser.pfdl_tree_visitor import PFDLTreeVisitor plugin_loader = PluginLoader() From db94580bd2103dc846f4cba7949ef2ba031ff97c Mon Sep 17 00:00:00 2001 From: Jonathan Stein Date: Thu, 23 Jan 2025 14:04:10 +0100 Subject: [PATCH 2/4] fix: pass pfdl_base_classes to constructor --- mf_plugin/scheduler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mf_plugin/scheduler.py b/mf_plugin/scheduler.py index ae7e65e..2221f69 100644 --- a/mf_plugin/scheduler.py +++ b/mf_plugin/scheduler.py @@ -73,7 +73,7 @@ def __init__( self.init_scheduler( scheduler_uuid, generate_test_ids, - pfdl_base_classes.get_class("PetriNetGenerator")(), + pfdl_base_classes.get_class("PetriNetGenerator")(pfdl_base_classes=pfdl_base_classes), pfdl_base_classes.get_class("TaskCallbacks")(), ) From 2a5e360a5bec88454cec0ad889a684e1732ca508 Mon Sep 17 00:00:00 2001 From: Jonathan Stein Date: Thu, 23 Jan 2025 15:53:15 +0100 Subject: [PATCH 3/4] fix: always wait for action order --- mf_plugin/petri_net/generator.py | 41 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/mf_plugin/petri_net/generator.py b/mf_plugin/petri_net/generator.py index 1ec8ebe..4536912 100644 --- a/mf_plugin/petri_net/generator.py +++ b/mf_plugin/petri_net/generator.py @@ -513,27 +513,26 @@ def generate_transport_order_step( node.cluster.add_child(cluster) tos_node.cluster = cluster - if tos.parameters: - # add more nodes to the TransportOrderStep cluster - waiting_for_action_uuid = create_place("Waiting for action", self.net, tos_node) - action_executed_uuid = create_place("Action executed", self.net, tos_node) - last_transition_uuid = create_transition("", "", self.net, tos_node) - - tos_node.cluster.add_node(waiting_for_action_uuid) - tos_node.cluster.add_node(action_executed_uuid) - tos_node.cluster.add_node(last_transition_uuid) - - self.net.add_output(waiting_for_action_uuid, first_transition_uuid, Value(1)) - self.net.add_input(waiting_for_action_uuid, last_transition_uuid, Value(1)) - self.net.add_input(action_executed_uuid, last_transition_uuid, Value(1)) - - self.add_callback( - first_transition_uuid, - self.callbacks.waiting_for_action, - tos_api, - task_api, - ) - self.add_callback(last_transition_uuid, self.callbacks.action_executed, tos_api) + # add more nodes to the TransportOrderStep cluster + waiting_for_action_uuid = create_place("Waiting for action", self.net, tos_node) + action_executed_uuid = create_place("Action executed", self.net, tos_node) + last_transition_uuid = create_transition("", "", self.net, tos_node) + + tos_node.cluster.add_node(waiting_for_action_uuid) + tos_node.cluster.add_node(action_executed_uuid) + tos_node.cluster.add_node(last_transition_uuid) + + self.net.add_output(waiting_for_action_uuid, first_transition_uuid, Value(1)) + self.net.add_input(waiting_for_action_uuid, last_transition_uuid, Value(1)) + self.net.add_input(action_executed_uuid, last_transition_uuid, Value(1)) + + self.add_callback( + first_transition_uuid, + self.callbacks.waiting_for_action, + tos_api, + task_api, + ) + self.add_callback(last_transition_uuid, self.callbacks.action_executed, tos_api) # check if there are StartedBy or FinishedBy statements and if so, generate components started_by_uuid = "" From 6494a2e2e49ecd2597d7ab387a7f6865887e47c3 Mon Sep 17 00:00:00 2001 From: Jonathan Stein Date: Mon, 27 Jan 2025 08:54:58 +0100 Subject: [PATCH 4/4] test: adjust test cases Since the scheduler now always waits for action_executed events, the test cases had to be adjusted. --- tests/test_files/scheduler/condition_in_task.txt | 4 ++++ tests/test_files/scheduler/counting_loop.txt | 6 ++++++ tests/test_files/scheduler/finished_by.txt | 3 ++- tests/test_files/scheduler/finished_by_action.txt | 2 ++ tests/test_files/scheduler/finished_by_move.txt | 5 +++++ tests/test_files/scheduler/module_import.txt | 4 ++++ tests/test_files/scheduler/multiple_event_types.txt | 2 ++ .../scheduler/multiple_files_module_import.txt | 4 ++++ tests/test_files/scheduler/multiple_orders.txt | 3 +++ tests/test_files/scheduler/on_done_task.txt | 4 ++++ tests/test_files/scheduler/parallel_loop.txt | 6 ++++++ tests/test_files/scheduler/parallel_tasks.txt | 4 ++++ tests/test_files/scheduler/parameters.txt | 1 + tests/test_files/scheduler/picklist_task.txt | 5 +++++ tests/test_files/scheduler/rule_in_task.txt | 2 ++ tests/test_files/scheduler/service_in_task.txt | 2 ++ tests/test_files/scheduler/simple_action.txt | 2 ++ tests/test_files/scheduler/simple_transport.txt | 2 ++ tests/test_files/scheduler/started_by.txt | 2 ++ tests/test_files/scheduler/struct_inheritance.txt | 2 ++ .../scheduler/struct_with_attribute_access.txt | 3 +++ .../scheduler/struct_with_instance_variable.txt | 3 +++ tests/test_files/scheduler/task_constraints.txt | 2 ++ tests/test_files/scheduler/task_repeat.txt | 10 ++++++++++ tests/test_files/scheduler/task_sequence.txt | 6 ++++++ tests/test_files/scheduler/while_loop.txt | 6 ++++++ 26 files changed, 94 insertions(+), 1 deletion(-) diff --git a/tests/test_files/scheduler/condition_in_task.txt b/tests/test_files/scheduler/condition_in_task.txt index 5e16329..56e2d03 100644 --- a/tests/test_files/scheduler/condition_in_task.txt +++ b/tests/test_files/scheduler/condition_in_task.txt @@ -5,7 +5,11 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "6", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "6", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "7", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "7", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/counting_loop.txt b/tests/test_files/scheduler/counting_loop.txt index dafb80d..3f97bd2 100644 --- a/tests/test_files/scheduler/counting_loop.txt +++ b/tests/test_files/scheduler/counting_loop.txt @@ -5,10 +5,16 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "4", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "4", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "5", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "5", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/finished_by.txt b/tests/test_files/scheduler/finished_by.txt index 4130cd1..89a8b2a 100644 --- a/tests/test_files/scheduler/finished_by.txt +++ b/tests/test_files/scheduler/finished_by.txt @@ -5,9 +5,10 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} - +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "instance_update", "data": {"instance_name": "manualLoadingConfirmation", "new_values": {"value": false}}} diff --git a/tests/test_files/scheduler/finished_by_action.txt b/tests/test_files/scheduler/finished_by_action.txt index 8857b93..0e6cdac 100644 --- a/tests/test_files/scheduler/finished_by_action.txt +++ b/tests/test_files/scheduler/finished_by_action.txt @@ -5,9 +5,11 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "instance_update", "data": {"instance_name": "manualLoadingConfirmation", "new_values": {"value": false}}} {"event_type": "instance_update", "data": {"instance_name": "manualLoadingConfirmation", "new_values": {"value": true}}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "2", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/finished_by_move.txt b/tests/test_files/scheduler/finished_by_move.txt index 8d704a2..fe27615 100644 --- a/tests/test_files/scheduler/finished_by_move.txt +++ b/tests/test_files/scheduler/finished_by_move.txt @@ -4,10 +4,15 @@ # For details on the licensing terms, see the LICENSE file. # SPDX-License-Identifier: MIT +# Transport order {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "instance_update", "data": {"instance_name": "manualLoadingConfirmation", "new_values": {"value": false}}} {"event_type": "instance_update", "data": {"instance_name": "manualLoadingConfirmation", "new_values": {"value": true}}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} + +# Move order {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "2", "status": "moved_to_location"}} diff --git a/tests/test_files/scheduler/module_import.txt b/tests/test_files/scheduler/module_import.txt index 509edf9..b20309c 100644 --- a/tests/test_files/scheduler/module_import.txt +++ b/tests/test_files/scheduler/module_import.txt @@ -5,6 +5,10 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/multiple_event_types.txt b/tests/test_files/scheduler/multiple_event_types.txt index 99c78bf..203e0cf 100644 --- a/tests/test_files/scheduler/multiple_event_types.txt +++ b/tests/test_files/scheduler/multiple_event_types.txt @@ -5,4 +5,6 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/multiple_files_module_import.txt b/tests/test_files/scheduler/multiple_files_module_import.txt index 509edf9..b20309c 100644 --- a/tests/test_files/scheduler/multiple_files_module_import.txt +++ b/tests/test_files/scheduler/multiple_files_module_import.txt @@ -5,6 +5,10 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/multiple_orders.txt b/tests/test_files/scheduler/multiple_orders.txt index 16edec8..94a6c79 100644 --- a/tests/test_files/scheduler/multiple_orders.txt +++ b/tests/test_files/scheduler/multiple_orders.txt @@ -5,8 +5,11 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "3", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/on_done_task.txt b/tests/test_files/scheduler/on_done_task.txt index a691371..603c062 100644 --- a/tests/test_files/scheduler/on_done_task.txt +++ b/tests/test_files/scheduler/on_done_task.txt @@ -5,7 +5,11 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "3", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/parallel_loop.txt b/tests/test_files/scheduler/parallel_loop.txt index dafb80d..3f97bd2 100644 --- a/tests/test_files/scheduler/parallel_loop.txt +++ b/tests/test_files/scheduler/parallel_loop.txt @@ -5,10 +5,16 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "4", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "4", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "5", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "5", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/parallel_tasks.txt b/tests/test_files/scheduler/parallel_tasks.txt index 8fd64c4..5543ea5 100644 --- a/tests/test_files/scheduler/parallel_tasks.txt +++ b/tests/test_files/scheduler/parallel_tasks.txt @@ -5,7 +5,11 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/parameters.txt b/tests/test_files/scheduler/parameters.txt index 7dd2dd9..4324d70 100644 --- a/tests/test_files/scheduler/parameters.txt +++ b/tests/test_files/scheduler/parameters.txt @@ -5,6 +5,7 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/picklist_task.txt b/tests/test_files/scheduler/picklist_task.txt index 9cead6d..1c82bf5 100644 --- a/tests/test_files/scheduler/picklist_task.txt +++ b/tests/test_files/scheduler/picklist_task.txt @@ -5,8 +5,13 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "3", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "4", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "4", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/rule_in_task.txt b/tests/test_files/scheduler/rule_in_task.txt index bb72408..8ec7d19 100644 --- a/tests/test_files/scheduler/rule_in_task.txt +++ b/tests/test_files/scheduler/rule_in_task.txt @@ -8,4 +8,6 @@ {"event_type": "instance_update", "data": {"instance_name": "manualLoadingConfirmation2", "new_values": {"value": 100}}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/service_in_task.txt b/tests/test_files/scheduler/service_in_task.txt index 0f478ef..c01d257 100644 --- a/tests/test_files/scheduler/service_in_task.txt +++ b/tests/test_files/scheduler/service_in_task.txt @@ -7,4 +7,6 @@ {"event_type": "service_finished", "data": {"service_uuid": "0"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/simple_action.txt b/tests/test_files/scheduler/simple_action.txt index 36b9e95..aec0d77 100644 --- a/tests/test_files/scheduler/simple_action.txt +++ b/tests/test_files/scheduler/simple_action.txt @@ -6,8 +6,10 @@ {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "2", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/simple_transport.txt b/tests/test_files/scheduler/simple_transport.txt index 99c78bf..203e0cf 100644 --- a/tests/test_files/scheduler/simple_transport.txt +++ b/tests/test_files/scheduler/simple_transport.txt @@ -5,4 +5,6 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/started_by.txt b/tests/test_files/scheduler/started_by.txt index 1f9387a..cef8830 100644 --- a/tests/test_files/scheduler/started_by.txt +++ b/tests/test_files/scheduler/started_by.txt @@ -8,4 +8,6 @@ {"event_type": "instance_update", "data": {"instance_name": "startTransport", "new_values": {"value": true}}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/struct_inheritance.txt b/tests/test_files/scheduler/struct_inheritance.txt index 99c78bf..203e0cf 100644 --- a/tests/test_files/scheduler/struct_inheritance.txt +++ b/tests/test_files/scheduler/struct_inheritance.txt @@ -5,4 +5,6 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/struct_with_attribute_access.txt b/tests/test_files/scheduler/struct_with_attribute_access.txt index 6995e04..8698718 100644 --- a/tests/test_files/scheduler/struct_with_attribute_access.txt +++ b/tests/test_files/scheduler/struct_with_attribute_access.txt @@ -6,10 +6,13 @@ {"event_type": "instance_update", "data": {"instance_name": "size_warehouse1", "new_values": {"height": 10, "width": 10}}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} # this should not work {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} # update the instance {"event_type": "instance_update", "data": {"instance_name": "size_production1", "new_values": {"height": 10, "width": 10}}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/struct_with_instance_variable.txt b/tests/test_files/scheduler/struct_with_instance_variable.txt index 6995e04..8698718 100644 --- a/tests/test_files/scheduler/struct_with_instance_variable.txt +++ b/tests/test_files/scheduler/struct_with_instance_variable.txt @@ -6,10 +6,13 @@ {"event_type": "instance_update", "data": {"instance_name": "size_warehouse1", "new_values": {"height": 10, "width": 10}}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} # this should not work {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} # update the instance {"event_type": "instance_update", "data": {"instance_name": "size_production1", "new_values": {"height": 10, "width": 10}}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/task_constraints.txt b/tests/test_files/scheduler/task_constraints.txt index 30c16d3..4876fd3 100644 --- a/tests/test_files/scheduler/task_constraints.txt +++ b/tests/test_files/scheduler/task_constraints.txt @@ -5,4 +5,6 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/task_repeat.txt b/tests/test_files/scheduler/task_repeat.txt index 02f230e..1e4d157 100644 --- a/tests/test_files/scheduler/task_repeat.txt +++ b/tests/test_files/scheduler/task_repeat.txt @@ -6,16 +6,26 @@ {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "4", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "4", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "5", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "5", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "4", "order_step_uuid": "6", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "4", "order_step_uuid": "6", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "4", "order_step_uuid": "7", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "4", "order_step_uuid": "7", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "5", "order_step_uuid": "8", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "5", "order_step_uuid": "8", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "5", "order_step_uuid": "9", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "5", "order_step_uuid": "9", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/task_sequence.txt b/tests/test_files/scheduler/task_sequence.txt index 08284a2..fe87107 100644 --- a/tests/test_files/scheduler/task_sequence.txt +++ b/tests/test_files/scheduler/task_sequence.txt @@ -5,10 +5,16 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "0", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "3", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "4", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "4", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "5", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "5", "status": "action_executed"}} diff --git a/tests/test_files/scheduler/while_loop.txt b/tests/test_files/scheduler/while_loop.txt index bd274ed..7543141 100644 --- a/tests/test_files/scheduler/while_loop.txt +++ b/tests/test_files/scheduler/while_loop.txt @@ -5,19 +5,25 @@ # SPDX-License-Identifier: MIT {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "0", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "1", "order_step_uuid": "1", "status": "action_executed"}} {"event_type": "instance_update", "data": {"instance_name": "warehouseX", "new_values": {"number_of_packages": 2}}} {"event_type": "service_finished", "data": {"service_uuid": "0"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "2", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "2", "order_step_uuid": "3", "status": "action_executed"}} {"event_type": "instance_update", "data": {"instance_name": "warehouseX", "new_values": {"number_of_packages": 1}}} {"event_type": "service_finished", "data": {"service_uuid": "1"}} {"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "4", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "4", "status": "action_executed"}} {"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "5", "status": "moved_to_location"}} +{"event_type": "order_step_update", "data": {"task": "3", "order_step_uuid": "5", "status": "action_executed"}} {"event_type": "instance_update", "data": {"instance_name": "warehouseX", "new_values": {"number_of_packages": 0}}} {"event_type": "service_finished", "data": {"service_uuid": "2"}}