X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parser%2Ftest_parser.py;h=4f2e1767f6d14b16e59c4d5c1a25c9de335f6269;hb=10eee8c8713988ac4e6f8879a8222234c3ab31aa;hp=628c9843b8d8509b11b7fc676e9452ef27329006;hpb=9d22f4f705db6a30fa2d49fdc074b901ec3cb3dc;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git

diff --git a/parser/test_parser.py b/parser/test_parser.py
index 628c984..4f2e176 100755
--- a/parser/test_parser.py
+++ b/parser/test_parser.py
@@ -7,32 +7,50 @@ class TestParser(unittest.TestCase):
         global parser
         from parser import parser
 
+    def _parse(self, input):
+        return parser.parse(input)
+
     def test_02_tag(self):
-        self.assertEqual(parser.parse('xxx'), ('NAME', 'xxx'))
+        self.assertEqual(self._parse('xxx'), ('NAME', 'xxx'))
 
     def test_03_bad_tag(self):
         from ply.lex import LexError
-        self.assertRaises(LexError, parser.parse, 'XXX')
+        self.assertRaises(LexError, self._parse, 'XXX')
 
     def test_04_expression(self):
-        self.assertEqual(parser.parse('!(xxx&yyy)'),
+        self.assertEqual(self._parse('!(xxx&yyy)'),
             ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-        self.assertEqual(parser.parse('!(xxx & yyy)'),
+        self.assertEqual(self._parse('!(xxx & yyy)'),
             ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-        self.assertEqual(parser.parse('!xxx&yyy&zzz|ooo'),
+        self.assertEqual(self._parse('!xxx&yyy&zzz|ooo'),
             ('OR', ('AND', ('AND', ('NOT', ('NAME', 'xxx')), ('NAME', 'yyy')), ('NAME', 'zzz')), ('NAME', 'ooo'))
         )
-        self.assertEqual(parser.parse('!(xxx && yyy)'),
+        self.assertEqual(self._parse('!(xxx &&  yyy)'),
             ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-        self.assertEqual(parser.parse('!(xxx || yyy)'),
+        self.assertEqual(self._parse('!(xxx || yyy)'),
             ('NOT', ('PARENS', ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
+        self.assertEqual(self._parse('xxx and yyy'),
+            ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))
+        )
+        self.assertEqual(self._parse('xxx or  yyy'),
+            ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))
+        )
+        self.assertEqual(self._parse('xxx OR yyy'),
+            ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))
+        )
+        self.assertEqual(self._parse('not xxx'),
+            ('NOT', ('NAME', 'xxx'))
+        )
+        self.assertEqual(self._parse('NOT xxx'),
+            ('NOT', ('NAME', 'xxx'))
+        )
 
     def test_05_bad_expression(self):
-        self.assertIs(parser.parse('!(xxx&yyy'), None)
+        self.assertIs(self._parse('!(xxx&yyy'), None)
 
 if __name__ == "__main__":
     unittest.main()