From d11032a0c73104a9d0c3e5b37cfcf9f9c104e1ed Mon Sep 17 00:00:00 2001 From: Jon Herron Date: Mon, 2 Mar 2026 07:48:34 -0500 Subject: [PATCH 1/2] wip --- examples/dict_test.bpmn | 20 ++++---------------- examples/gateway_test.bpmn | 20 ++++---------------- examples/httpv2_test.bpmn | 20 ++++---------------- examples/jfds_test.bpmn | 20 ++++---------------- examples/jsonfiledatastore.json | 2 +- examples/manual_tasks_test.bpmn | 20 ++++---------------- examples/user_task_test.bpmn | 20 ++++---------------- test.py | 2 +- 8 files changed, 26 insertions(+), 98 deletions(-) diff --git a/examples/dict_test.bpmn b/examples/dict_test.bpmn index c14d44d..882f176 100644 --- a/examples/dict_test.bpmn +++ b/examples/dict_test.bpmn @@ -12,24 +12,12 @@ Flow_0k87bc6 Flow2_1770033215613 - def runTests(tests): - import io - import unittest - - suite = unittest.TestSuite() - suite.addTests(tests) - stream = io.StringIO() - result = unittest.TextTestRunner(stream=stream).run(suite) - - return { - "testsRun": result.testsRun, - "wasSuccessful": result.wasSuccessful(), - "output": stream.getvalue(), - } - + def test(): import unittest + from spiff_arena_common.tester import run_test_cases + class TestTaskData(unittest.TestCase): def test_empty_dict(self): self.assertEqual(empty_dict, {}) @@ -41,7 +29,7 @@ def test(): self.assertTrue("sam" in kv_dict, "Expected 'sam' in kv_dict") self.assertTrue("sue" in kv_dict) - return runTests([ + return run_test_cases([ TestTaskData("test_empty_dict"), TestTaskData("test_kv_dict"), ]) diff --git a/examples/gateway_test.bpmn b/examples/gateway_test.bpmn index 8462ce4..860c1d1 100644 --- a/examples/gateway_test.bpmn +++ b/examples/gateway_test.bpmn @@ -40,29 +40,17 @@ Flow2_1770640981219 Flow_1u1o29t - def runTests(tests): - import io - import unittest - - suite = unittest.TestSuite() - suite.addTests(tests) - stream = io.StringIO() - result = unittest.TextTestRunner(stream=stream).run(suite) - - return { - "testsRun": result.testsRun, - "wasSuccessful": result.wasSuccessful(), - "output": stream.getvalue(), - } - + def test(): import unittest + from spiff_arena_common.tester import run_test_cases + class TestTaskData(unittest.TestCase): def runTest(self): self.assertEqual(happy_path, 1) - return runTests([TestTaskData()]) + return run_test_cases([TestTaskData()]) spiff_testResult = test() diff --git a/examples/httpv2_test.bpmn b/examples/httpv2_test.bpmn index dd7a33f..8207cce 100644 --- a/examples/httpv2_test.bpmn +++ b/examples/httpv2_test.bpmn @@ -42,31 +42,19 @@ Flow2_1770249220377 Flow_1wg6aca - def runTests(tests): - import io - import unittest - - suite = unittest.TestSuite() - suite.addTests(tests) - stream = io.StringIO() - result = unittest.TextTestRunner(stream=stream).run(suite) - - return { - "testsRun": result.testsRun, - "wasSuccessful": result.wasSuccessful(), - "output": stream.getvalue(), - } - + def test(): import unittest + from spiff_arena_common.tester import run_test_cases + class TestTaskData(unittest.TestCase): def runTest(self): self.assertIn("body", resp_get) self.assertIn("id", resp_get["body"]) self.assertEqual(resp_get["body"]["id"], id) - return runTests([TestTaskData()]) + return run_test_cases([TestTaskData()]) spiff_testResult = test() diff --git a/examples/jfds_test.bpmn b/examples/jfds_test.bpmn index a380ffc..50a870f 100644 --- a/examples/jfds_test.bpmn +++ b/examples/jfds_test.bpmn @@ -38,31 +38,19 @@ DataStoreReference_199b8wr Property_1taen79 - def runTests(tests): - import io - import unittest - - suite = unittest.TestSuite() - suite.addTests(tests) - stream = io.StringIO() - result = unittest.TextTestRunner(stream=stream).run(suite) - - return { - "testsRun": result.testsRun, - "wasSuccessful": result.wasSuccessful(), - "output": stream.getvalue(), - } - + def test(): import unittest + from spiff_arena_common.tester import run_test_cases + class TestTaskData(unittest.TestCase): def runTest(self): x = jsonfiledatastore["x"] expected = spiff_testFixture["expected"]["x"] self.assertEqual(x, expected) - return runTests([TestTaskData()]) + return run_test_cases([TestTaskData()]) spiff_testResult = test() diff --git a/examples/jsonfiledatastore.json b/examples/jsonfiledatastore.json index 0d8ba44..1bc53a6 100644 --- a/examples/jsonfiledatastore.json +++ b/examples/jsonfiledatastore.json @@ -1 +1 @@ -{"x": 46} \ No newline at end of file +{"x": 50} \ No newline at end of file diff --git a/examples/manual_tasks_test.bpmn b/examples/manual_tasks_test.bpmn index e0a1d13..80514b2 100644 --- a/examples/manual_tasks_test.bpmn +++ b/examples/manual_tasks_test.bpmn @@ -17,29 +17,17 @@ Flow2_1770121675349 Flow_0g7mzwp - def runTests(tests): - import io - import unittest - - suite = unittest.TestSuite() - suite.addTests(tests) - stream = io.StringIO() - result = unittest.TextTestRunner(stream=stream).run(suite) - - return { - "testsRun": result.testsRun, - "wasSuccessful": result.wasSuccessful(), - "output": stream.getvalue(), - } - + def test(): import unittest + from spiff_arena_common.tester import run_test_cases + class TestTaskData(unittest.TestCase): def runTest(self): self.assertEqual(post_script_var, 2) - return runTests([TestTaskData()]) + return run_test_cases([TestTaskData()]) spiff_testResult = test() diff --git a/examples/user_task_test.bpmn b/examples/user_task_test.bpmn index f8a7518..8e253d2 100644 --- a/examples/user_task_test.bpmn +++ b/examples/user_task_test.bpmn @@ -17,29 +17,17 @@ Flow2_1770132558798 Flow_1a46c5r - def runTests(tests): - import io - import unittest - - suite = unittest.TestSuite() - suite.addTests(tests) - stream = io.StringIO() - result = unittest.TextTestRunner(stream=stream).run(suite) - - return { - "testsRun": result.testsRun, - "wasSuccessful": result.wasSuccessful(), - "output": stream.getvalue(), - } - + def test(): import unittest + from spiff_arena_common.tester import run_test_cases + class TestTaskData(unittest.TestCase): def runTest(self): self.assertEqual(some_field, spiff_testFixture["expected"]["some_field"]) - return runTests([TestTaskData()]) + return run_test_cases([TestTaskData()]) spiff_testResult = test() diff --git a/test.py b/test.py index 8b4e4c9..2d21ff8 100644 --- a/test.py +++ b/test.py @@ -3,7 +3,7 @@ # dependencies = [ # "jinja2>=3.1.6", # "jsonschema>=4.26.0", -# "spiff-arena-common==0.1.9", +# "spiff-arena-common @/home/jon/dev/spiff-arena/dist/spiff_arena_common-0.1.10-py3-none-any.whl", # "spiffworkflow==3.1.2", # ] # /// From d7137ac7337a3512404840f5811a87e3d1a6f33f Mon Sep 17 00:00:00 2001 From: Jon Herron Date: Mon, 2 Mar 2026 09:16:41 -0500 Subject: [PATCH 2/2] wip --- examples/jsonfiledatastore.json | 2 +- test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/jsonfiledatastore.json b/examples/jsonfiledatastore.json index 1bc53a6..20363bb 100644 --- a/examples/jsonfiledatastore.json +++ b/examples/jsonfiledatastore.json @@ -1 +1 @@ -{"x": 50} \ No newline at end of file +{"x": 51} \ No newline at end of file diff --git a/test.py b/test.py index 2d21ff8..ef4008c 100644 --- a/test.py +++ b/test.py @@ -3,7 +3,7 @@ # dependencies = [ # "jinja2>=3.1.6", # "jsonschema>=4.26.0", -# "spiff-arena-common @/home/jon/dev/spiff-arena/dist/spiff_arena_common-0.1.10-py3-none-any.whl", +# "spiff-arena-common==0.1.10", # "spiffworkflow==3.1.2", # ] # ///