You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/29 18:23:52 UTC
svn commit: r1237368 - in
/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index:
TestIndexWriterCommit.java TestIndexWriterConfig.java
TestIndexWriterForceMerge.java
Author: rmuir
Date: Sun Jan 29 17:23:51 2012
New Revision: 1237368
URL: http://svn.apache.org/viewvc?rev=1237368&view=rev
Log:
LUCENE-2858: fix tests
Modified:
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java?rev=1237368&r1=1237367&r2=1237368&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterCommit.java Sun Jan 29 17:23:51 2012
@@ -51,7 +51,7 @@ public class TestIndexWriterCommit exten
writer.close();
Term searchTerm = new Term("content", "aaa");
- IndexReader reader = IndexReader.open(dir);
+ DirectoryReader reader = IndexReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
assertEquals("first number of hits", 14, hits.length);
@@ -279,7 +279,7 @@ public class TestIndexWriterCommit exten
writer.forceMerge(1);
// Open a reader before closing (commiting) the writer:
- IndexReader reader = IndexReader.open(dir);
+ DirectoryReader reader = IndexReader.open(dir);
// Reader should see index as multi-seg at this
// point:
@@ -339,7 +339,7 @@ public class TestIndexWriterCommit exten
public void run() {
try {
final Document doc = new Document();
- IndexReader r = IndexReader.open(dir);
+ DirectoryReader r = IndexReader.open(dir);
Field f = newField("f", "", StringField.TYPE_UNSTORED);
doc.add(f);
int count = 0;
@@ -350,7 +350,7 @@ public class TestIndexWriterCommit exten
f.setValue(s);
w.addDocument(doc);
w.commit();
- IndexReader r2 = IndexReader.openIfChanged(r);
+ DirectoryReader r2 = DirectoryReader.openIfChanged(r);
assertNotNull(r2);
assertTrue(r2 != r);
r.close();
@@ -390,10 +390,10 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 23; i++)
TestIndexWriter.addDoc(writer);
- IndexReader reader = IndexReader.open(dir);
+ DirectoryReader reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
writer.commit();
- IndexReader reader2 = IndexReader.openIfChanged(reader);
+ DirectoryReader reader2 = DirectoryReader.openIfChanged(reader);
assertNotNull(reader2);
assertEquals(0, reader.numDocs());
assertEquals(23, reader2.numDocs());
@@ -501,7 +501,7 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 23; i++)
TestIndexWriter.addDoc(writer);
- IndexReader reader = IndexReader.open(dir);
+ DirectoryReader reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
writer.prepareCommit();
@@ -511,7 +511,7 @@ public class TestIndexWriterCommit exten
writer.commit();
- IndexReader reader3 = IndexReader.openIfChanged(reader);
+ IndexReader reader3 = DirectoryReader.openIfChanged(reader);
assertNotNull(reader3);
assertEquals(0, reader.numDocs());
assertEquals(0, reader2.numDocs());
@@ -558,7 +558,7 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 23; i++)
TestIndexWriter.addDoc(writer);
- IndexReader reader = IndexReader.open(dir);
+ DirectoryReader reader = IndexReader.open(dir);
assertEquals(0, reader.numDocs());
writer.prepareCommit();
@@ -568,7 +568,7 @@ public class TestIndexWriterCommit exten
writer.rollback();
- IndexReader reader3 = IndexReader.openIfChanged(reader);
+ IndexReader reader3 = DirectoryReader.openIfChanged(reader);
assertNull(reader3);
assertEquals(0, reader.numDocs());
assertEquals(0, reader2.numDocs());
@@ -622,7 +622,7 @@ public class TestIndexWriterCommit exten
assertEquals(0, DirectoryReader.getCommitUserData(dir).size());
- IndexReader r = IndexReader.open(dir);
+ DirectoryReader r = IndexReader.open(dir);
// commit(Map) never called for this index
assertEquals(0, r.getCommitUserData().size());
r.close();
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=1237368&r1=1237367&r2=1237368&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Sun Jan 29 17:23:51 2012
@@ -133,7 +133,7 @@ public class TestIndexWriterConfig exten
assertEquals(IndexWriterConfig.DISABLE_AUTO_FLUSH, IndexWriterConfig.DEFAULT_MAX_BUFFERED_DOCS);
assertEquals(16.0, IndexWriterConfig.DEFAULT_RAM_BUFFER_SIZE_MB, 0.0);
assertEquals(false, IndexWriterConfig.DEFAULT_READER_POOLING);
- assertEquals(IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, IndexWriterConfig.DEFAULT_READER_TERMS_INDEX_DIVISOR);
+ assertEquals(DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, IndexWriterConfig.DEFAULT_READER_TERMS_INDEX_DIVISOR);
}
@Test
Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java?rev=1237368&r1=1237367&r2=1237368&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java Sun Jan 29 17:23:51 2012
@@ -186,7 +186,7 @@ public class TestIndexWriterForceMerge e
if (0 == pass) {
writer.close();
- IndexReader reader = IndexReader.open(dir);
+ DirectoryReader reader = IndexReader.open(dir);
assertEquals(1, reader.getSequentialSubReaders().length);
reader.close();
} else {
@@ -196,7 +196,7 @@ public class TestIndexWriterForceMerge e
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir);
+ DirectoryReader reader = IndexReader.open(dir);
assertTrue(reader.getSequentialSubReaders().length > 1);
reader.close();