Fixed MvC tests

core/core_algorithm.alc

@@ -1499,7 +1499,7 @@ Void function user_function_skip_init(user_id : String):
 				group = read_attribute(core, set_pop(allAssociationDestinations(core, m, "group")), "name")
 				name = read_attribute(core, m, "name")
 				type = read_attribute(core, set_pop(allAssociationDestinations(core, m, "instanceOf")), "name")
-				output((((((((("  " + permissions) + "  ") + owner) + " ") + group) + "   ") + ((("[" + read_type(core, m)) + "] ") + name)) + " : ") + type)
+				output((((((((("  " + permissions) + " ") + owner) + " ") + group) + " ") + ((("[" + read_type(core, m)) + "] ") + name)) + " : ") + type)
 
 		elif (cmd == "permission_modify"):
 			String permissions

integration/test_mvc.py

@@ -10,13 +10,13 @@ model_list = set(["  SimpleClassDiagrams : SimpleClassDiagrams",
                   "  Tracability : 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",
-                       "  221  root admin   Tracability : SimpleClassDiagrams",
-                       "  200  root admin   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",
+                       "  221 root admin Tracability : SimpleClassDiagrams",
+                       "  200 root admin core : CoreFormalism"])
 
 all_files = [   "core/mini_modify.alc",
                 "core/core_formalism.mvc",
@@ -95,7 +95,7 @@ class TestModelverseCore(unittest.TestCase):
                 set(["  Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
+                set(["  200 root nobody Empty : SimpleClassDiagrams",]),
             ]))
 
     def test_model_empty_modify(self):
@@ -132,19 +132,21 @@ class TestModelverseCore(unittest.TestCase):
                 set(["  Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
+                set(["  200 root nobody Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Type to instantiate?",
                 "Name of new element?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
+                set(["  200 root nobody Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
             ]))
 
@@ -194,29 +196,32 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
+                set(["  200 root nobody Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Type to instantiate?",
                 "Name of new element?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
+                set(["  200 root nobody Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Which model to overwrite?",
                 "Waiting for model constructors...",
                 "Model overwrite success!",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   Empty : SimpleClassDiagrams",]),
+                set(["  200 root nobody Empty : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "List of all elements:",
@@ -254,15 +259,15 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",
+                     "  200 root nobody __merged_PetriNets_RAM : SimpleClassDiagrams",
+                     "  200 root nobody PetriNets_RAM : SimpleClassDiagrams",]),
                 "Ready for command...",
             ]))
 
@@ -304,15 +309,15 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",
+                     "  200 root nobody __merged_PetriNets_RAM : SimpleClassDiagrams",
+                     "  200 root nobody PetriNets_RAM : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "RAMified metamodel to use?",
                 "Supported metamodels:",
@@ -324,15 +329,15 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_Print : PetriNets_RAM",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",
+                     "  200 root nobody __merged_PetriNets_RAM : SimpleClassDiagrams",
+                     "  200 root nobody PetriNets_RAM : SimpleClassDiagrams",
+                     "  200 root nobody PetriNets_Print : PetriNets_RAM",]),
                 "Ready for command...",
                 set(["[ModelTransformation] PetriNets_Print : PetriNets_RAM",
                     ]),
                 "Ready for command...",
-                set(["  200  root nobody   [ModelTransformation] PetriNets_Print : PetriNets_RAM"
+                set(["  200 root nobody [ModelTransformation] PetriNets_Print : PetriNets_RAM"
                     ]),
                 "Ready for command...",
             ]))
@@ -373,15 +378,15 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",
+                     "  200 root nobody __merged_PetriNets_RAM : SimpleClassDiagrams",
+                     "  200 root nobody PetriNets_RAM : SimpleClassDiagrams",]),
                 "Ready for command...",
                 "RAMified metamodel to use?",
                 "Supported metamodels:",
@@ -392,7 +397,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Name of new operation?",
                 "Waiting for model constructors...",
                 "Ready for command...",
-                set(["  200  root nobody   [ModelTransformation] PetriNets_Print : PetriNets_RAM"
+                set(["  200 root nobody [ModelTransformation] PetriNets_Print : PetriNets_RAM"
                     ]),
                 "Ready for command...",
             ]))
@@ -447,17 +452,17 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root nobody   my_pn : PetriNets",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",
+                     "  200 root nobody my_pn : PetriNets",]),
                 "Ready for command...",
                 "Formalisms to include (terminate with empty string)?",
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 set(model_full_list) |
-                set(["  200  root nobody   PetriNets : SimpleClassDiagrams",
-                     "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
-                     "  200  root nobody   my_pn : PetriNets",]),
+                set(["  200 root nobody PetriNets : SimpleClassDiagrams",
+                     "  200 root nobody __merged_PetriNets_RAM : SimpleClassDiagrams",
+                     "  200 root nobody PetriNets_RAM : SimpleClassDiagrams",
+                     "  200 root nobody my_pn : PetriNets",]),
                 "Ready for command...",
                 "RAMified metamodel to use?",
                 "Supported metamodels:",
@@ -468,7 +473,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Name of new operation?",
                 "Waiting for model constructors...",
                 "Ready for command...",
-                set(["  200  root nobody   [ModelTransformation] PetriNets_Print : PetriNets_RAM"
+                set(["  200 root nobody [ModelTransformation] PetriNets_Print : PetriNets_RAM"
                     ]),
                 "Ready for command...",
                 "Which transformation do you want to execute?",
@@ -645,6 +650,7 @@ class TestModelverseCore(unittest.TestCase):
                 # model_modify
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 # instantiate 1
@@ -653,6 +659,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 2
                 "Type to instantiate?",
@@ -660,6 +667,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 3
                 "Type to instantiate?",
@@ -667,6 +675,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 4
                 "Type to instantiate?",
@@ -674,6 +683,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 "Ready for command...",
                 # transformation_RAMify
@@ -951,6 +961,7 @@ class TestModelverseCore(unittest.TestCase):
                 # model_modify
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 # instantiate 1
@@ -959,6 +970,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 2
                 "Type to instantiate?",
@@ -966,6 +978,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 3
                 "Type to instantiate?",
@@ -973,6 +986,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 4
                 "Type to instantiate?",
@@ -980,6 +994,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 "Ready for command...",
                 # transformation_RAMify
@@ -1216,6 +1231,7 @@ class TestModelverseCore(unittest.TestCase):
                 # model_modify
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 # instantiate 1
@@ -1224,6 +1240,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 2
                 "Type to instantiate?",
@@ -1231,6 +1248,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 3
                 "Type to instantiate?",
@@ -1238,6 +1256,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 4
                 "Type to instantiate?",
@@ -1245,6 +1264,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 "Ready for command...",
                 # transformation_RAMify
@@ -1512,6 +1532,7 @@ class TestModelverseCore(unittest.TestCase):
                 # model_modify
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 # instantiate 1
@@ -1520,6 +1541,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 2
                 "Type to instantiate?",
@@ -1527,6 +1549,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 3
                 "Type to instantiate?",
@@ -1534,6 +1557,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 # instantiate 4
                 "Type to instantiate?",
@@ -1541,6 +1565,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Source name?",
                 "Destination name?",
                 "Instantiation successful!",
+                None,
                 "Please give your command.",
                 "Ready for command...",
                 # transformation_RAMify
@@ -1619,12 +1644,14 @@ class TestModelverseCore(unittest.TestCase):
                 "Which model to create for target type PetriNets_Runtime",
                 "Please perform manual operation \"pn_design_to_runtime\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 # instantiate p1
                     "Type to instantiate?",
                     "Name of new element?",
                     "Instantiation successful!",
+                None,
                     "Please give your command.",
                     "Which element do you want to assign an attribute to?",
                     "Which attribute do you wish to assign?",
@@ -1640,6 +1667,7 @@ class TestModelverseCore(unittest.TestCase):
                     "Type to instantiate?",
                     "Name of new element?",
                     "Instantiation successful!",
+                None,
                     "Please give your command.",
                     "Which element do you want to assign an attribute to?",
                     "Which attribute do you wish to assign?",
@@ -1655,6 +1683,7 @@ class TestModelverseCore(unittest.TestCase):
                     "Type to instantiate?",
                     "Name of new element?",
                     "Instantiation successful!",
+                None,
                     "Please give your command.",
                     "Which element do you want to assign an attribute to?",
                     "Which attribute do you wish to assign?",
@@ -1670,6 +1699,7 @@ class TestModelverseCore(unittest.TestCase):
                     "Type to instantiate?",
                     "Name of new element?",
                     "Instantiation successful!",
+                None,
                     "Please give your command.",
                     "Which element do you want to assign an attribute to?",
                     "Which attribute do you wish to assign?",
@@ -1682,6 +1712,7 @@ class TestModelverseCore(unittest.TestCase):
                     "Source name?",
                     "Destination name?",
                     "Instantiation successful!",
+                None,
                     "Please give your command.",
                     "Which element do you want to assign an attribute to?",
                     "Which attribute do you wish to assign?",
@@ -1694,6 +1725,7 @@ class TestModelverseCore(unittest.TestCase):
                     "Source name?",
                     "Destination name?",
                     "Instantiation successful!",
+                None,
                     "Please give your command.",
                     "Which element do you want to assign an attribute to?",
                     "Which attribute do you wish to assign?",
@@ -1706,6 +1738,7 @@ class TestModelverseCore(unittest.TestCase):
                     "Source name?",
                     "Destination name?",
                     "Instantiation successful!",
+                    None,
                     "Please give your command.",
                     "Which element do you want to assign an attribute to?",
                     "Which attribute do you wish to assign?",
@@ -1913,12 +1946,14 @@ class TestModelverseCore(unittest.TestCase):
                 "Model prefix to use?",
                     "Please perform manual operation \"refine_PN\"",
                     "Model loaded, ready for commands!",
+                    "Mode: r/w",
                     "Use 'help' command for a list of possible commands",
                     "Please give your command.",
                     # instantiate p1
                         "Type to instantiate?",
                         "Name of new element?",
                         "Instantiation successful!",
+                        None,
                         "Please give your command.",
                         "Which element do you want to assign an attribute to?",
                         "Which attribute do you wish to assign?",
@@ -1934,6 +1969,7 @@ class TestModelverseCore(unittest.TestCase):
                         "Type to instantiate?",
                         "Name of new element?",
                         "Instantiation successful!",
+                        None,
                         "Please give your command.",
                         "Which element do you want to assign an attribute to?",
                         "Which attribute do you wish to assign?",
@@ -1946,6 +1982,7 @@ class TestModelverseCore(unittest.TestCase):
                         "Source name?",
                         "Destination name?",
                         "Instantiation successful!",
+                        None,
                         "Please give your command.",
                         "Which element do you want to assign an attribute to?",
                         "Which attribute do you wish to assign?",
@@ -2070,6 +2107,7 @@ class TestModelverseCore(unittest.TestCase):
                 # model_modify
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                     # instantiate
@@ -2078,6 +2116,7 @@ class TestModelverseCore(unittest.TestCase):
                     "Source name?",
                     "Destination name?",
                     "Instantiation successful!",
+                    None,
                     "Please give your command.",
                 "Ready for command...",
                 # transformation_RAMify

integration/test_powerwindow.py

@@ -307,6 +307,7 @@ class TestPowerWindow(unittest.TestCase):
                 # model_modify
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 # instantiate * 7
@@ -315,6 +316,7 @@ class TestPowerWindow(unittest.TestCase):
                         "Source name?",
                         "Destination name?",
                         "Instantiation successful!",
+                        None,
                         "Please give your command.", ] * 7 + [
                 "Ready for command...",
                 # transformation_RAMify
@@ -399,6 +401,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_req
                 "Please perform manual operation \"revise_req\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -406,6 +409,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_plant
                 "Please perform manual operation \"revise_plant\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -413,6 +417,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_environment
                 "Please perform manual operation \"revise_environment\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -420,6 +425,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_control
                 "Please perform manual operation \"revise_control\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -427,6 +433,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_query
                 "Please perform manual operation \"revise_query\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -434,6 +441,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_architecture
                 "Please perform manual operation \"revise_architecture\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -748,6 +756,7 @@ class TestPowerWindow(unittest.TestCase):
                 # model_modify
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 # instantiate * 7
@@ -756,6 +765,7 @@ class TestPowerWindow(unittest.TestCase):
                         "Source name?",
                         "Destination name?",
                         "Instantiation successful!",
+                        None,
                         "Please give your command.", ] * 7 + [
                 "Ready for command...",
                 # transformation_RAMify
@@ -844,6 +854,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_req
                 "Please perform manual operation \"revise_req\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -851,6 +862,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_plant
                 "Please perform manual operation \"revise_plant\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -858,6 +870,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_environment
                 "Please perform manual operation \"revise_environment\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -865,6 +878,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_control
                 "Please perform manual operation \"revise_control\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -872,6 +886,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_query
                 "Please perform manual operation \"revise_query\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -879,6 +894,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_architecture
                 "Please perform manual operation \"revise_architecture\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -890,6 +906,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_plant
                 "Please perform manual operation \"revise_plant\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -897,6 +914,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_environment
                 "Please perform manual operation \"revise_environment\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -904,6 +922,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_control
                 "Please perform manual operation \"revise_control\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -911,6 +930,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_query
                 "Please perform manual operation \"revise_query\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -918,6 +938,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_architecture
                 "Please perform manual operation \"revise_architecture\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1219,6 +1240,7 @@ class TestPowerWindow(unittest.TestCase):
                 # model_modify
                 "Which model do you want to modify?",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 # instantiate * 7
@@ -1227,6 +1249,7 @@ class TestPowerWindow(unittest.TestCase):
                         "Source name?",
                         "Destination name?",
                         "Instantiation successful!",
+                        None,
                         "Please give your command.", ] * 7 + [
                 "Ready for command...",
                 # transformation_RAMify
@@ -1311,6 +1334,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_req
                 "Please perform manual operation \"revise_req\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1318,6 +1342,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_plant
                 "Please perform manual operation \"revise_plant\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1325,6 +1350,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_environment
                 "Please perform manual operation \"revise_environment\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1332,6 +1358,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_control
                 "Please perform manual operation \"revise_control\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1339,6 +1366,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_query
                 "Please perform manual operation \"revise_query\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1346,6 +1374,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_architecture
                 "Please perform manual operation \"revise_architecture\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1357,6 +1386,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_plant
                 "Please perform manual operation \"revise_plant\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1364,6 +1394,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_environment
                 "Please perform manual operation \"revise_environment\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1371,6 +1402,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_control
                 "Please perform manual operation \"revise_control\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1378,6 +1410,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_query
                 "Please perform manual operation \"revise_query\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",
@@ -1385,6 +1418,7 @@ class TestPowerWindow(unittest.TestCase):
                 # Manual transformation revise_architecture
                 "Please perform manual operation \"revise_architecture\"",
                 "Model loaded, ready for commands!",
+                "Mode: r/w",
                 "Use 'help' command for a list of possible commands",
                 "Please give your command.",
                 "Waiting for model constructors...",