svn commit: r1237393 - in /lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index: TestTermsEnum.java TestTypePromotion.java

[us...@apache.org]

Author: uschindler
Date: Sun Jan 29 17:54:35 2012
New Revision: 1237393

URL: http://svn.apache.org/viewvc?rev=1237393&view=rev
Log:
LUCENE-2858: Fix remaining index pkg tests

Modified:
    lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java
    lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java

Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1237393&r1=1237392&r2=1237393&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java Sun Jan 29 17:54:35 2012
@@ -377,7 +377,6 @@ public class TestTermsEnum extends Lucen
   }
 
   private void close() throws Exception {
-    final Directory d = ((SegmentReader) r.getSequentialSubReaders()[0]).directory();
     r.close();
     d.close();
   }

Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java?rev=1237393&r1=1237392&r2=1237393&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestTypePromotion.java Sun Jan 29 17:54:35 2012
@@ -29,6 +29,7 @@ import org.apache.lucene.document.Field;
 import org.apache.lucene.document.DocValuesField;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.IndexReader.ReaderContext;
+import org.apache.lucene.index.AtomicIndexReader.AtomicReaderContext;
 import org.apache.lucene.index.DocValues.Source;
 import org.apache.lucene.index.DocValues.Type;
 import org.apache.lucene.store.Directory;
@@ -117,12 +118,12 @@ public class TestTypePromotion extends L
   
   private void assertValues(TestType type, Directory dir, long[] values)
       throws CorruptIndexException, IOException {
-    IndexReader reader = IndexReader.open(dir);
+    DirectoryReader reader = DirectoryReader.open(dir);
     assertEquals(1, reader.getSequentialSubReaders().length);
     ReaderContext topReaderContext = reader.getTopReaderContext();
-    ReaderContext[] children = topReaderContext.children();
-    DocValues docValues = children[0].reader.docValues("promote");
+    AtomicReaderContext[] children = topReaderContext.leaves();
     assertEquals(1, children.length);
+    DocValues docValues = children[0].reader().docValues("promote");
     Source directSource = docValues.getDirectSource();
     for (int i = 0; i < values.length; i++) {
       int id = Integer.parseInt(reader.document(i).get("id"));
@@ -332,11 +333,11 @@ public class TestTypePromotion extends L
     // now merge
     writer.forceMerge(1);
     writer.close();
-    IndexReader reader = IndexReader.open(dir);
+    DirectoryReader reader = DirectoryReader.open(dir);
     assertEquals(1, reader.getSequentialSubReaders().length);
     ReaderContext topReaderContext = reader.getTopReaderContext();
-    ReaderContext[] children = topReaderContext.children();
-    DocValues docValues = children[0].reader.docValues("promote");
+    AtomicReaderContext[] children = topReaderContext.leaves();
+    DocValues docValues = children[0].reader().docValues("promote");
     assertNotNull(docValues);
     assertValues(TestType.Byte, dir, values);
     assertEquals(Type.BYTES_VAR_STRAIGHT, docValues.type());