Update tests for MvC to take into account the use of a password

core/core_algorithm.alc

@@ -69,7 +69,6 @@ Void function main():
 		output("Please repeat the password")
 		if (password == hash(input())):
 			output("Passwords match!")
-			output("User created")
 			instantiate_attribute(core, admin_user, "password", password)
 			ct = False
 		else:

integration/test_mvc.py

@@ -26,10 +26,13 @@ class TestModelverseCore(unittest.TestCase):
 
     def list(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_list",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -44,10 +47,13 @@ class TestModelverseCore(unittest.TestCase):
 
     def list_full(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_list_full",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -62,7 +68,7 @@ class TestModelverseCore(unittest.TestCase):
 
     def model_add_empty(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_add",
                 "SimpleClassDiagrams",
                 "Empty",
@@ -71,6 +77,9 @@ class TestModelverseCore(unittest.TestCase):
                 "model_list_full",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -97,7 +106,7 @@ class TestModelverseCore(unittest.TestCase):
 
     def model_empty_modify(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_add",
                 "SimpleClassDiagrams",
                 "Empty",
@@ -113,6 +122,9 @@ class TestModelverseCore(unittest.TestCase):
                 "model_list_full",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -154,7 +166,7 @@ class TestModelverseCore(unittest.TestCase):
 
     def model_overwrite(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_add",
                 "SimpleClassDiagrams",
                 "Empty",
@@ -185,6 +197,9 @@ class TestModelverseCore(unittest.TestCase):
                 "exit",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -239,7 +254,7 @@ class TestModelverseCore(unittest.TestCase):
 
     def transform_add_MT_language(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_add",
                 "SimpleClassDiagrams",
                 "PetriNets",
@@ -252,6 +267,9 @@ class TestModelverseCore(unittest.TestCase):
                 "model_list_full",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -284,7 +302,7 @@ class TestModelverseCore(unittest.TestCase):
 
     def transform_add_MT_instance(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_add",
                 "SimpleClassDiagrams",
                 "PetriNets",
@@ -307,6 +325,9 @@ class TestModelverseCore(unittest.TestCase):
                 "transformation_list_full",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -364,7 +385,7 @@ class TestModelverseCore(unittest.TestCase):
 
     def transform_add_MT_pn_print_upload(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_add",
                 "SimpleClassDiagrams",
                 "PetriNets",
@@ -385,6 +406,9 @@ class TestModelverseCore(unittest.TestCase):
                 "transformation_list_full",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -431,7 +455,7 @@ class TestModelverseCore(unittest.TestCase):
 
     def transform_add_MT_pn_print_exec(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_add",
                 "SimpleClassDiagrams",
                 "PetriNets",
@@ -460,6 +484,9 @@ class TestModelverseCore(unittest.TestCase):
                 "transformation_list_full",
             ],
             [   "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
@@ -522,7 +549,7 @@ class TestModelverseCore(unittest.TestCase):
 
     def transform_add_MT_pn_simulate(self, mode):
         self.assertTrue(run_file(all_files,
-            [ "root",
+            [ "root", "root", "root", 
                 "model_add",
                     "SimpleClassDiagrams",
                     "PetriNets",
@@ -622,6 +649,9 @@ class TestModelverseCore(unittest.TestCase):
             ],
             [   # bootup phase
                 "Desired username for admin user?",
+                "Desired password for admin user?",
+                "Please repeat the password",
+                "Passwords match!",
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",