And fixed "enabled" test for petri nets

integration/test_pn_interface.py

@@ -227,17 +227,6 @@ class TestPetrinetInterface(unittest.TestCase):
                 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")
-
-    def test_co_pn_interface_enabled_empty(self):
-        self.pn_interface_enabled_empty("CO")
-
-    def pn_interface_enabled_empty(self, mode):
-        self.assertTrue(run_file(all_files,
-            ["new", "PetriNets", "abc", "enabled"],
-            init + new_full + enabled + prompt_model, mode))
-
     def test_po_pn_interface_enabled(self):
         self.pn_interface_enabled("PO")
 
@@ -247,8 +236,8 @@ class TestPetrinetInterface(unittest.TestCase):
     def pn_interface_enabled(self, mode):
         self.assertTrue(run_file(all_files,
             do_instantiate_simple + ["enabled"],
-            did_instantiate_simple + enabled +
-            enabled_t1 + prompt_model, mode))
+            did_instantiate_simple + enabled(["t1"]) + prompt,
+            mode))
 
     def test_po_pn_interface_fire(self):
         self.pn_interface_fire("PO")
@@ -259,35 +248,8 @@ class TestPetrinetInterface(unittest.TestCase):
     def pn_interface_fire(self, mode):
         self.assertTrue(run_file(all_files,
             do_instantiate_simple + ["fire", "t1"],
-            did_instantiate_simple + ["fire", "t1"],
-            init + new_full + instantiate_transition + instantiate_place +
-            instantiate_place + instantiate_arc + instantiate_arc + fire +
-            fire_t1 + fire_finish + prompt_model, mode))
-
-    def test_po_pn_interface_fire_place(self):
-        self.pn_interface_fire_place("PO")
-
-    def test_co_pn_interface_fire_place(self):
-        self.pn_interface_fire_place("CO")
-
-    def pn_interface_fire_place(self, mode):
-        self.assertTrue(run_file(all_files,
-            ["new", "PetriNets", "abc",
-            "instantiate", "Place", "p1", "attr_add", "p1", "tokens", 5,
-            "fire", "p1"],
-            init + new_full + instantiate_place + fire + fire_no_enable +
-            prompt_model, mode))
-
-    def test_po_pn_interface_fire_unknown(self):
-        self.pn_interface_fire_unknown("PO")
-
-    def test_co_pn_interface_fire_unknown(self):
-        self.pn_interface_fire_unknown("CO")
-
-    def pn_interface_fire_unknown(self, mode):
-        self.assertTrue(run_file(all_files,
-            ["new", "PetriNets", "abc", "fire", "t1"],
-            init + new_full + fire + fire_unknown + prompt_model, mode))
+            did_instantiate_simple + fire([("p1", 3), ("p2", 1)]) + prompt,
+            mode))
 
     def test_po_pn_interface_verify_OK(self):
         self.pn_interface_verify_OK("PO")