svn commit: r1237354 - in /lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index: TestNRTThreads.java TestNorms.java TestOmitNorms.java

[rm...@apache.org]

Author: rmuir
Date: Sun Jan 29 17:09:45 2012
New Revision: 1237354

URL: http://svn.apache.org/viewvc?rev=1237354&view=rev
Log:
LUCENE-2858: fix tests

Modified:
    lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
    lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNorms.java
    lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java

Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java?rev=1237354&r1=1237353&r2=1237354&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java Sun Jan 29 17:09:45 2012
@@ -36,14 +36,14 @@ public class TestNRTThreads extends Thre
 
     boolean anyOpenDelFiles = false;
 
-    IndexReader r = IndexReader.open(writer, true);
+    DirectoryReader r = IndexReader.open(writer, true);
 
     while (System.currentTimeMillis() < stopTime && !failed.get()) {
       if (random.nextBoolean()) {
         if (VERBOSE) {
           System.out.println("TEST: now reopen r=" + r);
         }
-        final IndexReader r2 = IndexReader.openIfChanged(r);
+        final DirectoryReader r2 = DirectoryReader.openIfChanged(r);
         if (r2 != null) {
           r.close();
           r = r2;

Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNorms.java?rev=1237354&r1=1237353&r2=1237354&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestNorms.java Sun Jan 29 17:09:45 2012
@@ -98,7 +98,7 @@ public class TestNorms extends LuceneTes
   public void testMaxByteNorms() throws IOException {
     Directory dir = newDirectory();
     buildIndex(dir, true);
-    IndexReader open = SlowCompositeReaderWrapper.wrap(IndexReader.open(dir));
+    AtomicIndexReader open = SlowCompositeReaderWrapper.wrap(IndexReader.open(dir));
     DocValues normValues = open.normValues(byteTestField);
     assertNotNull(normValues);
     Source source = normValues.getSource();
@@ -129,7 +129,7 @@ public class TestNorms extends LuceneTes
     boolean secondWriteNorm = random.nextBoolean();
     buildIndex(otherDir, secondWriteNorm);
 
-    IndexReader reader = SlowCompositeReaderWrapper.wrap(IndexReader.open(otherDir));
+    AtomicIndexReader reader = SlowCompositeReaderWrapper.wrap(IndexReader.open(otherDir));
     FieldInfos fieldInfos = reader.getFieldInfos();
     FieldInfo fieldInfo = fieldInfos.fieldInfo(byteTestField);
     assertFalse(fieldInfo.omitNorms);
@@ -144,7 +144,7 @@ public class TestNorms extends LuceneTes
         new MockAnalyzer(random));
     RandomIndexWriter writer = new RandomIndexWriter(random, dir, config);
     writer.addIndexes(reader);
-    IndexReader mergedReader = SlowCompositeReaderWrapper.wrap(writer.getReader());
+    AtomicIndexReader mergedReader = SlowCompositeReaderWrapper.wrap(writer.getReader());
     if (!firstWriteNorm && !secondWriteNorm) {
       DocValues normValues = mergedReader.normValues(byteTestField);
       assertNull(normValues);

Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java?rev=1237354&r1=1237353&r2=1237354&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java Sun Jan 29 17:09:45 2012
@@ -295,8 +295,8 @@ public class TestOmitNorms extends Lucen
     
     // fully merge and validate MultiNorms against single segment.
     riw.forceMerge(1);
-    IndexReader ir2 = riw.getReader();
-    DocValues dv2 = ir2.getSequentialSubReaders()[0].normValues(field);
+    DirectoryReader ir2 = riw.getReader();
+    DocValues dv2 = getOnlySegmentReader(ir2).normValues(field);
     byte[] norms2 = dv2 == null ? null : (byte[]) dv2.getSource().getArray();
     
     assertArrayEquals(norms1, norms2);