refactor orchestration tests

Author: scgbear

azure/durable_functions/models/OrchestratorState.py

@@ -29,12 +29,14 @@ def to_json(self) -> Dict[str, Any]:
                     action_dict['functionName'] = action_obj.functionName
                 if hasattr(action_obj, 'input'):
                     action_dict['input'] = action_obj.input
-
                 action_result_list.append(action_dict)
             json_dict['actions'].append(action_result_list)
-        json_dict['output'] = self.output
-        json_dict['error'] = self.error
-        json_dict['customStatus'] = self.customStatus
+        if self.output:
+            json_dict['output'] = self.output
+        if self.error:
+            json_dict['error'] = self.error
+        if self.customStatus:
+            json_dict['customStatus'] = self.customStatus
         return json_dict
 
     def to_json_string(self) -> str:

tests/models/test_OrchestrationState.py

@@ -9,8 +9,7 @@ def test_empty_state_to_json_string():
     actions: List[List[IAction]] = []
     state = OrchestratorState(isDone=False, actions=actions, output=None, error=None, customStatus=None)
     result = state.to_json_string()
-    expected_result = ('{"isDone": false, "actions": [], "output": null, "error": null, '
-                       '"customStatus": null}')
+    expected_result = '{"isDone": false, "actions": []}'
     assert expected_result == result
 
 
@@ -21,5 +20,5 @@ def test_single_action_state_to_json_string():
     state = OrchestratorState(isDone=False, actions=actions, output=None, error=None, customStatus=None)
     result = state.to_json_string()
     expected_result = ('{"isDone": false, "actions": [[{"actionType": 0, "functionName": "MyFunction", "input": '
-                       '"AwesomeInput"}]], "output": null, "error": null, "customStatus": null}')
+                       '"AwesomeInput"}]]}')
     assert expected_result == result

tests/orchestrator/test_chaining_orchestrator.py

@@ -24,11 +24,25 @@ def generator_function(context):
                           (HANDLE_TWO, STATE_TWO),
                           (HANDLE_THREE, STATE_THREE),
                           (HANDLE_FOUR, STATE_FOUR)])
-def test_initial_activity_one(context, output_state):
+def test_orchestration_state_output(context, output_state):
     orchestrator = Orchestrator(generator_function)
     result = json.loads(orchestrator.handle(context))
     expected = json.loads(output_state)
-    assert expected.get("isDone") == result.get("isDone")
+    assert_attribute_equal(expected, result, "isDone")
+    assert_actions_are_equal(expected, result)
+    assert_attribute_equal(expected, result, "output")
+    assert_attribute_equal(expected, result, "error")
+    assert_attribute_equal(expected, result, "customStatus")
+
+
+def assert_attribute_equal(expected, result, attribute):
+    if hasattr(expected, attribute):
+        assert expected.get(attribute) == result.get(attribute)
+    else:
+        assert not hasattr(result, attribute)
+
+
+def assert_actions_are_equal(expected, result):
     expected_actions = expected.get("actions")
     result_actions = result.get("actions")
     assert len(expected_actions) == len(result_actions)