Browse Source

Fixed add_MT_instance test

Yentl Van Tendeloo 8 years ago
parent
commit
be524b0c16
3 changed files with 14 additions and 5 deletions
  1. BIN
      bootstrap/bootstrap.m.gz
  2. 9 2
      core/core_algorithm.alc
  3. 5 3
      integration/test_mvc.py

BIN
bootstrap/bootstrap.m.gz


+ 9 - 2
core/core_algorithm.alc

@@ -310,6 +310,9 @@ Void function user_function_skip_init(user_id : String):
 			output("    transformation_add_AL           -- [TODO] Initialize a new action language transformation")
 			output("    transformation_add_AL           -- [TODO] Initialize a new action language transformation")
 			output("    transformation_add_EXT          -- [TODO] Initialize a new external tool transformation")
 			output("    transformation_add_EXT          -- [TODO] Initialize a new external tool transformation")
 			output("    transformation_execute          -- Execute a transformation on a set of input models")
 			output("    transformation_execute          -- Execute a transformation on a set of input models")
+			output("    transformation_list             -- List all model transformations")
+			output("    transformation_list_full        -- List all model transformations with permissions")
+			output("    transformation_detail           -- List transformation details")
 			output("")
 			output("")
 			output("Model permission operations")
 			output("Model permission operations")
 			output("    permission_modify               -- Change model permissions")
 			output("    permission_modify               -- Change model permissions")
@@ -748,9 +751,13 @@ Void function user_function_skip_init(user_id : String):
 
 
 						// Extend metadata with info on source and target
 						// Extend metadata with info on source and target
 						while (read_nr_out(source) > 0):
 						while (read_nr_out(source) > 0):
-							instantiate_link(core, "transformInput", "", new_model_id, set_pop(source))
+							log("Instantiate source link")
+							instantiate_link(core, "transformInput", "", model_id, set_pop(source))
+							log("OK")
 						while (read_nr_out(target) > 0):
 						while (read_nr_out(target) > 0):
-							instantiate_link(core, "transformOutput", "", new_model_id, set_pop(target))
+							log("Instantiate target link")
+							instantiate_link(core, "transformOutput", "", model_id, set_pop(target))
+							log("OK")
 
 
 						output("Meta-info correctly set!")
 						output("Meta-info correctly set!")
 					else:
 					else:

+ 5 - 3
integration/test_mvc.py

@@ -299,6 +299,7 @@ class TestModelverseCore(unittest.TestCase):
                 "",
                 "",
                 "",
                 "",
                 "PetriNets_Print",
                 "PetriNets_Print",
+                "model_list_full",
             ],
             ],
             [   "Desired username for admin user?",
             [   "Desired username for admin user?",
                 "Welcome to the Model Management Interface v2.0!",
                 "Welcome to the Model Management Interface v2.0!",
@@ -334,14 +335,15 @@ class TestModelverseCore(unittest.TestCase):
                 "Model added as source",
                 "Model added as source",
                 "Which ones do you want to use as target (empty string to finish)?",
                 "Which ones do you want to use as target (empty string to finish)?",
                 "Name of new transformation?",
                 "Name of new transformation?",
-                "Met-info correctly set!",
+                "Meta-info correctly set!",
+                "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
                      "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
                      "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    14   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody    14   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody    14   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody    14   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody    328   PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody    328   PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   0   PetriNets_Print : PetriNets_RAM",
-                     "  200  root admin    79   core : CoreFormalism"]),
+                     "  200  root nobody    0   PetriNets_Print : PetriNets_RAM",
+                     "  200  root admin    90   core : CoreFormalism"]),
                 "Ready for command...",
                 "Ready for command...",
             ],
             ],
             mode))
             mode))