diff options
Diffstat (limited to 'dviware/dvisvgm/tests/CalculatorTest.cpp')
-rw-r--r-- | dviware/dvisvgm/tests/CalculatorTest.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/dviware/dvisvgm/tests/CalculatorTest.cpp b/dviware/dvisvgm/tests/CalculatorTest.cpp index 28ebf342b8..af79a4c8e1 100644 --- a/dviware/dvisvgm/tests/CalculatorTest.cpp +++ b/dviware/dvisvgm/tests/CalculatorTest.cpp @@ -25,14 +25,19 @@ TEST(CalculatorTest, eval) { Calculator calc; - EXPECT_EQ(calc.eval("2+3+4"), 9); - EXPECT_EQ(calc.eval("2*3+4"), 10); - EXPECT_EQ(calc.eval("2+3*4"), 14); - EXPECT_EQ(calc.eval("(2+3)*4"), 20); - EXPECT_EQ(calc.eval("2*(3+4)"), 14); - EXPECT_EQ(calc.eval("-2+3+4"), 5); - EXPECT_EQ(calc.eval("3/2"), 1.5); - EXPECT_EQ(calc.eval("3%2"), 1); + EXPECT_EQ(calc.eval("2+3+4"), 9); + EXPECT_EQ(calc.eval("2*3+4"), 10); + EXPECT_EQ(calc.eval("2+3*4"), 14); + EXPECT_EQ(calc.eval("(2+3)*4"), 20); + EXPECT_EQ(calc.eval("2*(3+4)"), 14); + EXPECT_EQ(calc.eval("2(3+4)"), 14); + EXPECT_EQ(calc.eval("(1+2)(3+4)"), 21); + EXPECT_EQ(calc.eval("-(1+2)(3+4)"), -21); + EXPECT_EQ(calc.eval("(1+2)-(3+4)"), -4); + EXPECT_EQ(calc.eval("-2+3+4"), 5); + EXPECT_EQ(calc.eval("3/2"), 1.5); + EXPECT_EQ(calc.eval("3%2"), 1); + EXPECT_EQ(calc.eval("-(4)"), -4); } @@ -47,6 +52,7 @@ TEST(CalculatorTest, variables) { calc.setVariable("b", 3); EXPECT_EQ(calc.eval("a+b"), 5); EXPECT_EQ(calc.eval("2a+2b"), 10); + EXPECT_EQ(calc.eval("2a(1+2b)"), 28); } |