MCDC: Testing

* Adjusted test case for the getAtoms() Method verifying the expected
recursive behavior

Issue-Ref: 3465
Issue-Url: https://af3-developer.fortiss.org/issues/3465

Signed-off-by: Ludwig Dickmanns <dickmanns@fortiss.org>

org.fortiss.af3.testing/src/org/fortiss/af3/testing/mcdc/.ratings

-MCDCUtils.java 72786d523866026c2420e04e167b81f6d2ab742a YELLOW
+MCDCUtils.java 8e4c09ba90443f0e369e52de21d3c1dcb6701828 YELLOW

org.fortiss.af3.testing/test-src/test/org/fortiss/af3/testing/mcdc/TestGetAtomsFromGuardMCDC.java

@@ -15,9 +15,12 @@
 +--------------------------------------------------------------------------*/
 package test.org.fortiss.af3.testing.mcdc;
 
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.and;
 import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.createVar;
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.greaterThan;
 import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.intConst;
-import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.lowerEqual;
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.lowerThan;
+import static org.fortiss.af3.expression.utils.ExpressionModelElementFactory.or;
 import static org.fortiss.af3.testing.mcdc.MCDCUtils.getAtomsFromGuardMCDC;
 
 import org.fortiss.af3.expression.model.terms.FunctionCall;
@@ -37,21 +40,25 @@ public class TestGetAtomsFromGuardMCDC {
 		IExpressionTerm guard, a, b;
 		Var v1 = createVar("v1");
 		Var v2 = createVar("v2");
-		a = lowerEqual(v1, intConst(42));
-		b = ExpressionModelElementFactory.greaterThan(intConst(42), v2);
-		guard = ExpressionModelElementFactory.and(a, b);
+		a = lowerThan(v1, intConst(42));
+		b = or(greaterThan(v2, intConst(42)), ExpressionModelElementFactory.equal(v1, v2));
+		guard = and(a, b);
+
 		System.out.println(guard);
 		System.out.println();
+
 		System.out.println("Guard");
 		for(FunctionCall functionCall : getAtomsFromGuardMCDC(guard)) {
 			System.out.println(functionCall);
 		}
 		System.out.println();
+
 		System.out.println("a");
 		for(FunctionCall functionCall : getAtomsFromGuardMCDC(a)) {
 			System.out.println(functionCall);
 		}
 		System.out.println();
+
 		System.out.println("b");
 		for(FunctionCall functionCall : getAtomsFromGuardMCDC(b)) {
 			System.out.println(functionCall);