Extended parseComplexFormulaTest to use nested path formulas

12 years ago · e2f6b4b265
2 changed files with 2 additions and 2 deletions
--- a/test/parser/PrctlParserTest.cpp
+++ b/test/parser/PrctlParserTest.cpp
@ -122,7 +122,7 @@ TEST(PrctlParserTest, parseComplexFormulaTest) {
 	ASSERT_NE(prctlParser->getFormula(), nullptr);


-	ASSERT_EQ(prctlParser->getFormula()->toString(), "(P <= 0.500000 [F a] && (R > 15.000000 [G !b] || P > 0.900000 [F<=7 (a && b)]))");
+	ASSERT_EQ(prctlParser->getFormula()->toString(), "(P <= 0.500000 [F a] && (R > 15.000000 [G P > 0.900000 [F<=7 (a && b)]] || !P < 0.400000 [G !b]))");
 	delete prctlParser->getFormula();
 	delete prctlParser;

--- a/test/parser/prctl_files/complexFormula.prctl
+++ b/test/parser/prctl_files/complexFormula.prctl
@ -1 +1 @@
-(P<=0.5 [ F a ] & (R > 15 [ G !b ] | P>0.9 [F<=7 (a & b)]))
+(P<=0.5 [ F a ] & (R > 15 [ G P>0.9 [F<=7 (a & b)] ] | !P < 0.4 [ G !b ]))