LUCENE-5666: fix test to assert from raw reader

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5666@1594258 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2014-05-13 16:07:36 +00:00
parent 1489085807
commit c58788c27a
2 changed files with 4 additions and 4 deletions

View File

@ -129,7 +129,7 @@ public class TestNRTOpen extends SolrTestCaseJ4 {
static void assertNRT(int maxDoc) { static void assertNRT(int maxDoc) {
RefCounted<SolrIndexSearcher> searcher = h.getCore().getSearcher(); RefCounted<SolrIndexSearcher> searcher = h.getCore().getSearcher();
try { try {
DirectoryReader ir = searcher.get().getIndexReader(); DirectoryReader ir = searcher.get().getRawReader();
assertEquals(maxDoc, ir.maxDoc()); assertEquals(maxDoc, ir.maxDoc());
assertTrue("expected NRT reader, got: " + ir, ir.toString().contains(":nrt")); assertTrue("expected NRT reader, got: " + ir, ir.toString().contains(":nrt"));
} finally { } finally {
@ -141,7 +141,7 @@ public class TestNRTOpen extends SolrTestCaseJ4 {
RefCounted<SolrIndexSearcher> searcher = h.getCore().getSearcher(); RefCounted<SolrIndexSearcher> searcher = h.getCore().getSearcher();
Set<Object> set = Collections.newSetFromMap(new IdentityHashMap<Object,Boolean>()); Set<Object> set = Collections.newSetFromMap(new IdentityHashMap<Object,Boolean>());
try { try {
DirectoryReader ir = searcher.get().getIndexReader(); DirectoryReader ir = searcher.get().getRawReader();
for (AtomicReaderContext context : ir.leaves()) { for (AtomicReaderContext context : ir.leaves()) {
set.add(context.reader().getCoreCacheKey()); set.add(context.reader().getCoreCacheKey());
} }

View File

@ -138,7 +138,7 @@ public class TestNonNRTOpen extends SolrTestCaseJ4 {
RefCounted<SolrIndexSearcher> searcher = core.getSearcher(); RefCounted<SolrIndexSearcher> searcher = core.getSearcher();
try { try {
SolrIndexSearcher s = searcher.get(); SolrIndexSearcher s = searcher.get();
DirectoryReader ir = s.getIndexReader(); DirectoryReader ir = s.getRawReader();
assertEquals("SOLR-5815? : wrong maxDoc: core=" + core.toString() +" searcher=" + s.toString(), assertEquals("SOLR-5815? : wrong maxDoc: core=" + core.toString() +" searcher=" + s.toString(),
maxDoc, ir.maxDoc()); maxDoc, ir.maxDoc());
assertFalse("SOLR-5815? : expected non-NRT reader, got: " + ir, ir.toString().contains(":nrt")); assertFalse("SOLR-5815? : expected non-NRT reader, got: " + ir, ir.toString().contains(":nrt"));
@ -151,7 +151,7 @@ public class TestNonNRTOpen extends SolrTestCaseJ4 {
RefCounted<SolrIndexSearcher> searcher = h.getCore().getSearcher(); RefCounted<SolrIndexSearcher> searcher = h.getCore().getSearcher();
Set<Object> set = Collections.newSetFromMap(new IdentityHashMap<Object,Boolean>()); Set<Object> set = Collections.newSetFromMap(new IdentityHashMap<Object,Boolean>());
try { try {
DirectoryReader ir = searcher.get().getIndexReader(); DirectoryReader ir = searcher.get().getRawReader();
for (AtomicReaderContext context : ir.leaves()) { for (AtomicReaderContext context : ir.leaves()) {
set.add(context.reader().getCoreCacheKey()); set.add(context.reader().getCoreCacheKey());
} }