Commit d2ffd580 authored by Taddeüs Kroes's avatar Taddeüs Kroes

Fixed unit tests broken due to rebase on stable branch

parent 6402d3f5
...@@ -92,7 +92,7 @@ class TestParser(RulesTestCase): ...@@ -92,7 +92,7 @@ class TestParser(RulesTestCase):
x = tree('x') x = tree('x')
self.assertEqual(tree('sin x'), sin(x)) self.assertEqual(tree('sin x'), sin(x))
self.assertEqual(tree('sin 2 x'), sin(2) * x) # FIXME: correct? self.assertEqual(tree('sin 2 x'), sin(2) * x)
self.assertEqual(tree('sin x ^ 2'), sin(x ** 2)) self.assertEqual(tree('sin x ^ 2'), sin(x ** 2))
self.assertEqual(tree('sin^2 x'), sin(x) ** 2) self.assertEqual(tree('sin^2 x'), sin(x) ** 2)
...@@ -101,12 +101,12 @@ class TestParser(RulesTestCase): ...@@ -101,12 +101,12 @@ class TestParser(RulesTestCase):
self.assertEqual(tree('sin cos x'), sin(cos(x))) self.assertEqual(tree('sin cos x'), sin(cos(x)))
self.assertEqual(tree('sin cos x ^ 2'), sin(cos(x ** 2))) self.assertEqual(tree('sin cos x ^ 2'), sin(cos(x ** 2)))
self.assertEqual(tree('sin cos(x) ^ 2'), sin(cos(x ** 2))) self.assertEqual(tree('sin cos(x) ^ 2'), sin(cos(x) ** 2))
self.assertEqual(tree('sin (cos x) ^ 2'), sin(cos(x) ** 2)) self.assertEqual(tree('sin (cos x) ^ 2'), sin(cos(x)) ** 2)
self.assertEqual(tree('sin (cos x) ^ 2'), sin(cos(x)) ** 2) self.assertEqual(tree('sin (cos x) ^ 2'), sin(cos(x)) ** 2)
self.assertEqual(tree('sin((cos x) ^ 2)'), sin(cos(x) ** 2)) self.assertEqual(tree('sin((cos x) ^ 2)'), sin(cos(x) ** 2))
def test_brackets(self): def test_brackets(self):
self.assertEqual(*tree('[x], x')) self.assertEqual(*tree('[x], x'))
self.assertEqual(*tree('[x], (x)')) self.assertEqual(*tree('[x], (x)'))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment