Browse Source

Cleaned up the frequent use of model_list, and added ProcessModel

Yentl Van Tendeloo 8 years ago
parent
commit
13234b7a09
2 changed files with 134 additions and 222 deletions
  1. 22 3
      core/core_algorithm.alc
  2. 112 219
      integration/test_mvc.py

+ 22 - 3
core/core_algorithm.alc

@@ -14,7 +14,6 @@ Element core = ?
 
 
 String core_location = "models/CoreFormalism"
 String core_location = "models/CoreFormalism"
 String core_model_location = "core"
 String core_model_location = "core"
-String coreM_model_location = "models/core"
 
 
 Void function main():
 Void function main():
 	// Initialize the Core Formalism
 	// Initialize the Core Formalism
@@ -29,13 +28,21 @@ Void function main():
 	String core_formalism
 	String core_formalism
 	Element scd
 	Element scd
 	Element al
 	Element al
-
+	Element pm
+	String pm_model
+	String coreM_model_location 
+	String pm_location
 	String scd_location
 	String scd_location
 	String al_location
 	String al_location
+
+	coreM_model_location = "models/core"
+	pm_location = "models/ProcessModel"
 	scd_location = "models/SimpleClassDiagrams"
 	scd_location = "models/SimpleClassDiagrams"
-	scd = import_node(scd_location)
 	al_location = "models/ActionLanguage"
 	al_location = "models/ActionLanguage"
+
+	scd = import_node(scd_location)
 	al = import_node(al_location)
 	al = import_node(al_location)
+	pm = import_node(pm_location)
 
 
 	// Create the Model itself and make public
 	// Create the Model itself and make public
 	core_formalism = import_node(core_location)
 	core_formalism = import_node(core_location)
@@ -99,6 +106,18 @@ Void function main():
 	instantiate_link(core, "group", "", scd_model, admin_group)
 	instantiate_link(core, "group", "", scd_model, admin_group)
 	instantiate_link(core, "owner", "", scd_model, admin_user)
 	instantiate_link(core, "owner", "", scd_model, admin_user)
 
 
+	// Add the Process Model formalism
+	pm_model = instantiate_node(core, "Model", "")
+	instantiate_attribute(core, pm_model, "name", "ProcessModel")
+	instantiate_attribute(core, pm_model, "location", pm_location + "/model")
+	instantiate_attribute(core, pm_model, "permissions", "221")
+	instance_of = instantiate_link(core, "instanceOf", "", pm_model, scd_model)
+	instantiate_attribute(core, instance_of, "type_mapping", pm["type_mapping"])
+
+	// Make necessary links for the formalism to the owners
+	instantiate_link(core, "group", "", pm_model, admin_group)
+	instantiate_link(core, "owner", "", pm_model, admin_user)
+
 	// Add the Action Language formalism
 	// Add the Action Language formalism
 	al_model = instantiate_node(core, "Model", "")
 	al_model = instantiate_node(core, "Model", "")
 	instantiate_attribute(core, al_model, "name", "ActionLanguage")
 	instantiate_attribute(core, al_model, "name", "ActionLanguage")

+ 112 - 219
integration/test_mvc.py

@@ -2,9 +2,24 @@ import unittest
 
 
 from utils import *
 from utils import *
 
 
+model_list = set(["  SimpleClassDiagrams : SimpleClassDiagrams",
+                  "  CoreFormalism : SimpleClassDiagrams",
+                  "  ManualOperation : SimpleClassDiagrams",
+                  "  ActionLanguage : SimpleClassDiagrams",
+                  "  ProcessModel : SimpleClassDiagrams",
+                  "  core : CoreFormalism"])
+
+model_full_list = set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
+                       "  221  root admin   CoreFormalism : SimpleClassDiagrams",
+                       "  221  root admin   ActionLanguage : SimpleClassDiagrams",
+                       "  221  root admin   ManualOperation : SimpleClassDiagrams",
+                       "  221  root admin   ProcessModel : SimpleClassDiagrams",
+                       "  200  root admin   core : CoreFormalism"])
+
 all_files = [   "core/mini_modify.alc",
 all_files = [   "core/mini_modify.alc",
                 "core/core_formalism.mvc",
                 "core/core_formalism.mvc",
                 "core/core_algorithm.alc",
                 "core/core_algorithm.alc",
+                "core/pm.mvc",
                 "primitives.alc",
                 "primitives.alc",
                 "object_operations.alc",
                 "object_operations.alc",
                 "conformance_scd.alc",
                 "conformance_scd.alc",
@@ -32,11 +47,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Welcome to the Model Management Interface v2.0!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                model_list,
             ]))
             ]))
 
 
     def test_list_full(self):
     def test_list_full(self):
@@ -51,11 +62,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Welcome to the Model Management Interface v2.0!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list,
             ]))
             ]))
 
 
     def test_model_add_empty(self):
     def test_model_add_empty(self):
@@ -81,19 +88,11 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
-                     "  Empty : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
-                "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  200  root nobody   Empty : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_list | 
+                set(["  Empty : SimpleClassDiagrams",]),
+                "Ready for command...",
+                model_full_list |
+                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
             ]))
             ]))
 
 
     def test_model_empty_modify(self):
     def test_model_empty_modify(self):
@@ -126,19 +125,11 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  Empty : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                model_list |
+                set(["  Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  200  root nobody   Empty : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "Which model do you want to modify?",
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
                 "Model loaded, ready for commands!",
@@ -149,12 +140,8 @@ class TestModelverseCore(unittest.TestCase):
                 "Instantiation successful!",
                 "Instantiation successful!",
                 "Please give your command.",
                 "Please give your command.",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root nobody   Empty : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
             ]))
             ]))
 
 
@@ -203,12 +190,8 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  200  root nobody   Empty : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "Which model do you want to modify?",
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
                 "Model loaded, ready for commands!",
@@ -219,23 +202,15 @@ class TestModelverseCore(unittest.TestCase):
                 "Instantiation successful!",
                 "Instantiation successful!",
                 "Please give your command.",
                 "Please give your command.",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root nobody   Empty : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "Which model to overwrite?",
                 "Which model to overwrite?",
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Model overwrite success!",
                 "Model overwrite success!",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root nobody   Empty : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "Which model do you want to modify?",
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
                 "Model loaded, ready for commands!",
@@ -275,24 +250,16 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "Formalisms to include (terminate with empty string)?",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
             ]))
             ]))
 
 
@@ -333,24 +300,16 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "Formalisms to include (terminate with empty string)?",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "RAMified metamodel to use?",
                 "RAMified metamodel to use?",
                 "Supported metamodels:",
                 "Supported metamodels:",
@@ -363,15 +322,11 @@ class TestModelverseCore(unittest.TestCase):
                 "Name of new transformation?",
                 "Name of new transformation?",
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
                      "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_Print : PetriNets_RAM",
-                     "  200  root admin   core : CoreFormalism"]),
+                     "  200  root nobody   PetriNets_Print : PetriNets_RAM",]),
                 "Ready for command...",
                 "Ready for command...",
                 set(["[ModelTransformation] PetriNets_Print : PetriNets_RAM",
                 set(["[ModelTransformation] PetriNets_Print : PetriNets_RAM",
                     ]),
                     ]),
@@ -416,24 +371,16 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "Formalisms to include (terminate with empty string)?",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root admin   core : CoreFormalism"]),
+                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 "RAMified metamodel to use?",
                 "RAMified metamodel to use?",
                 "Supported metamodels:",
                 "Supported metamodels:",
@@ -500,26 +447,18 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root nobody   my_pn : PetriNets",
-                     "  200  root admin   core : CoreFormalism"]),
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
+                     "  200  root nobody   my_pn : PetriNets",]),
                 "Ready for command...",
                 "Ready for command...",
                 "Formalisms to include (terminate with empty string)?",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 "Ready for command...",
-                set(["  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin   ActionLanguage : SimpleClassDiagrams",
-                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  221  root admin   ManualOperation : SimpleClassDiagrams",
+                model_full_list |
+                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   my_pn : PetriNets",
-                     "  200  root admin   core : CoreFormalism"]),
+                     "  200  root nobody   my_pn : PetriNets",]),
                 "Ready for command...",
                 "Ready for command...",
                 "RAMified metamodel to use?",
                 "RAMified metamodel to use?",
                 "Supported metamodels:",
                 "Supported metamodels:",
@@ -675,30 +614,24 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  my_pn : PetriNets",
                      "  my_pn : PetriNets",
-                     "  PetriNets_Runtime : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                     "  PetriNets_Runtime : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_add_MT_language
                 # transformation_add_MT_language
                 "Formalisms to include (terminate with empty string)?",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  PetriNets_Runtime : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
+                     "  my_pn : PetriNets",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  core : CoreFormalism"]),
+                     "  PetriNets_Runtime : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 # model_modify
                 # model_modify
                 "Which model do you want to modify?",
                 "Which model do you want to modify?",
@@ -794,20 +727,17 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  PetriNets_Runtime : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
+                     "  my_pn : PetriNets",
+                     "  __merged_PetriNets_RAM : SimpleClassDiagrams",
+                     "  PetriNets_RAM : SimpleClassDiagrams",
                      "  pn_print : PetriNets_RAM",
                      "  pn_print : PetriNets_RAM",
                      "  pn_design_to_runtime : PetriNets_RAM",
                      "  pn_design_to_runtime : PetriNets_RAM",
-                     "  ManualOperation : SimpleClassDiagrams",
                      "  pn_runtime_to_design : PetriNets_RAM",
                      "  pn_runtime_to_design : PetriNets_RAM",
                      "  pn_step : PetriNets_RAM",
                      "  pn_step : PetriNets_RAM",
-                     "  __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  PetriNets_RAM : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                     "  PetriNets_Runtime : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_list
                 # transformation_list
                 set(["[ModelTransformation] pn_print : PetriNets_RAM",
                 set(["[ModelTransformation] pn_print : PetriNets_RAM",
@@ -1009,30 +939,24 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  my_pn : PetriNets",
                      "  my_pn : PetriNets",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
-                     "  PetriNets_Runtime : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                     "  PetriNets_Runtime : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_add_MT_language
                 # transformation_add_MT_language
                 "Formalisms to include (terminate with empty string)?",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  PetriNets_Runtime : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
+                     "  my_pn : PetriNets",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  core : CoreFormalism"]),
+                     "  PetriNets_Runtime : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 # model_modify
                 # model_modify
                 "Which model do you want to modify?",
                 "Which model do you want to modify?",
@@ -1128,20 +1052,17 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  PetriNets_Runtime : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
+                     "  my_pn : PetriNets",
+                     "  __merged_PetriNets_RAM : SimpleClassDiagrams",
+                     "  PetriNets_RAM : SimpleClassDiagrams",
                      "  pn_print : PetriNets_RAM",
                      "  pn_print : PetriNets_RAM",
                      "  pn_design_to_runtime : PetriNets_RAM",
                      "  pn_design_to_runtime : PetriNets_RAM",
                      "  pn_runtime_to_design : PetriNets_RAM",
                      "  pn_runtime_to_design : PetriNets_RAM",
-                     "  ManualOperation : SimpleClassDiagrams",
                      "  pn_step : PetriNets_RAM",
                      "  pn_step : PetriNets_RAM",
-                     "  __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  PetriNets_RAM : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  core : CoreFormalism"]),
+                     "  PetriNets_Runtime : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_list
                 # transformation_list
                 set(["[ModelTransformation] pn_print : PetriNets_RAM",
                 set(["[ModelTransformation] pn_print : PetriNets_RAM",
@@ -1297,30 +1218,23 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  PetriNets : SimpleClassDiagrams",
+                model_list |
+                set(["  PetriNets : SimpleClassDiagrams",
                      "  my_pn : PetriNets",
                      "  my_pn : PetriNets",
-                     "  PetriNets_Runtime : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                     "  PetriNets_Runtime : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_add_MT_language
                 # transformation_add_MT_language
                 "Formalisms to include (terminate with empty string)?",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  core : CoreFormalism"]),
+                     "  my_pn : PetriNets",]),
                 "Ready for command...",
                 "Ready for command...",
                 # model_modify
                 # model_modify
                 "Which model do you want to modify?",
                 "Which model do you want to modify?",
@@ -1410,20 +1324,17 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  pn_print : PetriNets_RAM",
                      "  pn_print : PetriNets_RAM",
                      "  pn_design_to_runtime : PetriNets_RAM",
                      "  pn_design_to_runtime : PetriNets_RAM",
                      "  pn_runtime_to_design : PetriNets_RAM",
                      "  pn_runtime_to_design : PetriNets_RAM",
-                     "  ManualOperation : SimpleClassDiagrams",
                      "  pn_step : ActionLanguage",
                      "  pn_step : ActionLanguage",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                     "  my_pn : PetriNets",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_list
                 # transformation_list
                 set(["[ModelTransformation] pn_print : PetriNets_RAM",
                 set(["[ModelTransformation] pn_print : PetriNets_RAM",
@@ -1615,30 +1526,24 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  my_pn : PetriNets",
                      "  my_pn : PetriNets",
-                     "  PetriNets_Runtime : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                     "  PetriNets_Runtime : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_add_MT_language
                 # transformation_add_MT_language
                 "Formalisms to include (terminate with empty string)?",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets_Runtime : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  core : CoreFormalism"]),
+                     "  my_pn : PetriNets",]),
                 "Ready for command...",
                 "Ready for command...",
                 # model_modify
                 # model_modify
                 "Which model do you want to modify?",
                 "Which model do you want to modify?",
@@ -1727,21 +1632,18 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Waiting for model constructors...",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  pn_print : PetriNets_RAM",
                      "  pn_print : PetriNets_RAM",
                      "  pn_design_to_runtime : ManualOperation",
                      "  pn_design_to_runtime : ManualOperation",
-                     "  ManualOperation : SimpleClassDiagrams",
                      "  pn_runtime_to_design : PetriNets_RAM",
                      "  pn_runtime_to_design : PetriNets_RAM",
                      "  pn_step : PetriNets_RAM",
                      "  pn_step : PetriNets_RAM",
                      "  __merged_pn_design_to_runtime : SimpleClassDiagrams",
                      "  __merged_pn_design_to_runtime : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  core : CoreFormalism"]),
+                     "  my_pn : PetriNets",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_list
                 # transformation_list
                 set(["[ModelTransformation] pn_print : PetriNets_RAM",
                 set(["[ModelTransformation] pn_print : PetriNets_RAM",
@@ -1962,17 +1864,14 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  Control_PW : SimpleClassDiagrams",
                      "  Control_PW : SimpleClassDiagrams",
                      "  Environment_PW : SimpleClassDiagrams",
                      "  Environment_PW : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
                      "  Description_PW : SimpleClassDiagrams",
                      "  Description_PW : SimpleClassDiagrams",
                      "  control_model : Control_PW",
                      "  control_model : Control_PW",
                      "  environment_model : Environment_PW",
                      "  environment_model : Environment_PW",
-                     "  description_model : Description_PW",
-                     "  core : CoreFormalism"]),
+                     "  description_model : Description_PW",]),
                 "Ready for command...",
                 "Ready for command...",
                 # verify
                 # verify
                 "Which model to verify?",
                 "Which model to verify?",
@@ -2039,14 +1938,11 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Model upload success!",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
                      "  ReachabilityGraph : SimpleClassDiagrams",
                      "  ReachabilityGraph : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  core : CoreFormalism"]),
+                     "  my_pn : PetriNets",]),
                 "Ready for command...",
                 "Ready for command...",
                 # transformation_add_AL
                 # transformation_add_AL
                 "Which metamodels do you want to use as source for the action code (empty string to finish)?",
                 "Which metamodels do you want to use as source for the action code (empty string to finish)?",
@@ -2062,14 +1958,11 @@ class TestModelverseCore(unittest.TestCase):
                 "Which model to create for target element ReachabilityGraph",
                 "Which model to create for target element ReachabilityGraph",
                 "Ready for command...",
                 "Ready for command...",
                 # model_list
                 # model_list
-                set(["  SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  ActionLanguage : SimpleClassDiagrams",
-                     "  CoreFormalism : SimpleClassDiagrams",
+                model_list |
+                set([
                      "  PetriNets : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
-                     "  my_pn_reachability : ReachabilityGraph",
                      "  ReachabilityGraph : SimpleClassDiagrams",
                      "  ReachabilityGraph : SimpleClassDiagrams",
-                     "  ManualOperation : SimpleClassDiagrams",
-                     "  my_pn : PetriNets",
-                     "  core : CoreFormalism"]),
+                     "  my_pn_reachability : ReachabilityGraph",
+                     "  my_pn : PetriNets",]),
             ]))
             ]))
     """
     """