svn commit: r161075 - in lucene/java/trunk/src: java/org/apache/lucene/search/BooleanQuery.java test/org/apache/lucene/search/TestBooleanQuery.java

[eh...@apache.org]

Author: ehatcher
Date: Tue Apr 12 10:22:32 2005
New Revision: 161075

URL: http://svn.apache.org/viewcvs?view=rev&rev=161075
Log:
revert change to BooleanQuery.equals and add a test case.

Added:
    lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanQuery.java
Modified:
    lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java

Modified: lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java?view=diff&r1=161074&r2=161075
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/BooleanQuery.java Tue Apr 12 10:22:32 2005
@@ -405,7 +405,7 @@
       return false;
     BooleanQuery other = (BooleanQuery)o;
     return (this.getBoost() == other.getBoost())
-      &&  Arrays.equals(this.getClauses(), other.getClauses());
+        && this.clauses.equals(other.clauses);
   }
 
   /** Returns a hash code value for this object.*/

Added: lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanQuery.java?view=auto&rev=161075
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanQuery.java (added)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/TestBooleanQuery.java Tue Apr 12 10:22:32 2005
@@ -0,0 +1,34 @@
+package org.apache.lucene.search;
+
+/**
+ * Copyright 2004-2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import junit.framework.TestCase;
+import org.apache.lucene.index.Term;
+
+public class TestBooleanQuery extends TestCase {
+  public void testEquality() throws Exception {
+    BooleanQuery bq1 = new BooleanQuery();
+    bq1.add(new TermQuery(new Term("field", "value1")), BooleanClause.Occur.SHOULD);
+    bq1.add(new TermQuery(new Term("field", "value2")), BooleanClause.Occur.SHOULD);
+
+    BooleanQuery bq2 = new BooleanQuery();
+    bq2.add(new TermQuery(new Term("field", "value1")), BooleanClause.Occur.SHOULD);
+    bq2.add(new TermQuery(new Term("field", "value2")), BooleanClause.Occur.SHOULD);
+
+    assertEquals(bq1, bq2);
+  }
+}