Adding test

Zentetsu · Oct 10, 2020 · 74f7a2f · 74f7a2f
1 parent 356634a
commit 74f7a2f
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 96 deletions.
diff --git a/tests/test.json b/tests/test.json
@@ -1,40 +1,42 @@
 {
-    "path": "./tests/sm.py",
-    "StateMachine": {
-        "Variable": {
-            "v1": 0,
-            "v2": false
-        },
-        "State": {
-            "s0": {
-                "id": 0,
-                "action": "fa1",
-                "encapsulation": false
+    "SM": {
+        "path": "./tests/sm.py",
+        "StateMachine": {
+            "Variable": {
+                "v1": 0,
+                "v2": false
             },
-            "s1": {
-                "id": 1,
-                "action": "fa2",
-                "encapsulation": false
-            }
-        },
-        "Transition": {
-            "in": {
-                "id": 0,
-                "id_in": "inf",
-                "id_out": 0,
-                "evaluation": "ft1"
-            },
-            "out": {
-                "id": 1,
-                "id_in": 1,
-                "id_out": "inf",
-                "evaluation": "ft2"
+            "State": {
+                "s0": {
+                    "id": 0,
+                    "action": "fa1",
+                    "encapsulation": false
+                },
+                "s1": {
+                    "id": 1,
+                    "action": "fa2",
+                    "encapsulation": false
+                }
             },
-            "t0": {
-                "id": 2,
-                "id_in": 0,
-                "id_out": 1,
-                "evaluation": "ft3"
+            "Transition": {
+                "in": {
+                    "id": 0,
+                    "id_in": "inf",
+                    "id_out": 0,
+                    "evaluation": "ft1"
+                },
+                "out": {
+                    "id": 1,
+                    "id_in": 1,
+                    "id_out": "inf",
+                    "evaluation": "ft2"
+                },
+                "t0": {
+                    "id": 2,
+                    "id_in": 0,
+                    "id_out": 1,
+                    "evaluation": "ft3"
+                }
             }
         }
     }

diff --git a/tests/test2.json b/tests/test2.json
@@ -1,68 +1,70 @@
 {
-    "path": "./tests/sm2.py",
-    "StateMachine": {
-        "Variable": {
-            "v1": 0,
-            "v2": false
-        },
-        "State": {
-            "s0": {
-                "id": 0,
-                "action": "fa1",
-                "encapsulation": false
+    "SM": {
+        "path": "./tests/sm2.py",
+        "StateMachine": {
+            "Variable": {
+                "v1": 0,
+                "v2": false
             },
-            "s1": {
-                "id": 1,
-                "action": "fa2",
-                "encapsulation": true
+            "State": {
+                "s0": {
+                    "id": 0,
+                    "action": "fa1",
+                    "encapsulation": false
+                },
+                "s1": {
+                    "id": 1,
+                    "action": "fa2",
+                    "encapsulation": true
+                },
+                "s3": {
+                    "id": 2,
+                    "action": "fa3",
+                    "encapsulation": false
+                },
+                "s4": {
+                    "id": 3,
+                    "action": "fa4",
+                    "encapsulation": false
+                }
             },
-            "s3": {
-                "id": 2,
-                "action": "fa3",
-                "encapsulation": false
-            },
-            "s4": {
-                "id": 3,
-                "action": "fa4",
-                "encapsulation": false
-            }
-        },
-        "Transition": {
-            "in": {
-                "id": 0,
-                "id_in": "inf",
-                "id_out": 0,
-                "evaluation": "ft1"
-            },
-            "out": {
-                "id": 1,
-                "id_in": 3,
-                "id_out": "inf",
-                "evaluation": "ft2"
-            },
-            "t0": {
-                "id": 2,
-                "id_in": 0,
-                "id_out": 1,
-                "evaluation": "ft3"
-            },
-            "t1": {
-                "id": 3,
-                "id_in": 1,
-                "id_out": 2,
-                "evaluation": "ft4"
-            },
-            "t2": {
-                "id": 4,
-                "id_in": 2,
-                "id_out": -1,
-                "evaluation": "ft4"
-            },
-            "t3": {
-                "id": 5,
-                "id_in": -1,
-                "id_out": 3,
-                "evaluation": "ft5"
+            "Transition": {
+                "in": {
+                    "id": 0,
+                    "id_in": "inf",
+                    "id_out": 0,
+                    "evaluation": "ft1"
+                },
+                "out": {
+                    "id": 1,
+                    "id_in": 3,
+                    "id_out": "inf",
+                    "evaluation": "ft2"
+                },
+                "t0": {
+                    "id": 2,
+                    "id_in": 0,
+                    "id_out": 1,
+                    "evaluation": "ft3"
+                },
+                "t1": {
+                    "id": 3,
+                    "id_in": 1,
+                    "id_out": 2,
+                    "evaluation": "ft4"
+                },
+                "t2": {
+                    "id": 4,
+                    "id_in": 2,
+                    "id_out": -1,
+                    "evaluation": "ft4"
+                },
+                "t3": {
+                    "id": 5,
+                    "id_in": -1,
+                    "id_out": 3,
+                    "evaluation": "ft5"
+                }
             }
         }
     }

diff --git a/tests/test_StateMachine.py b/tests/test_StateMachine.py
@@ -158,6 +158,18 @@ def test_loadJSONFile():
         print("FAILED")
         assert False
 
+def test_loadJSONFile2():
+    print("load JSON file 2:", end=" ")
+    try:
+        sm = StateMachine("test")
+        sm.loadJSON("./tests/StateMachine.json")
+        sm.start()
+        print("SUCCESSED")
+        assert True
+    except:
+        print("FAILED")
+        assert False
+
 def test_runEncSM():
     print("Run Encapsuled StateMachine:", end=" ")
     try:
@@ -179,5 +191,6 @@ def test_runEncSM():
 test_simpleSM()
 test_runSimpleSM()
 test_loadJSONFile()
+test_loadJSONFile2()
 test_runEncSM()
 print("-"*10)