You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/07/18 21:50:02 UTC
svn commit: r1148022 - in
/lucene/dev/branches/fieldtype/lucene/contrib/misc/src:
java/org/apache/lucene/document/ test/org/apache/lucene/index/
Author: mikemccand
Date: Mon Jul 18 19:50:01 2011
New Revision: 1148022
URL: http://svn.apache.org/viewvc?rev=1148022&view=rev
Log:
LUCENE-2308: rename contrib tests so they don't conflict w/ core tests; remove test case -- throwing ACE from LazyField after IR is closed is best-effort and depends on Dir impl
Added:
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribFieldsReader.java
- copied, changed from r1147613, lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribIndexReader.java
- copied, changed from r1147613, lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribParallelReader.java
- copied, changed from r1147613, lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestParallelReader.java
Removed:
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestParallelReader.java
Modified:
lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java
Modified: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java?rev=1148022&r1=1148021&r2=1148022&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/java/org/apache/lucene/document/SetBasedFieldSelector.java Mon Jul 18 19:50:01 2011
@@ -1,6 +1,5 @@
package org.apache.lucene.document;
-import java.util.Set;
/**
* Copyright 2004 The Apache Software Foundation
*
@@ -17,10 +16,13 @@ import java.util.Set;
* limitations under the License.
*/
+import java.util.Set;
+
/**
* Declare what fields to load normally and what fields to load lazily
*
**/
+
public class SetBasedFieldSelector implements FieldSelector {
private Set<String> fieldsToLoad;
Copied: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribFieldsReader.java (from r1147613, lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldsReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribFieldsReader.java?p2=lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribFieldsReader.java&p1=lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldsReader.java&r1=1147613&r2=1148022&rev=1148022&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribFieldsReader.java Mon Jul 18 19:50:01 2011
@@ -39,7 +39,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
-public class TestFieldsReader extends LuceneTestCase {
+public class TestContribFieldsReader extends LuceneTestCase {
private static Directory dir;
private static org.apache.lucene.document2.Document testDoc = new org.apache.lucene.document2.Document();
private static FieldInfos fieldInfos = null;
@@ -192,36 +192,6 @@ public class TestFieldsReader extends Lu
reader.close();
}
-
-
-
- public void testLazyFieldsAfterClose() throws Exception {
- assertTrue(dir != null);
- assertTrue(fieldInfos != null);
- IndexReader reader = IndexReader.open(dir);
- Set<String> loadFieldNames = new HashSet<String>();
- loadFieldNames.add(DocHelper.TEXT_FIELD_1_KEY);
- loadFieldNames.add(DocHelper.TEXT_FIELD_UTF1_KEY);
- Set<String> lazyFieldNames = new HashSet<String>();
- lazyFieldNames.add(DocHelper.LARGE_LAZY_FIELD_KEY);
- lazyFieldNames.add(DocHelper.LAZY_FIELD_KEY);
- lazyFieldNames.add(DocHelper.LAZY_FIELD_BINARY_KEY);
- lazyFieldNames.add(DocHelper.TEXT_FIELD_UTF2_KEY);
- SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(loadFieldNames, lazyFieldNames);
- Document doc = getDocument(reader, 0, fieldSelector);
- assertTrue("doc is null and it shouldn't be", doc != null);
- Fieldable field = doc.getFieldable(DocHelper.LAZY_FIELD_KEY);
- assertTrue("field is null and it shouldn't be", field != null);
- assertTrue("field is not lazy and it should be", field.isLazy());
- reader.close();
- try {
- field.stringValue();
- fail("did not hit AlreadyClosedException as expected");
- } catch (AlreadyClosedException e) {
- // expected
- }
- }
-
public void testLoadFirst() throws Exception {
assertTrue(dir != null);
assertTrue(fieldInfos != null);
Copied: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribIndexReader.java (from r1147613, lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribIndexReader.java?p2=lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribIndexReader.java&p1=lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexReader.java&r1=1147613&r2=1148022&rev=1148022&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribIndexReader.java Mon Jul 18 19:50:01 2011
@@ -36,7 +36,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-public class TestIndexReader extends LuceneTestCase {
+public class TestContribIndexReader extends LuceneTestCase {
private org.apache.lucene.document.Document getDocument(IndexReader ir, int docID, FieldSelector selector) throws IOException {
final FieldSelectorVisitor visitor = new FieldSelectorVisitor(selector);
ir.document(docID, visitor);
Copied: lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribParallelReader.java (from r1147613, lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestParallelReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribParallelReader.java?p2=lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribParallelReader.java&p1=lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestParallelReader.java&r1=1147613&r2=1148022&rev=1148022&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestParallelReader.java (original)
+++ lucene/dev/branches/fieldtype/lucene/contrib/misc/src/test/org/apache/lucene/index/TestContribParallelReader.java Mon Jul 18 19:50:01 2011
@@ -32,7 +32,7 @@ import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-public class TestParallelReader extends LuceneTestCase {
+public class TestContribParallelReader extends LuceneTestCase {
private IndexSearcher parallel;
private IndexSearcher single;