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 2011/10/29 22:19:34 UTC
svn commit: r1195015 - in /lucene/dev/branches/lucene2621/lucene:
contrib/memory/src/test/org/apache/lucene/index/memory/
src/test-framework/org/apache/lucene/util/
src/test/org/apache/lucene/index/ src/test/org/apache/lucene/util/fst/
Author: rmuir
Date: Sat Oct 29 20:19:33 2011
New Revision: 1195015
URL: http://svn.apache.org/viewvc?rev=1195015&view=rev
Log:
LUCENE-3490: die _TestUtil.alwaysCodec(String) die
Modified:
lucene/dev/branches/lucene2621/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
Modified: lucene/dev/branches/lucene2621/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1195015&r1=1195014&r2=1195015&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Sat Oct 29 20:19:33 2011
@@ -34,6 +34,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TopDocs;
@@ -107,7 +108,7 @@ public class MemoryIndexTest extends Bas
Directory ramdir = newDirectory();
Analyzer analyzer = randomAnalyzer();
IndexWriter writer = new IndexWriter(ramdir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
+ new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
Field field1 = newField("foo", fooField.toString(), TextField.TYPE_UNSTORED);
Field field2 = newField("term", termField.toString(), TextField.TYPE_UNSTORED);
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java?rev=1195015&r1=1195014&r2=1195015&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java Sat Oct 29 20:19:33 2011
@@ -374,13 +374,6 @@ public class _TestUtil {
}
};
}
-
- /** Return a CodecProvider that can read any of the
- * default codecs, but always writes in the specified
- * codec. */
- public static CodecProvider alwaysCodec(final String codec) {
- return alwaysCodec(CodecProvider.getDefault().lookup(codec));
- }
/** Return a CodecProvider that can read any of the
* default codecs and formats, but always writes in the specified
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java?rev=1195015&r1=1195014&r2=1195015&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestFlex.java Sat Oct 29 20:19:33 2011
@@ -20,6 +20,7 @@ package org.apache.lucene.index;
import org.apache.lucene.store.*;
import org.apache.lucene.analysis.*;
import org.apache.lucene.document.*;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.util.*;
public class TestFlex extends LuceneTestCase {
@@ -64,7 +65,7 @@ public class TestFlex extends LuceneTest
public void testTermOrd() throws Exception {
Directory d = newDirectory();
IndexWriter w = new IndexWriter(d, newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
+ new MockAnalyzer(random)).setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
doc.add(newField("f", "a b c", TextField.TYPE_UNSTORED));
w.addDocument(doc);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=1195015&r1=1195014&r2=1195015&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Sat Oct 29 20:19:33 2011
@@ -40,6 +40,7 @@ import org.apache.lucene.document.String
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader.FieldOption;
import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
@@ -1231,7 +1232,7 @@ public class TestIndexReader extends Luc
// LUCENE-1609: don't load terms index
public void testNoTermsIndex() throws Throwable {
Directory dir = newDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(_TestUtil.alwaysCodec("Standard")));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
doc.add(newField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", TextField.TYPE_UNSTORED));
doc.add(newField("number", "0 1 2 3 4 5 6 7 8 9", TextField.TYPE_UNSTORED));
@@ -1251,7 +1252,7 @@ public class TestIndexReader extends Luc
writer = new IndexWriter(
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
- setCodecProvider(_TestUtil.alwaysCodec("Standard")).
+ setCodecProvider(_TestUtil.alwaysFormat(new Lucene40PostingsFormat())).
setMergePolicy(newLogMergePolicy(10))
);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1195015&r1=1195014&r2=1195015&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java Sat Oct 29 20:19:33 2011
@@ -41,6 +41,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.codecs.CodecProvider;
+import org.apache.lucene.index.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
@@ -1016,7 +1017,7 @@ public class TestFSTs extends LuceneTest
final String defaultFormat = _TestUtil.getPostingsFormat("abracadabra");
if (defaultFormat.equals("SimpleText") || defaultFormat.equals("Memory")) {
// no
- CodecProvider.setDefault(_TestUtil.alwaysCodec("Lucene40"));
+ CodecProvider.setDefault(_TestUtil.alwaysFormat(new Lucene40PostingsFormat()));
}
final LineFileDocs docs = new LineFileDocs(random);