Browse Source

Updated tests with new PM

Yentl Van Tendeloo 8 years ago
parent
commit
42d24ff1fa
1 changed files with 66 additions and 23 deletions
  1. 66 23
      integration/test_mvc.py

+ 66 - 23
integration/test_mvc.py

@@ -2171,14 +2171,21 @@ class TestModelverseCore(unittest.TestCase):
                     "SimpleClassDiagrams",
                     "Network",
                     ] + get_model_constructor(open("models/network.mvc", "r").read()) + [
+                "model_add",
+                    "ProcessModel",
+                    "pm_powerwindow",
+                    ] + get_model_constructor(open("models/pm_req_analyse.mvc", "r").read()) + [
                 "model_list",
                 "transformation_add_MT_language",
                 "PetriNet",
                 "Encapsulated_PetriNet",
                 "PW_Plant",
                 "PW_Control",
+                "PW_Environment",
                 "Requirements",
                 "ReachabilityGraph",
+                "Network",
+                "Query",
                 "",
                 "All_RAM",
                 "transformation_add_MANUAL",
@@ -2187,6 +2194,17 @@ class TestModelverseCore(unittest.TestCase):
                     "PW_Plant",
                     "",
                     "refine_Plant",
+                "transformation_add_MT",
+                    "All_RAM",
+                    "",
+                    "PW_Plant",
+                    "PW_Environment",
+                    "PW_Control",
+                    "Network",
+                    "Query",
+                    "",
+                    "make_initial_models",
+                    ] + get_model_constructor(open("models/initialize.mvc", "r").read()) + [
                 "transformation_add_MT",
                     "All_RAM",
                     "PW_Plant",
@@ -2202,13 +2220,13 @@ class TestModelverseCore(unittest.TestCase):
                     "",
                     "reachability_analyse",
                     ] + get_constructor(open("integration/code/reachability.alc", "r").read()) + [
-                "transformation_add_MT",
-                    "All_RAM",
-                    "ReachabilityGraph",
+                "transformation_add_AL",
+                    "PW_Environment",
                     "",
+                    "Encapsulated_PetriNet",
                     "",
-                    "reachability_print",
-                    ] + get_model_constructor(open("integration/code/reachabilitygraph_print.mvc", "r").read()) + [
+                    "environment_to_EPN",
+                    ] + get_constructor(open("models/environment_to_EPN.alc", "r").read()) + [
                 "model_list",
             ],
             [   # bootup phase
@@ -2219,23 +2237,27 @@ class TestModelverseCore(unittest.TestCase):
                 "Welcome to the Model Management Interface v2.0!",
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
-                # model_add * 9
+                # model_add * 10
                 ] + [   "Creating new model!",
                         "Model type?",
                         "Model name?",
                         "Waiting for model constructors...",
                         "Model upload success!",
-                        "Ready for command...", ] * 9 + [
+                        "Ready for command...", ] * 10 + [
                 # model_list
                 model_list |
                 set([
+                     "  ReachabilityGraph : SimpleClassDiagrams",
                      "  PetriNet : SimpleClassDiagrams",
                      "  Encapsulated_PetriNet : SimpleClassDiagrams",
                      "  PW_Plant : SimpleClassDiagrams",
                      "  PW_Environment : SimpleClassDiagrams",
                      "  PW_Control : SimpleClassDiagrams",
                      "  Requirements : SimpleClassDiagrams",
-                     "  ReachabilityGraph : SimpleClassDiagrams",]),
+                     "  Query : SimpleClassDiagrams",
+                     "  Network : SimpleClassDiagrams",
+                     "  pm_powerwindow : ProcessModel",
+                     ]),
                 "Ready for command...",
                 # transformation_add_MT_language
                 "Formalisms to include (terminate with empty string)?",
@@ -2254,25 +2276,22 @@ class TestModelverseCore(unittest.TestCase):
                 set(["  PetriNet",
                      "  Encapsulated_PetriNet",
                      "  PW_Plant",
-                     "  Requirements",
+                     "  Network",
+                     "  Query",
                      "  PW_Environment",
+                     "  Requirements",
                      "  PW_Control",
                      "  ReachabilityGraph",
                     ]),
                 "",
                 "Which ones do you want to use as source (empty string to finish)?",
-                "Model added as source",
                 "Which ones do you want to use as target (empty string to finish)?",
                 "Model added as target",
-                "Name of new transformation?",
-                "Waiting for model constructors...",
-                "Ready for command...",
-                # transformation_add_AL
-                "Which metamodels do you want to use as source for the action code (empty string to finish)?",
-                "Model added as source",
-                "Which metamodels do you want to use as target for the action code (empty string to finish)?",
                 "Model added as target",
-                "Name of Action Language model?",
+                "Model added as target",
+                "Model added as target",
+                "Model added as target",
+                "Name of new transformation?",
                 "Waiting for model constructors...",
                 "Ready for command...",
                 # transformation_add_MT
@@ -2280,7 +2299,11 @@ class TestModelverseCore(unittest.TestCase):
                 "Supported metamodels:",
                 set(["  PetriNet",
                      "  Encapsulated_PetriNet",
+                     "  Network",
+                     "  Query",
                      "  PW_Plant",
+                     "  PW_Environment",
+                     "  Requirements",
                      "  PW_Control",
                      "  ReachabilityGraph",
                     ]),
@@ -2288,9 +2311,26 @@ class TestModelverseCore(unittest.TestCase):
                 "Which ones do you want to use as source (empty string to finish)?",
                 "Model added as source",
                 "Which ones do you want to use as target (empty string to finish)?",
+                "Model added as target",
                 "Name of new transformation?",
                 "Waiting for model constructors...",
                 "Ready for command...",
+                # transformation_add_AL
+                "Which metamodels do you want to use as source for the action code (empty string to finish)?",
+                "Model added as source",
+                "Which metamodels do you want to use as target for the action code (empty string to finish)?",
+                "Model added as target",
+                "Name of Action Language model?",
+                "Waiting for model constructors...",
+                "Ready for command...",
+                # transformation_add_AL
+                "Which metamodels do you want to use as source for the action code (empty string to finish)?",
+                "Model added as source",
+                "Which metamodels do you want to use as target for the action code (empty string to finish)?",
+                "Model added as target",
+                "Name of Action Language model?",
+                "Waiting for model constructors...",
+                "Ready for command...",
                 # model_list
                 model_list |
                 set([
@@ -2299,16 +2339,19 @@ class TestModelverseCore(unittest.TestCase):
                      "  PW_Plant : SimpleClassDiagrams",
                      "  PW_Environment : SimpleClassDiagrams",
                      "  PW_Control : SimpleClassDiagrams",
-                     "  plant_model : PW_Plant",
-                     "  control_model : PW_Control",
+                     "  Requirements : SimpleClassDiagrams",
+                     "  Network : SimpleClassDiagrams",
+                     "  Query : SimpleClassDiagrams",
                      "  reachability_analyse : ActionLanguage",
-                     "  reachability_print : All_RAM",
                      "  Plant2EPN : All_RAM",
                      "  refine_Plant : ManualOperation",
-                     "  environment_model : PW_Environment",
                      "  __merged_All_RAM : SimpleClassDiagrams",
                      "  __merged_refine_Plant : SimpleClassDiagrams",
                      "  All_RAM : SimpleClassDiagrams",
-                     "  ReachabilityGraph : SimpleClassDiagrams",]),
+                     "  make_initial_models : All_RAM",
+                     "  pm_powerwindow : ProcessModel",
+                     "  environment_to_EPN : ActionLanguage",
+                     "  ReachabilityGraph : SimpleClassDiagrams",
+                     ]),
                 "Ready for command...",
             ]))