You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2013/04/15 16:49:54 UTC
svn commit: r1468101 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/java/org/apache/lucene/search/spans/
lucene/core/src/test/org/apache/lucene/codecs/lucene41/ lucene/core/sr...
Author: jpountz
Date: Mon Apr 15 14:49:54 2013
New Revision: 1468101
URL: http://svn.apache.org/r1468101
Log:
LUCENE-4924: DocIdSetIterator.docID() must return -1 when the iterator is not positioned (partially merged from r1468083).
Classes that inherit DocIdSetIterator have been fixed to return -1 when the
iterator is not positioned, but it is still allowed in 4.x to return
NO_MORE_DOCS in such a case.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Scorer.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java Mon Apr 15 14:49:54 2013
@@ -29,20 +29,36 @@ public abstract class DocIdSet {
/** An empty {@code DocIdSet} instance for easy use, e.g. in Filters that hit no documents. */
public static final DocIdSet EMPTY_DOCIDSET = new DocIdSet() {
- private final DocIdSetIterator iterator = new DocIdSetIterator() {
- @Override
- public int advance(int target) { return NO_MORE_DOCS; }
- @Override
- public int docID() { return NO_MORE_DOCS; }
- @Override
- public int nextDoc() { return NO_MORE_DOCS; }
- @Override
- public long cost() { return 0; }
- };
-
@Override
public DocIdSetIterator iterator() {
- return iterator;
+ return new DocIdSetIterator() {
+ boolean exhausted = false;
+
+ @Override
+ public int advance(int target) {
+ assert !exhausted;
+ assert target >= 0;
+ exhausted = true;
+ return NO_MORE_DOCS;
+ }
+
+ @Override
+ public int docID() {
+ return exhausted ? NO_MORE_DOCS : -1;
+ }
+
+ @Override
+ public int nextDoc() {
+ assert !exhausted;
+ exhausted = true;
+ return NO_MORE_DOCS;
+ }
+
+ @Override
+ public long cost() {
+ return 0;
+ }
+ };
}
@Override
@@ -56,7 +72,7 @@ public abstract class DocIdSet {
return null;
}
};
-
+
/** Provides a {@link DocIdSetIterator} to access the set.
* This implementation can return <code>null</code> or
* <code>{@linkplain #EMPTY_DOCIDSET}.iterator()</code> if there
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Scorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Scorer.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Scorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/Scorer.java Mon Apr 15 14:49:54 2013
@@ -58,7 +58,7 @@ public abstract class Scorer extends Doc
* @param collector The collector to which all matching documents are passed.
*/
public void score(Collector collector) throws IOException {
- assert docID() == -1 || docID() == NO_MORE_DOCS; // not started
+ assert docID() == -1; // not started
collector.setScorer(this);
int doc;
while ((doc = nextDoc()) != NO_MORE_DOCS) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java Mon Apr 15 14:49:54 2013
@@ -42,12 +42,8 @@ public class SpanScorer extends Scorer {
this.docScorer = docScorer;
this.spans = spans;
- if (this.spans.next()) {
- doc = -1;
- } else {
- doc = NO_MORE_DOCS;
- more = false;
- }
+ doc = -1;
+ more = spans.next();
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java Mon Apr 15 14:49:54 2013
@@ -394,8 +394,8 @@ public class TestBlockPostingsFormat3 ex
assertNull(rightDocs);
return;
}
- assertTrue(leftDocs.docID() == -1 || leftDocs.docID() == DocIdSetIterator.NO_MORE_DOCS);
- assertTrue(rightDocs.docID() == -1 || rightDocs.docID() == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, leftDocs.docID());
+ assertEquals(-1, rightDocs.docID());
int docid;
while ((docid = leftDocs.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
assertEquals(docid, rightDocs.nextDoc());
@@ -417,8 +417,8 @@ public class TestBlockPostingsFormat3 ex
assertNull(rightDocs);
return;
}
- assertTrue(leftDocs.docID() == -1 || leftDocs.docID() == DocIdSetIterator.NO_MORE_DOCS);
- assertTrue(rightDocs.docID() == -1 || rightDocs.docID() == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, leftDocs.docID());
+ assertEquals(-1, rightDocs.docID());
int docid;
while ((docid = leftDocs.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
assertEquals(docid, rightDocs.nextDoc());
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java Mon Apr 15 14:49:54 2013
@@ -336,7 +336,7 @@ public class TestDocsAndPositions extend
AtomicReader r = getOnlySegmentReader(reader);
DocsEnum disi = _TestUtil.docs(random(), r, "foo", new BytesRef("bar"), null, null, DocsEnum.FLAG_NONE);
int docid = disi.docID();
- assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, docid);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
@@ -344,7 +344,7 @@ public class TestDocsAndPositions extend
assertTrue(te.seekExact(new BytesRef("bar"), true));
disi = _TestUtil.docs(random(), te, null, disi, DocsEnum.FLAG_NONE);
docid = disi.docID();
- assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, docid);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
writer.close();
r.close();
@@ -361,7 +361,7 @@ public class TestDocsAndPositions extend
AtomicReader r = getOnlySegmentReader(reader);
DocsAndPositionsEnum disi = r.termPositionsEnum(new Term("foo", "bar"));
int docid = disi.docID();
- assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, docid);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
@@ -369,7 +369,7 @@ public class TestDocsAndPositions extend
assertTrue(te.seekExact(new BytesRef("bar"), true));
disi = te.docsAndPositions(null, disi);
docid = disi.docID();
- assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, docid);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
writer.close();
r.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Mon Apr 15 14:49:54 2013
@@ -229,7 +229,7 @@ public class TestTermVectorsReader exten
docsEnum = _TestUtil.docs(random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE);
assertNotNull(docsEnum);
int doc = docsEnum.docID();
- assertTrue(doc == -1 || doc == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, doc);
assertTrue(docsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(DocIdSetIterator.NO_MORE_DOCS, docsEnum.nextDoc());
}
@@ -256,7 +256,7 @@ public class TestTermVectorsReader exten
dpEnum = termsEnum.docsAndPositions(null, dpEnum);
assertNotNull(dpEnum);
int doc = dpEnum.docID();
- assertTrue(doc == -1 || doc == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, doc);
assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(dpEnum.freq(), positions[i].length);
for (int j = 0; j < positions[i].length; j++) {
@@ -266,7 +266,7 @@ public class TestTermVectorsReader exten
dpEnum = termsEnum.docsAndPositions(null, dpEnum);
doc = dpEnum.docID();
- assertTrue(doc == -1 || doc == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, doc);
assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertNotNull(dpEnum);
assertEquals(dpEnum.freq(), positions[i].length);
Modified: lucene/dev/branches/branch_4x/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java Mon Apr 15 14:49:54 2013
@@ -193,29 +193,22 @@ class TermsIncludingScoreQuery extends Q
DocsEnum docsEnum;
DocsEnum reuse;
int scoreUpto;
+ int doc;
SVInnerScorer(Weight weight, Bits acceptDocs, TermsEnum termsEnum, long cost) {
super(weight);
this.acceptDocs = acceptDocs;
this.termsEnum = termsEnum;
this.cost = cost;
+ this.doc = -1;
}
@Override
public void score(Collector collector) throws IOException {
- score(collector, NO_MORE_DOCS, nextDocOutOfOrder());
- }
-
- @Override
- public boolean score(Collector collector, int max, int firstDocID)
- throws IOException {
- assert collector.acceptsDocsOutOfOrder();
collector.setScorer(this);
- int doc;
- for (doc = firstDocID; doc < max; doc = nextDocOutOfOrder()) {
+ for (int doc = nextDocOutOfOrder(); doc != NO_MORE_DOCS; doc = nextDocOutOfOrder()) {
collector.collect(doc);
}
- return doc != NO_MORE_DOCS;
}
@Override
@@ -229,7 +222,7 @@ class TermsIncludingScoreQuery extends Q
@Override
public int docID() {
- return docsEnum != null ? docsEnum.docID() : DocIdSetIterator.NO_MORE_DOCS;
+ return doc;
}
int nextDocOutOfOrder() throws IOException {
@@ -238,13 +231,13 @@ class TermsIncludingScoreQuery extends Q
if (docId == DocIdSetIterator.NO_MORE_DOCS) {
docsEnum = null;
} else {
- return docId;
+ return doc = docId;
}
}
do {
if (upto == terms.size()) {
- return DocIdSetIterator.NO_MORE_DOCS;
+ return doc = DocIdSetIterator.NO_MORE_DOCS;
}
scoreUpto = upto;
@@ -253,7 +246,7 @@ class TermsIncludingScoreQuery extends Q
}
} while (docsEnum == null);
- return docsEnum.nextDoc();
+ return doc = docsEnum.nextDoc();
}
@Override
Modified: lucene/dev/branches/branch_4x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Mon Apr 15 14:49:54 2013
@@ -323,7 +323,7 @@ public class MemoryIndexTest extends Bas
AtomicReader reader = (AtomicReader) memory.createSearcher().getIndexReader();
DocsEnum disi = _TestUtil.docs(random(), reader, "foo", new BytesRef("bar"), null, null, DocsEnum.FLAG_NONE);
int docid = disi.docID();
- assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, docid);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
// now reuse and check again
@@ -331,7 +331,7 @@ public class MemoryIndexTest extends Bas
assertTrue(te.seekExact(new BytesRef("bar"), true));
disi = te.docs(null, disi, DocsEnum.FLAG_NONE);
docid = disi.docID();
- assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, docid);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
reader.close();
}
@@ -354,7 +354,7 @@ public class MemoryIndexTest extends Bas
assertEquals(1, reader.terms("foo").getSumTotalTermFreq());
DocsAndPositionsEnum disi = reader.termPositionsEnum(new Term("foo", "bar"));
int docid = disi.docID();
- assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, docid);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(0, disi.nextPosition());
assertEquals(0, disi.startOffset());
@@ -365,7 +365,7 @@ public class MemoryIndexTest extends Bas
assertTrue(te.seekExact(new BytesRef("bar"), true));
disi = te.docsAndPositions(null, disi);
docid = disi.docID();
- assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(-1, docid);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
reader.close();
memory.reset();
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java Mon Apr 15 14:49:54 2013
@@ -237,7 +237,7 @@ public class AssertingAtomicReader exten
super(in);
try {
int docid = in.docID();
- assert docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS : in.getClass() + ": invalid initial doc id: " + docid;
+ assert docid == -1 : in.getClass() + ": invalid initial doc id: " + docid;
} catch (UnsupportedOperationException e) {
if (failOnUnsupportedDocID) {
throw e;
@@ -256,7 +256,7 @@ public class AssertingAtomicReader exten
} else {
state = DocsEnumState.ITERATING;
}
- assert docID() == nextDoc;
+ assert super.docID() == nextDoc;
return doc = nextDoc;
}
@@ -271,13 +271,15 @@ public class AssertingAtomicReader exten
} else {
state = DocsEnumState.ITERATING;
}
- assert docID() == advanced;
+ assert super.docID() == advanced;
return doc = advanced;
}
- // NOTE: We don't assert anything for docId(). Specifically DocsEnum javadocs
- // are ambiguous with DocIdSetIterator here, DocIdSetIterator says its ok
- // to call this method before nextDoc(), just that it must be -1 or NO_MORE_DOCS!
+ @Override
+ public int docID() {
+ assert doc == super.docID() : " invalid docID() in " + in.getClass() + " " + super.docID() + " instead of " + doc;
+ return doc;
+ }
@Override
public int freq() throws IOException {
@@ -298,7 +300,7 @@ public class AssertingAtomicReader exten
public AssertingDocsAndPositionsEnum(DocsAndPositionsEnum in) {
super(in);
int docid = in.docID();
- assert docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS : "invalid initial doc id: " + docid;
+ assert docid == -1 : "invalid initial doc id: " + docid;
doc = -1;
}
@@ -315,7 +317,7 @@ public class AssertingAtomicReader exten
state = DocsEnumState.ITERATING;
positionMax = super.freq();
}
- assert docID() == nextDoc;
+ assert super.docID() == nextDoc;
return doc = nextDoc;
}
@@ -333,11 +335,17 @@ public class AssertingAtomicReader exten
state = DocsEnumState.ITERATING;
positionMax = super.freq();
}
- assert docID() == advanced;
+ assert super.docID() == advanced;
return doc = advanced;
}
@Override
+ public int docID() {
+ assert doc == super.docID() : " invalid docID() in " + in.getClass() + " " + super.docID() + " instead of " + doc;
+ return doc;
+ }
+
+ @Override
public int freq() throws IOException {
assert state != DocsEnumState.START : "freq() called before nextDoc()/advance()";
assert state != DocsEnumState.FINISHED : "freq() called after NO_MORE_DOCS";
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Mon Apr 15 14:49:54 2013
@@ -66,9 +66,6 @@ import org.junit.BeforeClass;
// TODO test when you reuse after skipping a term or two, eg the block reuse case
-// TODO hmm contract says .doc() can return NO_MORE_DOCS
-// before nextDoc too...?
-
/* TODO
- threads
- assert doc=-1 before any nextDoc
@@ -699,7 +696,7 @@ public abstract class BasePostingsFormat
assertNotNull("null DocsEnum", docsEnum);
int initialDocID = docsEnum.docID();
- assertTrue("inital docID should be -1 or NO_MORE_DOCS: " + docsEnum, initialDocID == -1 || initialDocID == DocsEnum.NO_MORE_DOCS);
+ assertEquals("inital docID should be -1" + docsEnum, -1, initialDocID);
if (VERBOSE) {
if (prevDocsEnum == null) {
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1468101&r1=1468100&r2=1468101&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Mon Apr 15 14:49:54 2013
@@ -1541,8 +1541,8 @@ public abstract class LuceneTestCase ext
assertNull(rightDocs);
return;
}
- assertTrue(info, leftDocs.docID() == -1 || leftDocs.docID() == DocIdSetIterator.NO_MORE_DOCS);
- assertTrue(info, rightDocs.docID() == -1 || rightDocs.docID() == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(info, -1, leftDocs.docID());
+ assertEquals(info, -1, rightDocs.docID());
int docid;
while ((docid = leftDocs.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
assertEquals(info, docid, rightDocs.nextDoc());
@@ -1566,8 +1566,8 @@ public abstract class LuceneTestCase ext
assertNull(rightDocs);
return;
}
- assertTrue(info, leftDocs.docID() == -1 || leftDocs.docID() == DocIdSetIterator.NO_MORE_DOCS);
- assertTrue(info, rightDocs.docID() == -1 || rightDocs.docID() == DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(info, -1, leftDocs.docID());
+ assertEquals(info, -1, rightDocs.docID());
int docid;
while ((docid = leftDocs.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
assertEquals(info, docid, rightDocs.nextDoc());