diff --git a/src/test/storm/parser/GameFormulaParserTest.cpp b/src/test/storm/parser/GameFormulaParserTest.cpp index c2d3291a5..d6b6bff3b 100644 --- a/src/test/storm/parser/GameFormulaParserTest.cpp +++ b/src/test/storm/parser/GameFormulaParserTest.cpp @@ -105,9 +105,7 @@ TEST(GameFormulaParserTest, PlayersCoalitionTest) { std::ostringstream stream; stream << playerCoalition; std::string playerCoalitionString = stream.str(); - std::string playerWithoutWhiteSpace = "p1,p2,p3,p4,p5"; - EXPECT_EQ(playerWithoutWhiteSpace, playerCoalitionString); } @@ -134,30 +132,39 @@ TEST(GameFormulaParserTest, UntilOperatorTest) { std::string input = "<
> Pmax=? [\"a\" U \"b\"]";
std::shared_ptr > Pmax=? [\"a\" U <= 4 \"b\"]";
+ input = "< > Pmax=? [ \"a\" U <= 4 \"b\" ]";
ASSERT_NO_THROW(formula = formulaParser.parseSingleFormulaFromString(input));
+ EXPECT_TRUE(formula->isGameFormula());
auto const& gameFormula2 = formula->asGameFormula();
auto const& probFormula2 = gameFormula2.getSubformula();
+ EXPECT_TRUE(probFormula2.isProbabilityOperatorFormula());
auto const& rawFormula2 = probFormula2.asProbabilityOperatorFormula().getSubformula();
EXPECT_TRUE(rawFormula2.isBoundedUntilFormula());
EXPECT_TRUE(rawFormula2.asBoundedUntilFormula().getTimeBoundReference().isTimeBound());
- EXPECT_EQ(0, rawFormula2.asBoundedUntilFormula().getLowerBound().evaluateAsInt());
+ EXPECT_FALSE(rawFormula2.asBoundedUntilFormula().hasLowerBound());
+ EXPECT_TRUE(rawFormula2.asBoundedUntilFormula().hasUpperBound());
EXPECT_EQ(4, rawFormula2.asBoundedUntilFormula().getUpperBound().evaluateAsInt());
- input = "<