Jelajahi Sumber

Fixed pn_interface tests

Yentl Van Tendeloo 9 tahun lalu
induk
melakukan
5ac63c708e
1 mengubah file dengan 14 tambahan dan 7 penghapusan
  1. 14 7
      integration/test_pn_interface.py

+ 14 - 7
integration/test_pn_interface.py

@@ -295,8 +295,11 @@ class TestPetrinetInterface(unittest.TestCase):
             "instantiate", "Transition", "t1",
             "instantiate", "Place", "p1", "attr_add", "p1", "tokens", 5,
             "instantiate", "P2T", "p2t", "t1", "p1", "attr_add", "p2t", "weight", 2, "verify"],
-            init + new_full + instantiate_transition +
-            instantiate_place + instantiate_arc + verify_fail_structure,
+            init + new + loaded + \
+                instantiate_node + prompt + \
+                instantiate_node + prompt + attr_add + prompt + \
+                instantiate_edge + prompt + attr_add + prompt + \
+                verify_fail_structure,
             mode))
 
     def test_po_pn_interface_types(self):
@@ -307,7 +310,9 @@ class TestPetrinetInterface(unittest.TestCase):
 
     def pn_interface_types(self, mode):
         self.assertTrue(run_file(all_files,
-            ["new", "PetriNets", "abc", "types"], init + new_full + types_full, mode))
+            ["new", "PetriNets", "abc", "types"],
+            init + new + loaded + list_types([("Place", "Class"), ("Transition", "Class"), ("P2T", "l5"), ("T2P", "l5"), ("Integer", "Type")]),
+            mode))
 
     def test_po_pn_interface_modify_place(self):
         self.pn_interface_modify_place("PO")
@@ -321,7 +326,9 @@ class TestPetrinetInterface(unittest.TestCase):
                 "instantiate", "Place", "p1", "attr_add", "p1", "tokens", 5,
                 "read", "p1",
                 "modify", "p1", "tokens", 1, "read", "p1"],
-            init + new_full + instantiate + instantiate_name +
-            instantiate_tokens + instantiate_ok + prompt_model + read +
-            read_p1 + prompt_menu + modify_place_full + read + read_p1_1 +
-            prompt_menu, mode))
+            init + new + loaded + \
+                instantiate_node + prompt + attr_add + prompt + \
+                read_node("p1", "Place", [], [("tokens", "Integer", 5)]) + prompt + \
+                modify + prompt + \
+                read_node("p1", "Place", [], [("tokens", "Integer", 1)]) + prompt,
+            mode))