diff options
Diffstat (limited to 'core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java')
| -rw-r--r-- | core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java index c96292d90e..c22114e28a 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTestCase.java @@ -31,6 +31,7 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.Strings; import org.elasticsearch.search.MultiValueMode; +import java.io.IOException; import java.util.List; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @@ -77,8 +78,8 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes AtomicFieldData fieldData = indexFieldData.load(readerContext); SortedBinaryDocValues values = fieldData.getBytesValues(); for (int i = 0; i < readerContext.reader().maxDoc(); ++i) { - values.setDocument(i); - assertThat(values.count(), greaterThanOrEqualTo(1)); + assertTrue(values.advanceExact(i)); + assertThat(values.docValueCount(), greaterThanOrEqualTo(1)); } } } @@ -93,16 +94,17 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes SortedBinaryDocValues bytesValues = fieldData.getBytesValues(); - bytesValues.setDocument(0); - assertThat(bytesValues.count(), equalTo(1)); - assertThat(bytesValues.valueAt(0), equalTo(new BytesRef(two()))); - bytesValues.setDocument(1); - assertThat(bytesValues.count(), equalTo(1)); - assertThat(bytesValues.valueAt(0), equalTo(new BytesRef(one()))); - bytesValues.setDocument(2); - assertThat(bytesValues.count(), equalTo(1)); - assertThat(bytesValues.valueAt(0), equalTo(new BytesRef(three()))); - + assertTrue(bytesValues.advanceExact(0)); + assertThat(bytesValues.docValueCount(), equalTo(1)); + assertThat(bytesValues.nextValue(), equalTo(new BytesRef(two()))); + assertTrue(bytesValues.advanceExact(1)); + assertThat(bytesValues.docValueCount(), equalTo(1)); + assertThat(bytesValues.nextValue(), equalTo(new BytesRef(one()))); + assertTrue(bytesValues.advanceExact(2)); + assertThat(bytesValues.docValueCount(), equalTo(1)); + assertThat(bytesValues.nextValue(), equalTo(new BytesRef(three()))); + + bytesValues = fieldData.getBytesValues(); assertValues(bytesValues, 0, two()); assertValues(bytesValues, 1, one()); assertValues(bytesValues, 2, three()); @@ -132,19 +134,23 @@ public abstract class AbstractFieldDataImplTestCase extends AbstractFieldDataTes protected abstract void fillSingleValueWithMissing() throws Exception; - public void assertValues(SortedBinaryDocValues values, int docId, BytesRef... actualValues) { - values.setDocument(docId); - assertThat(values.count(), equalTo(actualValues.length)); - for (int i = 0; i < actualValues.length; i++) { - assertThat(values.valueAt(i), equalTo(actualValues[i])); + public void assertValues(SortedBinaryDocValues values, int docId, BytesRef... actualValues) throws IOException { + assertEquals(actualValues.length > 0, values.advanceExact(docId)); + if (actualValues.length > 0) { + assertThat(values.docValueCount(), equalTo(actualValues.length)); + for (int i = 0; i < actualValues.length; i++) { + assertThat(values.nextValue(), equalTo(actualValues[i])); + } } } - public void assertValues(SortedBinaryDocValues values, int docId, String... actualValues) { - values.setDocument(docId); - assertThat(values.count(), equalTo(actualValues.length)); - for (int i = 0; i < actualValues.length; i++) { - assertThat(values.valueAt(i), equalTo(new BytesRef(actualValues[i]))); + public void assertValues(SortedBinaryDocValues values, int docId, String... actualValues) throws IOException { + assertEquals(actualValues.length > 0, values.advanceExact(docId)); + if (actualValues.length > 0) { + assertThat(values.docValueCount(), equalTo(actualValues.length)); + for (int i = 0; i < actualValues.length; i++) { + assertThat(values.nextValue(), equalTo(new BytesRef(actualValues[i]))); + } } } |