[Zope-CVS] CVS: Products/ZCTextIndex/tests - testQueryEngine.py:1.1.2.2 testQueryParser.py:1.1.2.3

Guido van Rossum guido@python.org
Wed, 1 May 2002 10:03:12 -0400


Update of /cvs-repository/Products/ZCTextIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv13597/tests

Modified Files:
      Tag: TextIndexDS9-branch
	testQueryEngine.py testQueryParser.py 
Log Message:
Cripple the parser to only accept NOT after AND.

=== Products/ZCTextIndex/tests/testQueryEngine.py 1.1.2.1 => 1.1.2.2 ===
 
     def testInvalidQuery(self):
-        tree = self.parser.parseQuery("NOT foo")
+        from Products.ZCTextIndex.QueryParser import NotNode, AtomNode
+        tree = NotNode(AtomNode("foo"))
         self.assertRaises(QueryError,
                           self.engine.executeQuery, self.index, tree)
 


=== Products/ZCTextIndex/tests/testQueryParser.py 1.1.2.2 => 1.1.2.3 ===
     def testParseQuery(self):
         self.expect("foo", AtomNode("foo"))
-        self.expect("NOT foo", NotNode(AtomNode("foo")))
         self.expect("not", AtomNode("not"))
         self.expect("a AND b AND c",
                     AndNode([AtomNode("a"), AtomNode("b"), AtomNode("c")]))
@@ -68,7 +67,7 @@
         self.failure("")
         self.failure("OR")
         self.failure("AND")
-        self.failure("NOT")
+        self.failure("NOT foo")
         self.failure(")")
         self.failure("(")
         self.failure("foo bar")
@@ -79,7 +78,7 @@
         self.failure("(foo bar)")
         self.failure("(foo OR)")
         self.failure("(foo AND)")
-        self.failure("(NOT)")
+        self.failure("(NOT foo)")
 
 
 def test_suite():