fix-inject-state-hydration

antmendoza · antmendoza · commit 64379d1b5a7f · 2022-02-26T22:41:14.000+01:00
Signed-off-by: Antonio Mendoza Pérez &lt;antmendoza@gmail.com&gt;
diff --git a/serverlessworkflow/sdk/inject_state.py b/serverlessworkflow/sdk/inject_state.py
@@ -44,8 +44,8 @@ def __init__(self,
     def f_hydration(p_key, p_value):
 
         if p_key == 'end':
-            return HydratableParameter(value=p_value).hydrateAs(UnionTypeOf(SimpleTypeOf(bool),
-                                                                            ComplexTypeOf(End)))
+            return HydratableParameter(value=p_value).hydrateAs(UnionTypeOf([SimpleTypeOf(bool),
+                                                                            ComplexTypeOf(End)]))
         if p_key == 'data':
             return HydratableParameter(value=p_value).hydrateAs(UnionTypeOf([SimpleTypeOf(str),
                                                                              ComplexTypeOf(dict)]))
diff --git a/tests/examples/helloworld.json b/tests/examples/helloworld.json
@@ -0,0 +1,18 @@
+{
+  "id": "helloworld",
+  "version": "1.0",
+  "specVersion": "0.8",
+  "name": "Hello World Workflow",
+  "description": "Inject Hello World",
+  "start": "Hello State",
+  "states": [
+    {
+      "name": "Hello State",
+      "type": "inject",
+      "data": {
+        "result": "Hello World!"
+      },
+      "end": true
+    }
+  ]
+}
diff --git a/tests/serverlessworkflow/sdk/test_workflow.py b/tests/serverlessworkflow/sdk/test_workflow.py
@@ -1,5 +1,7 @@
+import json
 import os
 import unittest
+from os import listdir
 
 from serverlessworkflow.sdk.action import Action
 from serverlessworkflow.sdk.function import Function
@@ -8,7 +10,6 @@
 
 
 class TestWorkflow(unittest.TestCase):
-
     workflow = Workflow(id_="greeting",
                         name="Greeting Workflow",
                         description="Greet Someone",
@@ -106,8 +107,26 @@ def test_workflow_to_yaml(self):
         self.assertEqual(expected, self.workflow.to_yaml())
 
     def test_workflow_from_source_json(self):
-        wf_file = os.path.join(os.path.dirname(__file__), 'test_workflow.json')
-        self.assert_test_workflow_file(wf_file)
+        examples_dir = os.path.join(os.path.dirname(__file__), '../../examples')
+        examples = listdir(examples_dir)
+        self.assertEqual(len(examples), 10)
+
+        for example in examples:
+            with self.subTest(f"test_{example}"):
+                with open(examples_dir + "/" + example, "r") as swf_file:
+                    workflow = Workflow.from_source(swf_file)
+                    self.assertTrue(isinstance(workflow, Workflow))
+
+    def test_instance_workflow_class(self):
+        examples_dir = os.path.join(os.path.dirname(__file__), '../../examples')
+        examples = listdir(examples_dir)
+        self.assertEqual(len(examples), 10)
+
+        for example in examples:
+            with self.subTest(f"test_{example}"):
+                with open(examples_dir + "/" + example, "r") as swf_file:
+                    workflow = Workflow(**json.load(swf_file))
+                    self.assertTrue(isinstance(workflow, Workflow))
 
     def test_workflow_from_source_yaml(self):
         wf_file = os.path.join(os.path.dirname(__file__), 'test_workflow.yaml')
@@ -125,4 +144,3 @@ def assert_test_workflow_file(self, wf_file):
             self.assertTrue(isinstance(workflow.states[0].actions[0], Action))
             self.assertTrue(isinstance(workflow.states[0].actions[0].functionRef, FunctionRef))
             self.assertTrue(isinstance(workflow.functions[0], Function))
-
diff --git a/tests/serverlessworkflow/sdk/test_workflow_validator.py b/tests/serverlessworkflow/sdk/test_workflow_validator.py
@@ -14,11 +14,10 @@ class TestWorkflowValidator(unittest.TestCase):
     def test_validate_examples(self):
         examples_dir = os.path.join(os.path.dirname(__file__), '../../examples')
         examples = listdir(examples_dir)
-        self.assertEqual(len(examples), 9)
+        self.assertEqual(len(examples), 10)
 
         for example in examples:
             with self.subTest(f"test_{example}"):
-
                 with open(examples_dir + "/" + example, "r") as swf_file:
                     swf_file_content = json.load(swf_file)
                     workflow = Workflow(**swf_file_content)
