X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=parser%2Ftest_parser.py;h=4696047338be02e8f749ebae22d5fb39b7e4f5cf;hb=0c0f61d9decb9b05cfe0babd2d74bda5e347fbf7;hp=a8d52270a9c52a0fa8dca6bb9186c889e17b1929;hpb=2167fc0e09f4343c0fe67c8c754e29a41769e684;p=phdru.name%2Fcgi-bin%2Fblog-ru%2Fsearch-tags.git

diff --git a/parser/test_parser.py b/parser/test_parser.py
index a8d5227..4696047 100755
--- a/parser/test_parser.py
+++ b/parser/test_parser.py
@@ -21,12 +21,30 @@ class TestParser(unittest.TestCase):
         self.assertEqual(parser.parse('!(xxx & yyy)'),
             ('NOT', ('PARENS', ('AND', ('NAME', 'xxx'), ('NAME', 'yyy'))))
         )
-        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'))
+        )
+        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)