Browse Source

Fixed verify in wrapper

Yentl Van Tendeloo 8 years ago
parent
commit
102b231f57
3 changed files with 6 additions and 1 deletions
  1. 1 1
      bootstrap/conformance_scd.alc
  2. 1 0
      core/core_algorithm.alc
  3. 4 0
      wrappers/test_modelverse.py

+ 1 - 1
bootstrap/conformance_scd.alc

@@ -278,7 +278,7 @@ String function conformance_scd(model : Element):
 	String constraint
 	Element func
 
-	global_constraints = allInstances(model, "GlobalConstraints")
+	global_constraints = allInstances(model, "GlobalConstraint")
 	while (read_nr_out(global_constraints) > 0):
 		constraint = set_pop(global_constraints)
 		func = get_func_AL_model(import_node(read_attribute(model, constraint, "global_constraint")))

+ 1 - 0
core/core_algorithm.alc

@@ -1054,6 +1054,7 @@ Void function user_function_skip_init(user_id : String):
 			model_id = get_model_id(input())
 			if (model_id != ""):
 				if (allow_read(user_id, model_id)):
+					output("Verifying model...")
 					result = conformance_scd(get_full_model(model_id))
 					output(result)
 				else:

+ 4 - 0
wrappers/test_modelverse.py

@@ -10,6 +10,7 @@ init()
 login(username, password)
 
 model_add(model_name, "SimpleClassDiagrams", open("models/petrinet_ports.mvc", "r").read())
+print(verify("SimpleClassDiagrams"))
 model_modify("SimpleClassDiagrams")
 print(element_list())
 try:
@@ -29,6 +30,7 @@ except InvalidMode:
             except PermissionDenied:
                 print(("abc", "Class") not in element_list())
                 model_exit()
+                print(verify(model_name))
                 model_modify(model_name)
                 print(element_list())
                 print(instantiate("Class", None, "abc"))
@@ -46,3 +48,5 @@ except InvalidMode:
                 attr_assign("p1", "name", "abc")
                 attr_assign("p1", "tokens", 1)
                 print(read_attrs("p1"))
+                model_exit()
+                print(verify(model_name2))