Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add .equals support for MultiTermQuery and subclasses. this facilitates unit testing comparison of Query instances 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@159688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Erik Hatcher 2005-04-01 13:51:04 +00:00
parent 1bf35879fc
commit f673bff9ef
4 changed files with 141 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/java/org/apache/lucene/search/FuzzyQuery.java
View File

@ -167,4 +167,24 @@ public final class FuzzyQuery extends MultiTermQuery {
}
}
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof FuzzyQuery)) return false;
if (!super.equals(o)) return false;
final FuzzyQuery fuzzyQuery = (FuzzyQuery) o;
if (minimumSimilarity != fuzzyQuery.minimumSimilarity) return false;
if (prefixLength != fuzzyQuery.prefixLength) return false;
return true;
}
public int hashCode() {
int result = super.hashCode();
result = 29 * result + minimumSimilarity != +0.0f ? Float.floatToIntBits(minimumSimilarity) : 0;
result = 29 * result + prefixLength;
return result;
}
}

15
src/java/org/apache/lucene/search/MultiTermQuery.java
View File

@ -86,4 +86,19 @@ public abstract class MultiTermQuery extends Query {
}
return buffer.toString();
}
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof MultiTermQuery)) return false;
final MultiTermQuery multiTermQuery = (MultiTermQuery) o;
if (!term.equals(multiTermQuery.term)) return false;
return true;
}
public int hashCode() {
return term.hashCode();
}
}

8
src/java/org/apache/lucene/search/WildcardQuery.java
View File

@ -37,5 +37,11 @@ public class WildcardQuery extends MultiTermQuery {
protected FilteredTermEnum getEnum(IndexReader reader) throws IOException {
return new WildcardTermEnum(reader, getTerm());
}
public boolean equals(Object o) {
if (o instanceof WildcardQuery)
return super.equals(o);
return false;
}
}

198
src/test/org/apache/lucene/search/TestWildcard.java
View File

@ -16,15 +16,13 @@ package org.apache.lucene.search;
* limitations under the License.
*/
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
import junit.framework.TestCase;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import junit.framework.TestCase;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.RAMDirectory;
import java.io.IOException;
@ -34,100 +32,102 @@ import java.io.IOException;
* @author Otis Gospodnetic
*/
public class TestWildcard
extends TestCase
{
/**
* Creates a new <code>TestWildcard</code> instance.
*
* @param name the name of the test
*/
public TestWildcard(String name)
{
super(name);
extends TestCase {
public void testEquals() {
WildcardQuery wq1 = new WildcardQuery(new Term("field", "b*a"));
WildcardQuery wq2 = new WildcardQuery(new Term("field", "b*a"));
WildcardQuery wq3 = new WildcardQuery(new Term("field", "b*a"));
// reflexive?
assertEquals(wq1, wq2);
assertEquals(wq2, wq1);
// transitive?
assertEquals(wq2, wq3);
assertEquals(wq1, wq3);
assertFalse(wq1.equals(null));
FuzzyQuery fq = new FuzzyQuery(new Term("field", "b*a"));
assertFalse(wq1.equals(fq));
assertFalse(fq.equals(wq1));
}
/**
* Tests Wildcard queries with an asterisk.
*/
public void testAsterisk()
throws IOException {
RAMDirectory indexStore = getIndexStore("body", new String[]
{"metal", "metals"});
IndexSearcher searcher = new IndexSearcher(indexStore);
Query query1 = new TermQuery(new Term("body", "metal"));
Query query2 = new WildcardQuery(new Term("body", "metal*"));
Query query3 = new WildcardQuery(new Term("body", "m*tal"));
Query query4 = new WildcardQuery(new Term("body", "m*tal*"));
Query query5 = new WildcardQuery(new Term("body", "m*tals"));
BooleanQuery query6 = new BooleanQuery();
query6.add(query5, BooleanClause.Occur.SHOULD);
BooleanQuery query7 = new BooleanQuery();
query7.add(query3, BooleanClause.Occur.SHOULD);
query7.add(query5, BooleanClause.Occur.SHOULD);
// Queries do not automatically lower-case search terms:
Query query8 = new WildcardQuery(new Term("body", "M*tal*"));
assertMatches(searcher, query1, 1);
assertMatches(searcher, query2, 2);
assertMatches(searcher, query3, 1);
assertMatches(searcher, query4, 2);
assertMatches(searcher, query5, 1);
assertMatches(searcher, query6, 1);
assertMatches(searcher, query7, 2);
assertMatches(searcher, query8, 0);
}
/**
* Tests Wildcard queries with a question mark.
*
* @throws IOException if an error occurs
*/
public void testQuestionmark()
throws IOException {
RAMDirectory indexStore = getIndexStore("body", new String[]
{"metal", "metals", "mXtals", "mXtXls"});
IndexSearcher searcher = new IndexSearcher(indexStore);
Query query1 = new WildcardQuery(new Term("body", "m?tal"));
Query query2 = new WildcardQuery(new Term("body", "metal?"));
Query query3 = new WildcardQuery(new Term("body", "metals?"));
Query query4 = new WildcardQuery(new Term("body", "m?t?ls"));
Query query5 = new WildcardQuery(new Term("body", "M?t?ls"));
assertMatches(searcher, query1, 1);
assertMatches(searcher, query2, 2);
assertMatches(searcher, query3, 1);
assertMatches(searcher, query4, 3);
assertMatches(searcher, query5, 0);
}
private RAMDirectory getIndexStore(String field, String[] contents)
throws IOException {
RAMDirectory indexStore = new RAMDirectory();
IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(), true);
for (int i = 0; i < contents.length; ++i) {
Document doc = new Document();
doc.add(new Field(field, contents[i], Field.Store.YES, Field.Index.TOKENIZED));
writer.addDocument(doc);
}
writer.optimize();
writer.close();
/**
* Tests Wildcard queries with an asterisk.
*
*/
public void testAsterisk()
throws IOException
{
RAMDirectory indexStore = getIndexStore("body", new String[]
{ "metal", "metals" }
);
IndexSearcher searcher = new IndexSearcher(indexStore);
Query query1 = new TermQuery(new Term("body", "metal"));
Query query2 = new WildcardQuery(new Term("body", "metal*"));
Query query3 = new WildcardQuery(new Term("body", "m*tal"));
Query query4 = new WildcardQuery(new Term("body", "m*tal*"));
Query query5 = new WildcardQuery(new Term("body", "m*tals"));
return indexStore;
}
BooleanQuery query6 = new BooleanQuery();
query6.add(query5, BooleanClause.Occur.SHOULD);
BooleanQuery query7 = new BooleanQuery();
query7.add(query3, BooleanClause.Occur.SHOULD);
query7.add(query5, BooleanClause.Occur.SHOULD);
// Queries do not automatically lower-case search terms:
Query query8 = new WildcardQuery(new Term("body", "M*tal*"));
assertMatches(searcher, query1, 1);
assertMatches(searcher, query2, 2);
assertMatches(searcher, query3, 1);
assertMatches(searcher, query4, 2);
assertMatches(searcher, query5, 1);
assertMatches(searcher, query6, 1);
assertMatches(searcher, query7, 2);
assertMatches(searcher, query8, 0);
}
/**
* Tests Wildcard queries with a question mark.
*
* @exception IOException if an error occurs
*/
public void testQuestionmark()
throws IOException
{
RAMDirectory indexStore = getIndexStore("body", new String[]
{ "metal", "metals", "mXtals", "mXtXls" }
);
IndexSearcher searcher = new IndexSearcher(indexStore);
Query query1 = new WildcardQuery(new Term("body", "m?tal"));
Query query2 = new WildcardQuery(new Term("body", "metal?"));
Query query3 = new WildcardQuery(new Term("body", "metals?"));
Query query4 = new WildcardQuery(new Term("body", "m?t?ls"));
Query query5 = new WildcardQuery(new Term("body", "M?t?ls"));
assertMatches(searcher, query1, 1);
assertMatches(searcher, query2, 2);
assertMatches(searcher, query3, 1);
assertMatches(searcher, query4, 3);
assertMatches(searcher, query5, 0);
}
private RAMDirectory getIndexStore(String field, String[] contents)
throws IOException
{
RAMDirectory indexStore = new RAMDirectory();
IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(), true);
for (int i = 0; i < contents.length; ++i) {
Document doc = new Document();
doc.add(new Field(field, contents[i], Field.Store.YES, Field.Index.TOKENIZED));
writer.addDocument(doc);
}
writer.optimize();
writer.close();
return indexStore;
}
private void assertMatches(IndexSearcher searcher, Query q, int expectedMatches)
throws IOException
{
Hits result = searcher.search(q);
assertEquals(expectedMatches, result.length());
}
private void assertMatches(IndexSearcher searcher, Query q, int expectedMatches)
throws IOException {
Hits result = searcher.search(q);
assertEquals(expectedMatches, result.length());
}
}