Allow ' OR ' and ' or '

[phdru.name/cgi-bin/blog-ru/search-tags.git] / parser / test_parser.py

diff --git a/parser/test_parser.py b/parser/test_parser.py
index 3e54f5c16a76965cc854aa0be6642f767975da2b..d13e6e965e5d797f19d21af187b96ede78b6c698 100755 (executable)
--- a/parser/test_parser.py
+++ b/parser/test_parser.py
@@ -18,14 +18,27 @@ class TestParser(unittest.TestCase):
         self.assertEqual(parser.parse('!(xxx&yyy)'),
             ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-
-    def test_05_bad_expression(self):
-        self.assertIs(parser.parse('!(xxx&yyy'), None)
-
-    def test_06_expression2(self):
+        self.assertEqual(parser.parse('!(xxx & yyy)'),
+            ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
+        )
         self.assertEqual(parser.parse('!xxx&yyy&zzz|ooo'),
             ('OR', ('AND', ('AND', ('NOT', ('NAME', 'xxx')), ('NAME', 'yyy')), ('NAME', 'zzz')), ('NAME', 'ooo'))
         )
+        self.assertEqual(parser.parse('!(xxx &&  yyy)'),
+            ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
+        )
+        self.assertEqual(parser.parse('!(xxx || yyy)'),
+            ('NOT', ('PARENS', ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))))
+        )
+        self.assertEqual(parser.parse('xxx and yyy'),
+            ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))
+        )
+        self.assertEqual(parser.parse('xxx or  yyy'),
+            ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))
+        )
+
+    def test_05_bad_expression(self):
+        self.assertIs(parser.parse('!(xxx&yyy'), None)
 
 if __name__ == "__main__":
     unittest.main()