You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/02/20 18:34:38 UTC
svn commit: r1570280 - in
/lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans:
TestAdvancedAnalyzers.java TestComplexPhraseSpanQuery.java
TestOverallSpanQueryParser.java TestSpanOnlyQueryParser.java
Author: rmuir
Date: Thu Feb 20 17:34:38 2014
New Revision: 1570280
URL: http://svn.apache.org/r1570280
Log:
LUCENE-5205: tim's test fixes
Modified:
lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestAdvancedAnalyzers.java
lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestComplexPhraseSpanQuery.java
lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestOverallSpanQueryParser.java
lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestSpanOnlyQueryParser.java
Modified: lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestAdvancedAnalyzers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestAdvancedAnalyzers.java?rev=1570280&r1=1570279&r2=1570280&view=diff
==============================================================================
--- lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestAdvancedAnalyzers.java (original)
+++ lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestAdvancedAnalyzers.java Thu Feb 20 17:34:38 2014
@@ -145,7 +145,7 @@ public class TestAdvancedAnalyzers exten
writer.addDocument(doc);
}
reader = writer.getReader();
- searcher = new IndexSearcher(reader);
+ searcher = newSearcher(reader);
writer.close();
}
Modified: lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestComplexPhraseSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestComplexPhraseSpanQuery.java?rev=1570280&r1=1570279&r2=1570280&view=diff
==============================================================================
--- lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestComplexPhraseSpanQuery.java (original)
+++ lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestComplexPhraseSpanQuery.java Thu Feb 20 17:34:38 2014
@@ -75,9 +75,11 @@ public class TestComplexPhraseSpanQuery
// checkMatches("\"john -percival\"", "1"); // not logic doesn't work
checkMatches("\"john percival\"!~2,2", "1"); // not logic doesn't work
- //WAS: leave commented out until LUCENE-5450 is resolved
-// checkMatches("\"john nosuchword*\"", ""); // phrases with clauses producing
- // checkMatches("\"john nosuchw?rd\"!~2,3", ""); // phrases with clauses producing
+ checkMatches("\"john nosuchword*\"", ""); // phrases with clauses producing
+ checkMatches("\"john nosuchw?rd\"!~2,3", "1,3"); // phrases with clauses producing
+ checkMatches("\"nosuchw?rd john\"!~2,3", ""); // phrases with clauses producing
+ checkMatches("\"nosuchw?rd john\"", ""); // phrases with clauses producing
+
// empty sets
checkBadQuery("\"jo* id:1 smith\""); // mixing fields in a phrase is bad
//WAS:
Modified: lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestOverallSpanQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestOverallSpanQueryParser.java?rev=1570280&r1=1570279&r2=1570280&view=diff
==============================================================================
--- lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestOverallSpanQueryParser.java (original)
+++ lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestOverallSpanQueryParser.java Thu Feb 20 17:34:38 2014
@@ -110,7 +110,7 @@ public class TestOverallSpanQueryParser
writer.addDocument(doc);
}
reader = writer.getReader();
- searcher = new IndexSearcher(reader);
+ searcher = newSearcher(reader);
writer.close();
parser = new SpanQueryParser(TEST_VERSION_CURRENT, FIELD1, analyzer);
Modified: lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestSpanOnlyQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestSpanOnlyQueryParser.java?rev=1570280&r1=1570279&r2=1570280&view=diff
==============================================================================
--- lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestSpanOnlyQueryParser.java (original)
+++ lucene/dev/branches/lucene5205/lucene/queryparser/src/test/org/apache/lucene/queryparser/spans/TestSpanOnlyQueryParser.java Thu Feb 20 17:34:38 2014
@@ -143,7 +143,7 @@ public class TestSpanOnlyQueryParser ext
writer.addDocument(doc);
}
reader = writer.getReader();
- searcher = new IndexSearcher(reader);
+ searcher = newSearcher(reader);
writer.close();
}