update of unit tests for "check over", "decide over" and "evaluate ov…

…er" etl operators
lenaRB · Dec 4, 2023 · f653313 · f653313
1 parent 3efe188
commit f653313
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/test/resources/testModels/libraries/ETL_test/CheckOver_no_ext.crml b/src/test/resources/testModels/libraries/ETL_test/CheckOver_no_ext.crml
@@ -17,8 +17,8 @@ model CheckOver_no_ext is {
 
 	// Example of function call
 	Boolean phi1 is if 2.0 < time and time < 3.5 then true else false;
-	Boolean b1 is if 2.5 < time and time < 5 then true else false;
-	Period P1 is [b1, not b1];
+	Boolean b1 is if 2.5 < time and time < 5 then undecided else false;
+	Period P1 is [new Event b1, new Event not b1];
 
-	Boolean b_check_over is 'evaluate' phi1 'over' P1;
+	Boolean b_check_over is 'evaluate' phi1 'over' P1; //Value is undefined, becomes undecided at 2.5s and then false at t=3.5s
 };
diff --git a/src/test/resources/testModels/libraries/ETL_test/DecideOver_no_ext.crml b/src/test/resources/testModels/libraries/ETL_test/DecideOver_no_ext.crml
@@ -8,8 +8,8 @@ model DecideOver_no_ext is {
 
 	// Example of function call
 	Boolean phi1 is if 2.0 < time and time < 3.5 then true else false;
-	Boolean b1 is if 2.5 < time and time < 5 then true else false;
-	Period P1 is [b1, not b1];
+	Boolean b1 is if 2.5 < time and time < 5 then undecided else false;
+	Period P1 is [ new Event b1, new Event not b1];
 
-	Boolean b_decide_over is 'decide' phi1 'over' P1;
+	Boolean b_decide_over is 'decide' phi1 'over' P1; //Value is undecided and becomes false at t=3.5s
 };
diff --git a/src/test/resources/testModels/libraries/ETL_test/EvaluateOver_no_ext.crml b/src/test/resources/testModels/libraries/ETL_test/EvaluateOver_no_ext.crml
@@ -12,8 +12,8 @@ model EvaluateOver_no_ext is {
 
 	// Example of function call
 	Boolean phi1 is if 2.0 < time and time < 3.5 then true else false;
-	Boolean b1 is if 2.5 < time and time < 5 then true else false;
-	Period P1 is [b1, not b1];
+	Boolean b1 is if 2.5 < time and time < 5 then undecided else false;
+	Period P1 is [ new Event b1, new Event not b1];
 
-	Boolean b_evaluate_over is 'evaluate' phi1 'over' P1;
+	Boolean b_evaluate_over is 'evaluate' phi1 'over' P1; //Value is undefined, becomes undecided at 2.5s and then false at t=3.5s
 };