Fix minor parts for the tests to succeed

bootstrap/99_core.mvc

@@ -89,13 +89,13 @@ CF core {
     group (Core, admin_group) {}
     owner (Core, admin_user) {}
 
-    Model Bottom {
+    Model bottom {
         name = "bottom"
         location = "models/bottom/model"
         permissions = "221"
     }
-    group (Bottom, admin_group) {}
-    owner (Bottom, admin_user) {}
+    group (bottom, admin_group) {}
+    owner (bottom, admin_user) {}
 
     instanceOf inst_SCD (SimpleClassDiagrams, SimpleClassDiagrams) {
         typing_location = "models/SimpleClassDiagrams/type_mapping"
@@ -121,8 +121,8 @@ CF core {
     instanceOf inst_core (Core, CoreFormalism) {
         typing_location = "models/core/type_mapping"
     }
-    instanceOf inst_bottom (Bottom, CoreFormalism) {
-        typing_location = "models/Bottom/type_mapping"
+    instanceOf inst_bottom (bottom, SimpleClassDiagrams) {
+        typing_location = "models/bottom/type_mapping"
     }
 
     semantics (inst_SCD, conformance_mv) {}

integration/test_mvc.py

@@ -13,6 +13,7 @@ expected_model_list = set([("SimpleClassDiagrams", "SimpleClassDiagrams"),
                            ("ProcessModel", "SimpleClassDiagrams"),
                            ("Tracability", "SimpleClassDiagrams"),
                            ("conformance_mv", "ActionLanguage"),
+                           ("bottom", "SimpleClassDiagrams"),
                            ("core", "CoreFormalism")])
 
 expected_model_full_list = set([("SimpleClassDiagrams", "SimpleClassDiagrams", "admin", "admin", "221"),
@@ -21,8 +22,9 @@ expected_model_full_list = set([("SimpleClassDiagrams", "SimpleClassDiagrams", "
                                 ("ActionLanguage", "SimpleClassDiagrams", "admin", "admin", "221"),
                                 ("ProcessModel", "SimpleClassDiagrams", "admin", "admin", "221"),
                                 ("Tracability", "SimpleClassDiagrams", "admin", "admin", "221"),
+                                ("bottom", "SimpleClassDiagrams", "admin", "admin", "221"),
                                 ("conformance_mv", "ActionLanguage", "admin", "admin", "221"),
-                                ("core", "CoreFormalism", "admin", "admin", "200")])
+                                ("core", "CoreFormalism", "admin", "admin", "220")])
 
 expected_transformation_list = set([("ActionLanguage", "conformance_mv")])
 

integration/test_powerwindow.py

@@ -43,6 +43,7 @@ class TestPowerWindow(unittest.TestCase):
                 ("SimpleClassDiagrams", "SimpleClassDiagrams"),
                 ("CoreFormalism", "SimpleClassDiagrams"),
                 ("ManualOperation", "SimpleClassDiagrams"),
+                ("bottom", "SimpleClassDiagrams"),
                 ("ActionLanguage", "SimpleClassDiagrams"),
                 ("ProcessModel", "SimpleClassDiagrams"),
                 ("Tracability", "SimpleClassDiagrams"),
@@ -146,6 +147,7 @@ class TestPowerWindow(unittest.TestCase):
                 ("SimpleClassDiagrams", "SimpleClassDiagrams"),
                 ("CoreFormalism", "SimpleClassDiagrams"),
                 ("ManualOperation", "SimpleClassDiagrams"),
+                ("bottom", "SimpleClassDiagrams"),
                 ("ActionLanguage", "SimpleClassDiagrams"),
                 ("ProcessModel", "SimpleClassDiagrams"),
                 ("Tracability", "SimpleClassDiagrams"),