Allow 'NOT ' and 'not '

[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 628c9843b8d8509b11b7fc676e9452ef27329006..4696047338be02e8f749ebae22d5fb39b7e4f5cf 100755 (executable)
--- a/parser/test_parser.py
+++ b/parser/test_parser.py
@@ -24,12 +24,27 @@ class TestParser(unittest.TestCase):
         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)'),
+        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'))
+        )
+        self.assertEqual(parser.parse('xxx OR yyy'),
+            ('OR', ('NAME', 'xxx'), ('NAME', 'yyy'))
+        )
+        self.assertEqual(parser.parse('not xxx'),
+            ('NOT', ('NAME', 'xxx'))
+        )
+        self.assertEqual(parser.parse('NOT xxx'),
+            ('NOT', ('NAME', 'xxx'))
+        )
 
     def test_05_bad_expression(self):
         self.assertIs(parser.parse('!(xxx&yyy'), None)