فهرست منبع

Fixed yet another test

Yentl Van Tendeloo 9 سال پیش
والد
کامیت
e6c8720f85
1فایلهای تغییر یافته به همراه26 افزوده شده و 38 حذف شده
  1. 26 38
      integration/test_pn_interface.py

+ 26 - 38
integration/test_pn_interface.py

@@ -108,15 +108,23 @@ init = greeting + prompt
 did_instantiate_simple = init + \
                          new + \
                          loaded +\
-                         instantiate_node +\
+                         instantiate_node + \
                          prompt + \
-                         instantiate_node +\
+                         instantiate_node + \
                          prompt + \
-                         instantiate_node +\
+                         attr_add + \
                          prompt + \
-                         instantiate_edge +\
+                         instantiate_node + \
                          prompt + \
-                         instantiate_edge +\
+                         attr_add + \
+                         prompt + \
+                         instantiate_edge + \
+                         prompt + \
+                         attr_add + \
+                         prompt + \
+                         instantiate_edge + \
+                         prompt + \
+                         attr_add + \
                          prompt
 
 def list_types(t):
@@ -203,41 +211,21 @@ class TestPetrinetInterface(unittest.TestCase):
         self.pn_interface_instantiate_arcs("CO")
 
     def pn_interface_instantiate_arcs(self, mode):
-        self.assertTrue(run_file(all_files,
-            do_instantiate_simple,
-            did_instantiate_simple,
-            mode))
-
-    def test_po_pn_interface_instantiate_arcs_read(self):
-        self.pn_interface_instantiate_arcs_read("PO")
-
-    def test_co_pn_interface_instantiate_arcs_read(self):
-        self.pn_interface_instantiate_arcs_read("CO")
-
-    def pn_interface_instantiate_arcs_read(self, mode):
         self.assertTrue(run_file(all_files,
             do_instantiate_simple + [
-             "read", "p1",
-             "read", "p2",
-             "read", "t1",
-             "read", "p2t",
-             "read", "t2p"],
-            did_instantiate_simple +
-            read_p1_full + read_p2_full + read_t1_full + read_p2t_full +
-            read_t2p_full, mode))
-
-    def test_po_pn_interface_instantiate_arcs_list(self):
-        self.pn_interface_instantiate_arcs_list("PO")
-
-    def test_co_pn_interface_instantiate_arcs_list(self):
-        self.pn_interface_instantiate_arcs_list("CO")
-
-    def pn_interface_instantiate_arcs_list(self, mode):
-        self.assertTrue(run_file(all_files,
-            do_instantiate_simple + ["list"],
-            did_instantiate_simple + 
-            list_model + list_t1 + list_p1 + list_p2 + list_p2t + list_t2p +
-            prompt_model, mode))
+                    "read", "p1",
+                    "read", "p2",
+                    "read", "t1",
+                    "read", "p2t",
+                    "read", "t2p",
+                ],
+            did_instantiate_simple + \
+                read_node("p1", "Place", [], [("tokens", "Integer", 5)]) + prompt + \
+                read_node("p2", "Place", [], [("tokens", "Integer", 0)]) + prompt + \
+                read_node("t1", "Transition", [], []) + prompt + \
+                read_edge("p2t", "P2T", "p1", "t1", [], [("weight", "Integer", 2)]) + prompt + \
+                read_edge("t2p", "T2P", "t1", "p2", [], [("weight", "Integer", 1)]) + prompt,
+            mode))
 
     def test_po_pn_interface_enabled_empty(self):
         self.pn_interface_enabled_empty("PO")