diff --git a/check.py b/check.py index ab580502..3618ddb1 100755 --- a/check.py +++ b/check.py @@ -84,9 +84,17 @@ class Test: self._step.append({'result': False, 'msg_err': msg_err}) self._errflag = True + @classmethod + def compare(cls, val0, val1): + if isinstance(val1, basestring): + result = re.search(val0, val1) + else: + result = (val0 == val1) + return result + def test(self, value_expected, value, msg_err, msg_ok = None): """ Test two values and add the result""" - result = (value_expected == value) + result = Test.compare(value_expected, value) self._step.append({'result': result, 'msg_err': msg_err, 'msg_ok': msg_ok}) if not result: self._errflag = True diff --git a/test_check.py b/test_check.py index a531013b..74636866 100644 --- a/test_check.py +++ b/test_check.py @@ -54,7 +54,7 @@ class TestCheckFlowVars(unittest.TestCase): { 'R0': { '$xavp(v0)': [{ 'k0': [1], - 'k1': ['a', 'b'] + 'k1': ['a', 'b', 'fuckthisshit'] }, { 'k0': [1,2], @@ -71,7 +71,10 @@ class TestCheckFlowVars(unittest.TestCase): { 'R1': {} }, ] self.scen = [ - { 'R0': {'$xavp(v0[0]=>k0[0])': 1, '$xavp(v0[0]=>k1[0])': 'a'} }, + { 'R0': { '$xavp(v0[0]=>k0[0])': 1, + '$xavp(v0[0]=>k1[0])': 'a', + '$xavp(v0[0]=>k1[2])': '^f'} + }, { 'R1': {'$xavp(v0[1]=>k0[0])': 1} }, ] @@ -80,7 +83,7 @@ class TestCheckFlowVars(unittest.TestCase): xavp = XAvp('$xavp(v0)', data) self.assertEqual(xavp.get('$xavp(v0=>k0)'), 1) - self.assertEqual(xavp.get('$xavp(v0=>k1[*])'), ['a','b']) + self.assertEqual(xavp.get('$xavp(v0=>k1[*])'), ['a','b', 'fuckthisshit']) self.assertEqual(xavp.get('$xavp(v0[1]=>k0[1])'), 2) self.assertEqual(xavp.get('$xavp(v0[1]=>k1[*])'), ['a'])