lafrite/Mapytex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correct tests in test_str2tokens

Browse Source
This commit is contained in:
Lafrite 2014-12-23 14:29:39 +01:00
parent 74b463d2af
commit ffe3b628ea
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/test_str2tokens.py
View File

@ -5,6 +5,7 @@
import unittest import unittest
from pymath.str2tokens import str2tokens, str2in_tokens, in2post_fix from pymath.str2tokens import str2tokens, str2in_tokens, in2post_fix
from pymath.polynom import Polynom
class TestStr2tokens(unittest.TestCase): class TestStr2tokens(unittest.TestCase):
"""Testing functions from pymath.str2tokens""" """Testing functions from pymath.str2tokens"""
@ -46,18 +47,18 @@ class TestStr2tokens(unittest.TestCase):
def test_str2tokens_poly(self): def test_str2tokens_poly(self):
exp = "2x + 4" exp = "2x + 4"
post = str2in_tokens(exp) post = str2in_tokens(exp)
self.assertEqual(post, [2, < Polynom [0, 1]>, '*', 4, '+']) self.assertEqual(post, [2, "*", Polynom([0, 1]), '+', 4])
def test_str2tokens_poly_double_x(self): def test_str2tokens_poly_double_x(self):
exp = "xx + 4" exp = "xx + 4"
post = str2in_tokens(exp) post = str2in_tokens(exp)
self.assertEqual(post, [< Polynom [0, 1]>, < Polynom [0, 1]>, '*', 4, '+']) self.assertEqual(post, [Polynom([0, 1]), "*", Polynom([0, 1]), '+', 4])
def test_str2tokens_poly(self): def test_str2tokens_poly(self):
exp = "x(2+1) + 4" exp = "x(2+1) + 4"
post = str2in_tokens(exp) post = str2in_tokens(exp)
self.assertEqual(post, [< Polynom [0, 1]>, 2, 1, '+', '*', 4, '+']) self.assertEqual(post, [Polynom([0, 1]), "*", "(", 2, "+", 1, ')', '+', 4])
def test_str2in_tokens_time_lack2(self): def test_str2in_tokens_time_lack2(self):
exp = "-3(2)" exp = "-3(2)"