svn commit: r156598 - lucene/java/trunk/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java

[ehatcher]

Author: ehatcher
Date: Tue Mar  8 19:00:47 2005
New Revision: 156598

URL: http://svn.apache.org/viewcvs?view=rev&rev=156598
Log:
Adjusted tests for discussed expectations.


Modified:
    
lucene/java/trunk/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java

Modified: 
lucene/java/trunk/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
URL: 
http://svn.apache.org/viewcvs/lucene/java/trunk/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java?view=diff&r1=156597&r2=156598
==============================================================================
--- 
lucene/java/trunk/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
 (original)
+++ 
lucene/java/trunk/src/test/org/apache/lucene/queryParser/precedence/TestPrecedenceQueryParser.java
 Tue Mar  8 19:00:47 2005
@@ -166,6 +166,8 @@
   }
 
   public void testSimple() throws Exception {
+    assertQueryEquals("", null, "");
+
     assertQueryEquals("term term term", null, "term term term");
     assertQueryEquals("tÃÂrm term term", null, "tÃÂrm term term");
     assertQueryEquals("ÃÂmlaut", null, "ÃÂmlaut");
@@ -183,9 +185,6 @@
 
     assertQueryEquals("a OR b", null, "a b");
     assertQueryEquals("a || b", null, "a b");
-    assertQueryEquals("a OR !b", null, "a -b");
-    assertQueryEquals("a OR ! b", null, "a -b");
-    assertQueryEquals("a OR -b", null, "a -b");
 
     assertQueryEquals("+term -term term", null, "+term -term term");
     assertQueryEquals("foo:term AND field:anotherTerm", null,
@@ -221,6 +220,10 @@
     assertEquals(PrecedenceQueryParser.AND_OPERATOR, qp.getDefaultOperator());
     qp.setDefaultOperator(PrecedenceQueryParser.OR_OPERATOR);
     assertEquals(PrecedenceQueryParser.OR_OPERATOR, qp.getDefaultOperator());
+
+    assertQueryEquals("a OR !b", null, "a (-b)");
+    assertQueryEquals("a OR ! b", null, "a (-b)");
+    assertQueryEquals("a OR -b", null, "a (-b)");    
   }
 
   public void testPunct() throws Exception {