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 2010/11/30 02:06:13 UTC
svn commit: r1040376 - in
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans:
TestBasics.java TestFieldMaskingSpanQuery.java
Author: rmuir
Date: Tue Nov 30 01:06:12 2010
New Revision: 1040376
URL: http://svn.apache.org/viewvc?rev=1040376&view=rev
Log:
don't use the slowwrapper for all of these tests... just the ones that require it
Modified:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1040376&r1=1040375&r2=1040376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java Tue Nov 30 01:06:12 2010
@@ -79,7 +79,7 @@ public class TestBasics extends LuceneTe
doc.add(newField("field", English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
- reader = new SlowMultiReaderWrapper(writer.getReader());
+ reader = writer.getReader();
searcher = new IndexSearcher(reader);
writer.close();
}
@@ -524,8 +524,8 @@ public class TestBasics extends LuceneTe
public void testSpansSkipTo() throws Exception {
SpanTermQuery t1 = new SpanTermQuery(new Term("field", "seventy"));
SpanTermQuery t2 = new SpanTermQuery(new Term("field", "seventy"));
- Spans s1 = t1.getSpans(searcher.getIndexReader());
- Spans s2 = t2.getSpans(searcher.getIndexReader());
+ Spans s1 = t1.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
+ Spans s2 = t2.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
assertTrue(s1.next());
assertTrue(s2.next());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=1040376&r1=1040375&r2=1040376&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Tue Nov 30 01:06:12 2010
@@ -110,7 +110,7 @@ public class TestFieldMaskingSpanQuery e
field("gender", "male"),
field("first", "bubba"),
field("last", "jones") }));
- reader = new SlowMultiReaderWrapper(writer.getReader());
+ reader = writer.getReader();
writer.close();
searcher = new IndexSearcher(reader);
}
@@ -256,7 +256,7 @@ public class TestFieldMaskingSpanQuery e
{ q1, new FieldMaskingSpanQuery(q2, "gender")});
check(q, new int[] { 0, 1, 2, 3, 4 });
- Spans span = q.getSpans(searcher.getIndexReader());
+ Spans span = q.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
assertEquals(true, span.next());
assertEquals(s(0,0,1), s(span));
@@ -297,8 +297,8 @@ public class TestFieldMaskingSpanQuery e
check(qA, new int[] { 0, 1, 2, 4 });
check(qB, new int[] { 0, 1, 2, 4 });
- Spans spanA = qA.getSpans(searcher.getIndexReader());
- Spans spanB = qB.getSpans(searcher.getIndexReader());
+ Spans spanA = qA.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
+ Spans spanB = qB.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
while (spanA.next()) {
assertTrue("spanB not still going", spanB.next());
@@ -319,7 +319,7 @@ public class TestFieldMaskingSpanQuery e
new FieldMaskingSpanQuery(qB, "id") }, -1, false );
check(q, new int[] { 0, 1, 2, 3 });
- Spans span = q.getSpans(searcher.getIndexReader());
+ Spans span = q.getSpans(new SlowMultiReaderWrapper(searcher.getIndexReader()));
assertEquals(true, span.next());
assertEquals(s(0,0,1), s(span));