Fixed SCCD test

integration/code/SCCD_all.mvc

@@ -239,7 +239,7 @@ transition (manager_main_parallel_input_9, manager_main_parallel_input_10) {
     name = ""
     after = $
                 Element function after(attributes : Element):
-                    return 5.0!
+                    return 4.0!
             $
 
     {transition_raises} Raise {
@@ -356,7 +356,7 @@ Class trafficlight {
             isInitial = False
 
             {onExitRaise} Raise {
-                event = "displayNone2"
+                event = "displayNone"
                 scope = "output"
             }
 

models/SCCD_execute.alc

@@ -202,8 +202,6 @@ String function start_class(model : Element, data : Element, class : String, par
 	dict_overwrite(data, "current_class", prev_class)
 	dict_overwrite(data, "current_class_handle", data["classes"][prev_class])
 
-	log("Created class with identifier: " + cast_v2s(identifier))
-
 	return identifier!
 
 Element function get_enabled_transitions(model : Element, state : String, data : Element):
@@ -346,11 +344,9 @@ Void function process_raised_event(model : Element, event : Element, parameter_a
 		instantiate_attribute(model, evt, "timestamp", data["time_sim"])
 		instantiate_attribute(model, evt, "name", read_attribute(model, event, "event"))
 		instantiate_attribute(model, evt, "parameter", parameter_action)
-		log("Generated output event: " + cast_v2s(evt))
 
 	else:
 		// Same as local
-		log("Unknown scope, assuming local: " + scope)
 		set_add_node(data["current_class_handle"]["new_events"], create_tuple(read_attribute(model, event, "event"), parameter_action))
 
 	return !
@@ -801,7 +797,6 @@ Boolean function main(model : Element):
 
 		time_wallclock = time() - time_0
 		timeout = time_sim - time_wallclock
-		log("Pause for: " + cast_v2s(timeout))
 
 	// We have finished without error
 	return True!

unit/test_all.py

@@ -298,12 +298,13 @@ class TestModelverse(unittest.TestCase):
         alter_context("test/my_SCCD_trace", "test/SCCD_Trace")
         lst = element_list_nice("test/my_SCCD_trace")
 
-        # TODO check if the structure of this list is OK
-        lst.sort(key=lambda i: i["timestamp"])
-        result = [(i["timestamp"], i["name"]) for i in lst if i["name"] not in ["updateTimerValue", "updateTimerColour", "resetTimer"]]
+        model_delete("merged")
+        model_delete("type mappings/merged")
+
+        lst.sort(key=lambda i: (i["timestamp"], i["name"]))
+        result = [(i["timestamp"], str(i["name"])) for i in lst if i["name"] not in ["updateTimerValue", "updateTimerColour", "resetTimer"]]
         print(result)
 
-        # TODO: displayNone2 should never be raised (unless on toggle?)
         assert result == [(5.0, "displayRed"),
                           (20.0, "displayYellow"),
                           (20.5, "displayNone"),
@@ -324,10 +325,30 @@ class TestModelverse(unittest.TestCase):
                           (28.0, "displayYellow"),
                           (28.5, "displayNone"),
                           (29.0, "displayYellow"),
+                          (29.4, "displayNone"),
                           (29.4, "displayRed"),
                           (89.4, "displayGreen"),
+                          (129.4, "displayNone"),
                           (129.4, "displayRed"),
-                          (139.4, "displayYellow")
+                          (139.4, "displayYellow"),
+                          (139.9, "displayNone"),
+                          (140.4, "displayYellow"),
+                          (140.9, "displayNone"),
+                          (141.4, "displayYellow"),
+                          (141.9, "displayNone"),
+                          (142.4, "displayYellow"),
+                          (142.9, "displayNone"),
+                          (143.4, "displayYellow"),
+                          (143.9, "displayNone"),
+                          (144.4, "displayYellow"),
+                          (144.9, "displayNone"),
+                          (145.4, "displayYellow"),
+                          (145.9, "displayNone"),
+                          (146.4, "displayYellow"),
+                          (146.9, "displayNone"),
+                          (147.4, "displayYellow"),
+                          (147.9, "displayNone"),
+                          (148.4, "displayYellow"),
                          ]
 
     def test_switch_MM(self):