You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by us...@apache.org on 2009/12/06 22:30:21 UTC
svn commit: r887779 [2/2] - in /lucene/java/branches/flex_1458: ./
contrib/highlighter/src/java/org/apache/lucene/search/highlight/
contrib/queries/src/java/org/apache/lucene/search/
contrib/regex/src/java/org/apache/lucene/search/regex/ src/java/org/a...
Modified: lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=887779&r1=887778&r2=887779&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestTermRangeQuery.java Sun Dec 6 21:30:20 2009
@@ -80,6 +80,25 @@
assertEquals("C added - A, B, C in range", 3, hits.length);
searcher.close();
}
+
+ public void testAllDocs() throws Exception {
+ initializeIndex(new String[]{"A", "B", "C", "D"});
+ IndexSearcher searcher = new IndexSearcher(dir, true);
+ TermRangeQuery query = new TermRangeQuery("content", null, null, true, true);
+ assertFalse(query.getTermsEnum(searcher.getIndexReader()) instanceof TermRangeTermsEnum);
+ assertEquals(4, searcher.search(query, null, 1000).scoreDocs.length);
+ query = new TermRangeQuery("content", null, null, false, false);
+ assertFalse(query.getTermsEnum(searcher.getIndexReader()) instanceof TermRangeTermsEnum);
+ assertEquals(4, searcher.search(query, null, 1000).scoreDocs.length);
+ query = new TermRangeQuery("content", "", null, true, false);
+ assertFalse(query.getTermsEnum(searcher.getIndexReader()) instanceof TermRangeTermsEnum);
+ assertEquals(4, searcher.search(query, null, 1000).scoreDocs.length);
+ // and now anothe one
+ query = new TermRangeQuery("content", "B", null, true, false);
+ assertTrue(query.getTermsEnum(searcher.getIndexReader()) instanceof TermRangeTermsEnum);
+ assertEquals(3, searcher.search(query, null, 1000).scoreDocs.length);
+ searcher.close();
+ }
public void testEqualsHashcode() {
Query query = new TermRangeQuery("content", "A", "C", true, true);
Modified: lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestWildcard.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestWildcard.java?rev=887779&r1=887778&r2=887779&view=diff
==============================================================================
--- lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestWildcard.java (original)
+++ lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestWildcard.java Sun Dec 6 21:30:20 2009
@@ -120,30 +120,14 @@
MultiTermQuery wq = new WildcardQuery(new Term("field", "prefix*"));
assertMatches(searcher, wq, 2);
- MultiTermQuery expected = new PrefixQuery(new Term("field", "prefix"));
- wq.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE);
- wq.setBoost(0.1F);
- expected.setRewriteMethod(wq.getRewriteMethod());
- expected.setBoost(wq.getBoost());
- assertEquals(searcher.rewrite(expected), searcher.rewrite(wq));
-
- wq.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
- wq.setBoost(0.2F);
- expected.setRewriteMethod(wq.getRewriteMethod());
- expected.setBoost(wq.getBoost());
- assertEquals(searcher.rewrite(expected), searcher.rewrite(wq));
-
- wq.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT);
- wq.setBoost(0.3F);
- expected.setRewriteMethod(wq.getRewriteMethod());
- expected.setBoost(wq.getBoost());
- assertEquals(searcher.rewrite(expected), searcher.rewrite(wq));
-
- wq.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE);
- wq.setBoost(0.4F);
- expected.setRewriteMethod(wq.getRewriteMethod());
- expected.setBoost(wq.getBoost());
- assertEquals(searcher.rewrite(expected), searcher.rewrite(wq));
+ assertTrue(wq.getEnum(searcher.getIndexReader()) instanceof PrefixTermEnum);
+ assertTrue(wq.getTermsEnum(searcher.getIndexReader()) instanceof PrefixTermsEnum);
+
+ wq = new WildcardQuery(new Term("field", "*"));
+ assertMatches(searcher, wq, 2);
+ assertTrue(wq.getEnum(searcher.getIndexReader()) instanceof PrefixTermEnum);
+ assertFalse(wq.getTermsEnum(searcher.getIndexReader()) instanceof PrefixTermsEnum);
+ assertFalse(wq.getTermsEnum(searcher.getIndexReader()) instanceof WildcardTermsEnum);
}
/**