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 2010/09/12 11:38:31 UTC
svn commit: r996278 [5/7] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/
lucene/backwards/src/test/org/apache/lucene/inde...
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Sun Sep 12 09:38:26 2010
@@ -460,20 +460,26 @@ public class TestStressIndexing2 extends
for(int j=0;j<numTerms;j++) {
int[] pos1 = tpv1.getTermPositions(j);
int[] pos2 = tpv2.getTermPositions(j);
- assertEquals(pos1.length, pos2.length);
- TermVectorOffsetInfo[] offsets1 = tpv1.getOffsets(j);
- TermVectorOffsetInfo[] offsets2 = tpv2.getOffsets(j);
- if (offsets1 == null)
- assertTrue(offsets2 == null);
- else
- assertTrue(offsets2 != null);
- for(int k=0;k<pos1.length;k++) {
- assertEquals(pos1[k], pos2[k]);
- if (offsets1 != null) {
- assertEquals(offsets1[k].getStartOffset(),
- offsets2[k].getStartOffset());
- assertEquals(offsets1[k].getEndOffset(),
- offsets2[k].getEndOffset());
+ if (pos1 == null) {
+ assertNull(pos2);
+ } else {
+ assertNotNull(pos1);
+ assertNotNull(pos2);
+ assertEquals(pos1.length, pos2.length);
+ TermVectorOffsetInfo[] offsets1 = tpv1.getOffsets(j);
+ TermVectorOffsetInfo[] offsets2 = tpv2.getOffsets(j);
+ if (offsets1 == null)
+ assertTrue(offsets2 == null);
+ else
+ assertTrue(offsets2 != null);
+ for(int k=0;k<pos1.length;k++) {
+ assertEquals(pos1[k], pos2[k]);
+ if (offsets1 != null) {
+ assertEquals(offsets1[k].getStartOffset(),
+ offsets2[k].getStartOffset());
+ assertEquals(offsets1[k].getEndOffset(),
+ offsets2[k].getEndOffset());
+ }
}
}
}
@@ -481,7 +487,7 @@ public class TestStressIndexing2 extends
}
}
- private static class IndexingThread extends Thread {
+ private class IndexingThread extends Thread {
IndexWriter w;
int base;
int range;
@@ -569,7 +575,7 @@ public class TestStressIndexing2 extends
ArrayList<Field> fields = new ArrayList<Field>();
String idString = getIdString();
- Field idField = new Field(idTerm.field(), idString, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
+ Field idField = newField(idTerm.field(), idString, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
fields.add(idField);
int nFields = nextInt(maxFields);
@@ -593,16 +599,16 @@ public class TestStressIndexing2 extends
switch (nextInt(4)) {
case 0:
- fields.add(new Field("f" + nextInt(100), getString(1), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS, tvVal));
+ fields.add(newField("f" + nextInt(100), getString(1), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS, tvVal));
break;
case 1:
- fields.add(new Field("f" + nextInt(100), getString(0), Field.Store.NO, Field.Index.ANALYZED, tvVal));
+ fields.add(newField("f" + nextInt(100), getString(0), Field.Store.NO, Field.Index.ANALYZED, tvVal));
break;
case 2:
- fields.add(new Field("f" + nextInt(100), getString(0), Field.Store.YES, Field.Index.NO, Field.TermVector.NO));
+ fields.add(newField("f" + nextInt(100), getString(0), Field.Store.YES, Field.Index.NO, Field.TermVector.NO));
break;
case 3:
- fields.add(new Field("f" + nextInt(100), getString(bigFieldSize), Field.Store.YES, Field.Index.ANALYZED, tvVal));
+ fields.add(newField("f" + nextInt(100), getString(bigFieldSize), Field.Store.YES, Field.Index.ANALYZED, tvVal));
break;
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java Sun Sep 12 09:38:26 2010
@@ -68,7 +68,7 @@ public class TestTermdocPerf extends Luc
};
Document doc = new Document();
- doc.add(new Field(field,val, Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(field,val, Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS));
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, analyzer)
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(100));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java Sun Sep 12 09:38:26 2010
@@ -65,8 +65,8 @@ public class TestThreadedOptimize extend
for(int i=0;i<200;i++) {
Document d = new Document();
- d.add(new Field("id", Integer.toString(i), Field.Store.YES, Field.Index.NOT_ANALYZED));
- d.add(new Field("contents", English.intToEnglish(i), Field.Store.NO, Field.Index.ANALYZED));
+ d.add(newField("id", Integer.toString(i), Field.Store.YES, Field.Index.NOT_ANALYZED));
+ d.add(newField("contents", English.intToEnglish(i), Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(d);
}
@@ -86,8 +86,8 @@ public class TestThreadedOptimize extend
writerFinal.optimize(false);
for(int k=0;k<17*(1+iFinal);k++) {
Document d = new Document();
- d.add(new Field("id", iterFinal + "_" + iFinal + "_" + j + "_" + k, Field.Store.YES, Field.Index.NOT_ANALYZED));
- d.add(new Field("contents", English.intToEnglish(iFinal+k), Field.Store.NO, Field.Index.ANALYZED));
+ d.add(newField("id", iterFinal + "_" + iFinal + "_" + j + "_" + k, Field.Store.YES, Field.Index.NOT_ANALYZED));
+ d.add(newField("contents", English.intToEnglish(iFinal+k), Field.Store.NO, Field.Index.ANALYZED));
writerFinal.addDocument(d);
}
for(int k=0;k<9*(1+iFinal);k++)
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java Sun Sep 12 09:38:26 2010
@@ -127,7 +127,7 @@ public class TestTransactionRollback ext
IndexWriter w=new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setIndexDeletionPolicy(sdp));
for(int currentRecordId=1;currentRecordId<=100;currentRecordId++) {
Document doc=new Document();
- doc.add(new Field(FIELD_RECORD_ID,""+currentRecordId,Field.Store.YES,Field.Index.ANALYZED));
+ doc.add(newField(FIELD_RECORD_ID,""+currentRecordId,Field.Store.YES,Field.Index.ANALYZED));
w.addDocument(doc);
if (currentRecordId%10 == 0) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTransactions.java Sun Sep 12 09:38:26 2010
@@ -140,8 +140,8 @@ public class TestTransactions extends Lu
for(int j=0; j<10; j++) {
Document d = new Document();
int n = random.nextInt();
- d.add(new Field("id", Integer.toString(nextID++), Field.Store.YES, Field.Index.NOT_ANALYZED));
- d.add(new Field("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED));
+ d.add(newField("id", Integer.toString(nextID++), Field.Store.YES, Field.Index.NOT_ANALYZED));
+ d.add(newField("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(d);
}
@@ -185,7 +185,7 @@ public class TestTransactions extends Lu
for(int j=0; j<7; j++) {
Document d = new Document();
int n = random.nextInt();
- d.add(new Field("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED));
+ d.add(newField("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(d);
}
writer.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java Sun Sep 12 09:38:26 2010
@@ -284,7 +284,7 @@ public class TestMultiFieldQueryParser e
Directory ramDir = newDirectory();
IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
- doc.add(new Field("body", "blah the footest blah", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("body", "blah the footest blah", Field.Store.NO, Field.Index.ANALYZED));
iw.addDocument(doc);
iw.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java Sun Sep 12 09:38:26 2010
@@ -542,7 +542,7 @@ public class TestQueryParser extends Loc
Directory ramDir = newDirectory();
IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
- doc.add(new Field("content","\u0633\u0627\u0628",
+ doc.add(newField("content","\u0633\u0627\u0628",
Field.Store.YES, Field.Index.NOT_ANALYZED));
iw.addDocument(doc);
iw.close();
@@ -1076,13 +1076,13 @@ public class TestQueryParser extends Loc
assertEquals(expected, hits.length);
}
- private static void addDateDoc(String content, int year, int month,
+ private void addDateDoc(String content, int year, int month,
int day, int hour, int minute, int second, IndexWriter iw) throws IOException {
Document d = new Document();
- d.add(new Field("f", content, Field.Store.YES, Field.Index.ANALYZED));
+ d.add(newField("f", content, Field.Store.YES, Field.Index.ANALYZED));
Calendar cal = Calendar.getInstance(Locale.ENGLISH);
cal.set(year, month-1, day, hour, minute, second);
- d.add(new Field("date", DateField.dateToString(cal.getTime()), Field.Store.YES, Field.Index.NOT_ANALYZED));
+ d.add(newField("date", DateField.dateToString(cal.getTime()), Field.Store.YES, Field.Index.NOT_ANALYZED));
iw.addDocument(d);
}
@@ -1100,7 +1100,7 @@ public class TestQueryParser extends Loc
Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT);
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, a));
Document doc = new Document();
- doc.add(new Field("f", "the wizard of ozzy", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("f", "the wizard of ozzy", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
IndexReader r = w.getReader();
w.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Sun Sep 12 09:38:26 2010
@@ -111,7 +111,7 @@ public class BaseTestRangeFilter extends
for (int d = minId; d <= maxId; d++) {
Document doc = new Document();
- doc.add(new Field("id", pad(d), Field.Store.YES,
+ doc.add(newField("id", pad(d), Field.Store.YES,
Field.Index.NOT_ANALYZED));
int r = index.allowNegativeRandomInts ? random.nextInt() : random
.nextInt(Integer.MAX_VALUE);
@@ -121,9 +121,9 @@ public class BaseTestRangeFilter extends
if (r < index.minR) {
index.minR = r;
}
- doc.add(new Field("rand", pad(r), Field.Store.YES,
+ doc.add(newField("rand", pad(r), Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("body", "body", Field.Store.YES,
+ doc.add(newField("body", "body", Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBoolean2.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBoolean2.java Sun Sep 12 09:38:26 2010
@@ -54,7 +54,7 @@ public class TestBoolean2 extends Lucene
RandomIndexWriter writer= new RandomIndexWriter(random, directory);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
- doc.add(new Field(field, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField(field, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
writer.close();
@@ -77,12 +77,12 @@ public class TestBoolean2 extends Lucene
RandomIndexWriter w = new RandomIndexWriter(random, dir2);
Document doc = new Document();
- doc.add(new Field("field2", "xxx", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field2", "xxx", Field.Store.NO, Field.Index.ANALYZED));
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
w.addDocument(doc);
}
doc = new Document();
- doc.add(new Field("field2", "big bad bug", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field2", "big bad bug", Field.Store.NO, Field.Index.ANALYZED));
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
w.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Sun Sep 12 09:38:26 2010
@@ -56,10 +56,10 @@ public class TestBooleanMinShouldMatch e
for (int i = 0; i < data.length; i++) {
Document doc = new Document();
- doc.add(new Field("id", String.valueOf(i), Field.Store.YES, Field.Index.NOT_ANALYZED));//Field.Keyword("id",String.valueOf(i)));
- doc.add(new Field("all", "all", Field.Store.YES, Field.Index.NOT_ANALYZED));//Field.Keyword("all","all"));
+ doc.add(newField("id", String.valueOf(i), Field.Store.YES, Field.Index.NOT_ANALYZED));//Field.Keyword("id",String.valueOf(i)));
+ doc.add(newField("all", "all", Field.Store.YES, Field.Index.NOT_ANALYZED));//Field.Keyword("all","all"));
if (null != data[i]) {
- doc.add(new Field("data", data[i], Field.Store.YES, Field.Index.ANALYZED));//Field.Text("data",data[i]));
+ doc.add(newField("data", data[i], Field.Store.YES, Field.Index.ANALYZED));//Field.Text("data",data[i]));
}
w.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java Sun Sep 12 09:38:26 2010
@@ -143,12 +143,12 @@ public class TestBooleanOr extends Lucen
//
Document d = new Document();
- d.add(new Field(
+ d.add(newField(
FIELD_T,
"Optimize not deleting all files",
Field.Store.YES,
Field.Index.ANALYZED));
- d.add(new Field(
+ d.add(newField(
FIELD_C,
"Deleted When I run an optimize in our production environment.",
Field.Store.YES,
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java Sun Sep 12 09:38:26 2010
@@ -78,7 +78,7 @@ public class TestBooleanPrefixQuery exte
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
for (int i = 0; i < categories.length; i++) {
Document doc = new Document();
- doc.add(new Field("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java Sun Sep 12 09:38:26 2010
@@ -61,7 +61,7 @@ public class TestBooleanQuery extends Lu
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random, dir);
Document doc = new Document();
- doc.add(new Field("field", "a b c d", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "a b c d", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
IndexReader r = w.getReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java Sun Sep 12 09:38:26 2010
@@ -46,7 +46,7 @@ public class TestBooleanScorer extends L
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
for (int i = 0; i < values.length; i++) {
Document doc = new Document();
- doc.add(new Field(FIELD, values[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField(FIELD, values[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
IndexReader ir = writer.getReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java Sun Sep 12 09:38:26 2010
@@ -42,7 +42,7 @@ public class TestCachingSpanFilter exten
// add a doc, refresh the reader, and check that its there
Document doc = new Document();
- doc.add(new Field("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
reader = refreshReader(reader);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Sun Sep 12 09:38:26 2010
@@ -162,7 +162,7 @@ public class TestCachingWrapperFilter ex
// add a doc, refresh the reader, and check that its there
Document doc = new Document();
- doc.add(new Field("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
reader = refreshReader(reader);
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 12 09:38:26 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,9637
20,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984715,984968,985453,985455,985672,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932541,932576,932587,932698,932731-932749,932752,932773,932795,932828,932856-932857,932862,932864,932878,932963,932998-932999,933541-933575,933598,933613,933679,933879,934339,934954,935014-935048,935065,935186-935513,935521-935522,935553-935962,936522,936544,936605,936657-936726,937039,937360,938582-938646,938989,939111,939611,939649,940433,940447,940451-940452,940666,940699,940730,940878-940892,940994,941270,941363,942166,942288,942676,942719,943142,943493,943931,945057,945090,945130,945245,945343,945420,946139,946330,946338,946599,948011,948082,948429,949288,949311,949445,949976,949997,950008,950042,950458,950613,951126,951355,951397,951521,953407,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,9637
20,963781,963873,963906,963909,963920,964019,964054,964430,964459,964720,964753,964832,964856,965103,965110,965222,965230,965299,965327,965330,965585,966354,966878,967080,979453,979809,980369,980428,980436,980501,980909,980911,980917,981265,981550,981598,981650,981661,981857,981936,982073,982084,982201,982725,982824,983100,983212,983216,983313,983495,983500,983530,983622,983632,983778,984187,984202,984232,984510,984715,984968,985453,985455,985672,986158,986173,986612,987122,988087,988206,988216,988259,988346,988478,988527,988543,988592,988613,988688,988710,988736,988739,989004,989010,989013,989030,989035,989315,989321,989334,989785,990160-990161,990180,990189,990281,990301,990451,990459,990766,990781,990854,991053,991191,991310,991497,992424,992469,992567,992571,992623,993106,993194,993199,993287,993408,994935,994976,994979,995247,995250,995376,995772,996268
/lucene/dev/trunk/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:932749
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java:748824
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Sun Sep 12 09:38:26 2010
@@ -56,15 +56,15 @@ public class TestCustomSearcherSort exte
Document doc = new Document();
if ((i % 5) != 0) { // some documents must not have an entry in the first
// sort field
- doc.add(new Field("publicationDate_", random.getLuceneDate(),
+ doc.add(newField("publicationDate_", random.getLuceneDate(),
Field.Store.YES, Field.Index.NOT_ANALYZED));
}
if ((i % 7) == 0) { // some documents to match the query (see below)
- doc.add(new Field("content", "test", Field.Store.YES,
+ doc.add(newField("content", "test", Field.Store.YES,
Field.Index.ANALYZED));
}
// every document has a defined 'mandant' field
- doc.add(new Field("mandant", Integer.toString(i % 3), Field.Store.YES,
+ doc.add(newField("mandant", Integer.toString(i % 3), Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateFilter.java Sun Sep 12 09:38:26 2010
@@ -52,10 +52,10 @@ public class TestDateFilter extends Luce
Document doc = new Document();
// add time that is in the past
- doc.add(new Field("datefield", DateTools.timeToString(now - 1000,
+ doc.add(newField("datefield", DateTools.timeToString(now - 1000,
DateTools.Resolution.MILLISECOND), Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("body", "Today is a very sunny day in New York City",
+ doc.add(newField("body", "Today is a very sunny day in New York City",
Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
@@ -118,10 +118,10 @@ public class TestDateFilter extends Luce
Document doc = new Document();
// add time that is in the future
- doc.add(new Field("datefield", DateTools.timeToString(now + 888888,
+ doc.add(newField("datefield", DateTools.timeToString(now + 888888,
DateTools.Resolution.MILLISECOND), Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("body", "Today is a very sunny day in New York City",
+ doc.add(newField("body", "Today is a very sunny day in New York City",
Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateSort.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDateSort.java Sun Sep 12 09:38:26 2010
@@ -106,16 +106,16 @@ public class TestDateSort extends Lucene
assertEquals(Arrays.asList(expectedOrder), Arrays.asList(actualOrder));
}
- private static Document createDocument(String text, long time) {
+ private Document createDocument(String text, long time) {
Document document = new Document();
// Add the text field.
- Field textField = new Field(TEXT_FIELD, text, Field.Store.YES, Field.Index.ANALYZED);
+ Field textField = newField(TEXT_FIELD, text, Field.Store.YES, Field.Index.ANALYZED);
document.add(textField);
// Add the date/time field.
String dateTimeString = DateTools.timeToString(time, DateTools.Resolution.SECOND);
- Field dateTimeField = new Field(DATE_TIME_FIELD, dateTimeString, Field.Store.YES,
+ Field dateTimeField = newField(DATE_TIME_FIELD, dateTimeString, Field.Store.YES,
Field.Index.NOT_ANALYZED);
document.add(dateTimeField);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Sun Sep 12 09:38:26 2010
@@ -87,13 +87,13 @@ public class TestDisjunctionMaxQuery ext
// d1 is an "ok" match for: albino elephant
{
Document d1 = new Document();
- d1.add(new Field("id", "d1", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
+ d1.add(newField("id", "d1", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
// "d1"));
d1
- .add(new Field("hed", "elephant", Field.Store.YES,
+ .add(newField("hed", "elephant", Field.Store.YES,
Field.Index.ANALYZED));// Field.Text("hed", "elephant"));
d1
- .add(new Field("dek", "elephant", Field.Store.YES,
+ .add(newField("dek", "elephant", Field.Store.YES,
Field.Index.ANALYZED));// Field.Text("dek", "elephant"));
writer.addDocument(d1);
}
@@ -101,15 +101,15 @@ public class TestDisjunctionMaxQuery ext
// d2 is a "good" match for: albino elephant
{
Document d2 = new Document();
- d2.add(new Field("id", "d2", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
+ d2.add(newField("id", "d2", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
// "d2"));
d2
- .add(new Field("hed", "elephant", Field.Store.YES,
+ .add(newField("hed", "elephant", Field.Store.YES,
Field.Index.ANALYZED));// Field.Text("hed", "elephant"));
- d2.add(new Field("dek", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("dek",
+ d2.add(newField("dek", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("dek",
// "albino"));
d2
- .add(new Field("dek", "elephant", Field.Store.YES,
+ .add(newField("dek", "elephant", Field.Store.YES,
Field.Index.ANALYZED));// Field.Text("dek", "elephant"));
writer.addDocument(d2);
}
@@ -117,12 +117,12 @@ public class TestDisjunctionMaxQuery ext
// d3 is a "better" match for: albino elephant
{
Document d3 = new Document();
- d3.add(new Field("id", "d3", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
+ d3.add(newField("id", "d3", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
// "d3"));
- d3.add(new Field("hed", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("hed",
+ d3.add(newField("hed", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("hed",
// "albino"));
d3
- .add(new Field("hed", "elephant", Field.Store.YES,
+ .add(newField("hed", "elephant", Field.Store.YES,
Field.Index.ANALYZED));// Field.Text("hed", "elephant"));
writer.addDocument(d3);
}
@@ -130,14 +130,14 @@ public class TestDisjunctionMaxQuery ext
// d4 is the "best" match for: albino elephant
{
Document d4 = new Document();
- d4.add(new Field("id", "d4", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
+ d4.add(newField("id", "d4", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
// "d4"));
- d4.add(new Field("hed", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("hed",
+ d4.add(newField("hed", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("hed",
// "albino"));
d4
- .add(new Field("hed", "elephant", Field.Store.YES,
+ .add(newField("hed", "elephant", Field.Store.YES,
Field.Index.ANALYZED));// Field.Text("hed", "elephant"));
- d4.add(new Field("dek", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("dek",
+ d4.add(newField("dek", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("dek",
// "albino"));
writer.addDocument(d4);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocBoost.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocBoost.java Sun Sep 12 09:38:26 2010
@@ -40,8 +40,8 @@ public class TestDocBoost extends Lucene
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, store);
- Fieldable f1 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
- Fieldable f2 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
+ Fieldable f1 = newField("field", "word", Field.Store.YES, Field.Index.ANALYZED);
+ Fieldable f2 = newField("field", "word", Field.Store.YES, Field.Index.ANALYZED);
f2.setBoost(2.0f);
Document d1 = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java Sun Sep 12 09:38:26 2010
@@ -103,7 +103,7 @@ public class TestDocIdSet extends Lucene
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
- doc.add(new Field("c", "val", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField("c", "val", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java Sun Sep 12 09:38:26 2010
@@ -118,7 +118,7 @@ public class TestElevationComparator ext
private Document adoc(String[] vals) {
Document doc = new Document();
for (int i = 0; i < vals.length - 2; i += 2) {
- doc.add(new Field(vals[i], vals[i + 1], Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField(vals[i], vals[i + 1], Field.Store.YES, Field.Index.ANALYZED));
}
return doc;
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestExplanations.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestExplanations.java Sun Sep 12 09:38:26 2010
@@ -71,8 +71,8 @@ public class TestExplanations extends Lu
RandomIndexWriter writer= new RandomIndexWriter(random, directory);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
- doc.add(new Field(KEY, ""+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new Field(FIELD, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField(KEY, ""+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField(FIELD, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCache.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCache.java Sun Sep 12 09:38:26 2010
@@ -48,12 +48,12 @@ public class TestFieldCache extends Luce
float theFloat = Float.MAX_VALUE;
for (int i = 0; i < NUM_DOCS; i++){
Document doc = new Document();
- doc.add(new Field("theLong", String.valueOf(theLong--), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new Field("theDouble", String.valueOf(theDouble--), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new Field("theByte", String.valueOf(theByte--), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new Field("theShort", String.valueOf(theShort--), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new Field("theInt", String.valueOf(theInt--), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new Field("theFloat", String.valueOf(theFloat--), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("theLong", String.valueOf(theLong--), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("theDouble", String.valueOf(theDouble--), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("theByte", String.valueOf(theByte--), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("theShort", String.valueOf(theShort--), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("theInt", String.valueOf(theInt--), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("theFloat", String.valueOf(theFloat--), Field.Store.NO, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
writer.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Sun Sep 12 09:38:26 2010
@@ -528,8 +528,8 @@ public class TestFieldCacheRangeFilter e
for (int d = -20; d <= 20; d++) {
Document doc = new Document();
- doc.add(new Field("id",Integer.toString(d), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new Field("body","body", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("id",Integer.toString(d), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("body","body", Field.Store.NO, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java Sun Sep 12 09:38:26 2010
@@ -41,7 +41,7 @@ public class TestFieldCacheTermsFilter e
for (int i = 0; i < 100; i++) {
Document doc = new Document();
int term = i * 10; //terms are units of 10;
- doc.add(new Field(fieldName, "" + term, Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField(fieldName, "" + term, Field.Store.YES, Field.Index.NOT_ANALYZED));
w.addDocument(doc);
}
IndexReader reader = w.getReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java Sun Sep 12 09:38:26 2010
@@ -51,23 +51,23 @@ public class TestFilteredQuery extends L
RandomIndexWriter writer = new RandomIndexWriter (random, directory);
Document doc = new Document();
- doc.add (new Field("field", "one two three four five", Field.Store.YES, Field.Index.ANALYZED));
- doc.add (new Field("sorter", "b", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add (newField("field", "one two three four five", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add (newField("sorter", "b", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument (doc);
doc = new Document();
- doc.add (new Field("field", "one two three four", Field.Store.YES, Field.Index.ANALYZED));
- doc.add (new Field("sorter", "d", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add (newField("field", "one two three four", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add (newField("sorter", "d", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument (doc);
doc = new Document();
- doc.add (new Field("field", "one two three y", Field.Store.YES, Field.Index.ANALYZED));
- doc.add (new Field("sorter", "a", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add (newField("field", "one two three y", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add (newField("sorter", "a", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument (doc);
doc = new Document();
- doc.add (new Field("field", "one two x", Field.Store.YES, Field.Index.ANALYZED));
- doc.add (new Field("sorter", "c", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add (newField("field", "one two x", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add (newField("sorter", "c", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument (doc);
// tests here require single segment (eg try seed
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java Sun Sep 12 09:38:26 2010
@@ -67,7 +67,7 @@ public class TestFilteredSearch extends
try {
for (int i = 0; i < 60; i++) {//Simple docs
Document doc = new Document();
- doc.add(new Field(FIELD, Integer.toString(i), Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField(FIELD, Integer.toString(i), Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
if(optimize)
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java Sun Sep 12 09:38:26 2010
@@ -381,7 +381,7 @@ public class TestFuzzyQuery extends Luce
private void addDoc(String text, RandomIndexWriter writer) throws IOException {
Document doc = new Document();
- doc.add(new Field("field", text, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", text, Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java Sun Sep 12 09:38:26 2010
@@ -124,7 +124,7 @@ public class TestMatchAllDocsQuery exten
private void addDoc(String text, IndexWriter iw, float boost) throws IOException {
Document doc = new Document();
- Field f = new Field("key", text, Field.Store.YES, Field.Index.ANALYZED);
+ Field f = newField("key", text, Field.Store.YES, Field.Index.ANALYZED);
f.setBoost(boost);
doc.add(f);
iw.addDocument(doc);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Sun Sep 12 09:38:26 2010
@@ -148,7 +148,7 @@ public class TestMultiPhraseQuery extend
private void add(String s, RandomIndexWriter writer) throws IOException {
Document doc = new Document();
- doc.add(new Field("body", s, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("body", s, Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
}
@@ -271,8 +271,8 @@ public class TestMultiPhraseQuery extend
private void add(String s, String type, RandomIndexWriter writer)
throws IOException {
Document doc = new Document();
- doc.add(new Field("body", s, Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("type", type, Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("body", s, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("type", type, Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java Sun Sep 12 09:38:26 2010
@@ -64,23 +64,23 @@ public class TestMultiSearcher extends L
// creating a document to store
Document lDoc = new Document();
- lDoc.add(new Field("fulltext", "Once upon a time.....", Field.Store.YES, Field.Index.ANALYZED));
- lDoc.add(new Field("id", "doc1", Field.Store.YES, Field.Index.NOT_ANALYZED));
- lDoc.add(new Field("handle", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ lDoc.add(newField("fulltext", "Once upon a time.....", Field.Store.YES, Field.Index.ANALYZED));
+ lDoc.add(newField("id", "doc1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ lDoc.add(newField("handle", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
// creating a document to store
Document lDoc2 = new Document();
- lDoc2.add(new Field("fulltext", "in a galaxy far far away.....",
+ lDoc2.add(newField("fulltext", "in a galaxy far far away.....",
Field.Store.YES, Field.Index.ANALYZED));
- lDoc2.add(new Field("id", "doc2", Field.Store.YES, Field.Index.NOT_ANALYZED));
- lDoc2.add(new Field("handle", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ lDoc2.add(newField("id", "doc2", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ lDoc2.add(newField("handle", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
// creating a document to store
Document lDoc3 = new Document();
- lDoc3.add(new Field("fulltext", "a bizarre bug manifested itself....",
+ lDoc3.add(newField("fulltext", "a bizarre bug manifested itself....",
Field.Store.YES, Field.Index.ANALYZED));
- lDoc3.add(new Field("id", "doc3", Field.Store.YES, Field.Index.NOT_ANALYZED));
- lDoc3.add(new Field("handle", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ lDoc3.add(newField("id", "doc3", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ lDoc3.add(newField("handle", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
// creating an index writer for the first index
IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
@@ -206,19 +206,19 @@ public class TestMultiSearcher extends L
indexStoreB.close();
}
- private static Document createDocument(String contents1, String contents2) {
+ private Document createDocument(String contents1, String contents2) {
Document document=new Document();
- document.add(new Field("contents", contents1, Field.Store.YES, Field.Index.NOT_ANALYZED));
- document.add(new Field("other", "other contents", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ document.add(newField("contents", contents1, Field.Store.YES, Field.Index.NOT_ANALYZED));
+ document.add(newField("other", "other contents", Field.Store.YES, Field.Index.NOT_ANALYZED));
if (contents2!=null) {
- document.add(new Field("contents", contents2, Field.Store.YES, Field.Index.NOT_ANALYZED));
+ document.add(newField("contents", contents2, Field.Store.YES, Field.Index.NOT_ANALYZED));
}
return document;
}
- private static void initIndex(Random random, Directory directory, int nDocs, boolean create, String contents2) throws IOException {
+ private void initIndex(Random random, Directory directory, int nDocs, boolean create, String contents2) throws IOException {
IndexWriter indexWriter=null;
try {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java Sun Sep 12 09:38:26 2010
@@ -166,7 +166,7 @@ public class TestMultiSearcherRanking ex
private void add(String value, IndexWriter iw) throws IOException {
Document d = new Document();
- d.add(new Field(FIELD_NAME, value, Field.Store.YES, Field.Index.ANALYZED));
+ d.add(newField(FIELD_NAME, value, Field.Store.YES, Field.Index.ANALYZED));
iw.addDocument(d);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Sun Sep 12 09:38:26 2010
@@ -59,13 +59,13 @@ public class TestMultiTermConstantScore
for (int i = 0; i < data.length; i++) {
Document doc = new Document();
- doc.add(new Field("id", String.valueOf(i), Field.Store.YES,
+ doc.add(newField("id", String.valueOf(i), Field.Store.YES,
Field.Index.NOT_ANALYZED));// Field.Keyword("id",String.valueOf(i)));
doc
- .add(new Field("all", "all", Field.Store.YES,
+ .add(newField("all", "all", Field.Store.YES,
Field.Index.NOT_ANALYZED));// Field.Keyword("all","all"));
if (null != data[i]) {
- doc.add(new Field("data", data[i], Field.Store.YES,
+ doc.add(newField("data", data[i], Field.Store.YES,
Field.Index.ANALYZED));// Field.Text("data",data[i]));
}
writer.addDocument(doc);
@@ -611,10 +611,10 @@ public class TestMultiTermConstantScore
Directory farsiIndex = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, farsiIndex, new SimpleAnalyzer(TEST_VERSION_CURRENT));
Document doc = new Document();
- doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES,
+ doc.add(newField("content", "\u0633\u0627\u0628", Field.Store.YES,
Field.Index.NOT_ANALYZED));
doc
- .add(new Field("body", "body", Field.Store.YES,
+ .add(newField("body", "body", Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
@@ -656,9 +656,9 @@ public class TestMultiTermConstantScore
String[] words = { "H\u00D8T", "H\u00C5T", "MAND" };
for (int docnum = 0 ; docnum < words.length ; ++docnum) {
Document doc = new Document();
- doc.add(new Field("content", words[docnum],
+ doc.add(newField("content", words[docnum],
Field.Store.YES, Field.Index.NOT_ANALYZED));
- doc.add(new Field("body", "body",
+ doc.add(newField("body", "body",
Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Sun Sep 12 09:38:26 2010
@@ -46,7 +46,7 @@ public class TestMultiThreadTermVectors
//writer.infoStream = System.out;
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- Fieldable fld = new Field("field", English.intToEnglish(i), Field.Store.YES, Field.Index.NOT_ANALYZED, Field.TermVector.YES);
+ Fieldable fld = newField("field", English.intToEnglish(i), Field.Store.YES, Field.Index.NOT_ANALYZED, Field.TermVector.YES);
doc.add(fld);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Sun Sep 12 09:38:26 2010
@@ -47,7 +47,7 @@ public class TestMultiValuedNumericRange
Document doc = new Document();
for (int m=0, c=random.nextInt(10); m<=c; m++) {
int value = random.nextInt(Integer.MAX_VALUE);
- doc.add(new Field("asc", format.format(value), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("asc", format.format(value), Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.add(new NumericField("trie", Field.Store.NO, true).setIntValue(value));
}
writer.addDocument(doc);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNot.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNot.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNot.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestNot.java Sun Sep 12 09:38:26 2010
@@ -42,7 +42,7 @@ public class TestNot extends LuceneTestC
RandomIndexWriter writer = new RandomIndexWriter(random, store);
Document d1 = new Document();
- d1.add(new Field("field", "a b", Field.Store.YES, Field.Index.ANALYZED));
+ d1.add(newField("field", "a b", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(d1);
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Sun Sep 12 09:38:26 2010
@@ -49,15 +49,15 @@ public class TestPhrasePrefixQuery exten
Document doc3 = new Document();
Document doc4 = new Document();
Document doc5 = new Document();
- doc1.add(new Field("body", "blueberry pie", Field.Store.YES,
+ doc1.add(newField("body", "blueberry pie", Field.Store.YES,
Field.Index.ANALYZED));
- doc2.add(new Field("body", "blueberry strudel", Field.Store.YES,
+ doc2.add(newField("body", "blueberry strudel", Field.Store.YES,
Field.Index.ANALYZED));
- doc3.add(new Field("body", "blueberry pizza", Field.Store.YES,
+ doc3.add(newField("body", "blueberry pizza", Field.Store.YES,
Field.Index.ANALYZED));
- doc4.add(new Field("body", "blueberry chewing gum", Field.Store.YES,
+ doc4.add(newField("body", "blueberry chewing gum", Field.Store.YES,
Field.Index.ANALYZED));
- doc5.add(new Field("body", "piccadilly circus", Field.Store.YES,
+ doc5.add(newField("body", "piccadilly circus", Field.Store.YES,
Field.Index.ANALYZED));
writer.addDocument(doc1);
writer.addDocument(doc2);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java Sun Sep 12 09:38:26 2010
@@ -68,19 +68,19 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory, analyzer);
Document doc = new Document();
- doc.add(new Field("field", "one two three four five", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("repeated", "this is a repeated field - first part", Field.Store.YES, Field.Index.ANALYZED));
- Fieldable repeatedField = new Field("repeated", "second part of a repeated field", Field.Store.YES, Field.Index.ANALYZED);
+ doc.add(newField("field", "one two three four five", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("repeated", "this is a repeated field - first part", Field.Store.YES, Field.Index.ANALYZED));
+ Fieldable repeatedField = newField("repeated", "second part of a repeated field", Field.Store.YES, Field.Index.ANALYZED);
doc.add(repeatedField);
- doc.add(new Field("palindrome", "one two three two one", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("palindrome", "one two three two one", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("nonexist", "phrase exist notexist exist found", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("nonexist", "phrase exist notexist exist found", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("nonexist", "phrase exist notexist exist found", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("nonexist", "phrase exist notexist exist found", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
reader = writer.getReader();
@@ -216,7 +216,7 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig( Version.LUCENE_24, stopAnalyzer));
Document doc = new Document();
- doc.add(new Field("field", "the stop words are here", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "the stop words are here", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
@@ -251,12 +251,12 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
- doc.add(new Field("source", "marketing info", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("source", "marketing info", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("contents", "foobar", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("source", "marketing info", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("contents", "foobar", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("source", "marketing info", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -287,15 +287,15 @@ public class TestPhraseQuery extends Luc
writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE));
doc = new Document();
- doc.add(new Field("contents", "map entry woo", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("contents", "map entry woo", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("contents", "woo map entry", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("contents", "woo map entry", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("contents", "map foobarword entry woo", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("contents", "map foobarword entry woo", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
reader = writer.getReader();
@@ -338,15 +338,15 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
- doc.add(new Field("field", "foo firstname lastname foo", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "foo firstname lastname foo", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc);
Document doc2 = new Document();
- doc2.add(new Field("field", "foo firstname zzz lastname foo", Field.Store.YES, Field.Index.ANALYZED));
+ doc2.add(newField("field", "foo firstname zzz lastname foo", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc2);
Document doc3 = new Document();
- doc3.add(new Field("field", "foo firstname zzz yyy lastname foo", Field.Store.YES, Field.Index.ANALYZED));
+ doc3.add(newField("field", "foo firstname zzz yyy lastname foo", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(doc3);
IndexReader reader = writer.getReader();
@@ -601,7 +601,7 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter w = new RandomIndexWriter(random, dir, analyzer);
List<List<String>> docs = new ArrayList<List<String>>();
Document d = new Document();
- Field f = new Field("f", "", Field.Store.NO, Field.Index.ANALYZED);
+ Field f = newField("f", "", Field.Store.NO, Field.Index.ANALYZED);
d.add(f);
Random r = random;
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java Sun Sep 12 09:38:26 2010
@@ -90,7 +90,7 @@ public class TestPositionIncrement exten
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, store, analyzer);
Document d = new Document();
- d.add(new Field("field", "bogus", Field.Store.YES, Field.Index.ANALYZED));
+ d.add(newField("field", "bogus", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(d);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java Sun Sep 12 09:38:26 2010
@@ -41,7 +41,7 @@ public class TestPrefixFilter extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
for (int i = 0; i < categories.length; i++) {
Document doc = new Document();
- doc.add(new Field("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Sun Sep 12 09:38:26 2010
@@ -51,26 +51,26 @@ public class TestPrefixInBooleanQuery ex
for (int i = 0; i < 5137; ++i) {
Document doc = new Document();
- doc.add(new Field(FIELD, "meaninglessnames", Field.Store.YES,
+ doc.add(newField(FIELD, "meaninglessnames", Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
{
Document doc = new Document();
- doc.add(new Field(FIELD, "tangfulin", Field.Store.YES,
+ doc.add(newField(FIELD, "tangfulin", Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
for (int i = 5138; i < 11377; ++i) {
Document doc = new Document();
- doc.add(new Field(FIELD, "meaninglessnames", Field.Store.YES,
+ doc.add(newField(FIELD, "meaninglessnames", Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
{
Document doc = new Document();
- doc.add(new Field(FIELD, "tangfulin", Field.Store.YES,
+ doc.add(newField(FIELD, "tangfulin", Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java Sun Sep 12 09:38:26 2010
@@ -39,7 +39,7 @@ public class TestPrefixQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
for (int i = 0; i < categories.length; i++) {
Document doc = new Document();
- doc.add(new Field("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java Sun Sep 12 09:38:26 2010
@@ -34,7 +34,7 @@ public class TestQueryWrapperFilter exte
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
- doc.add(new Field("field", "value", Store.NO, Index.ANALYZED));
+ doc.add(newField("field", "value", Store.NO, Index.ANALYZED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java Sun Sep 12 09:38:26 2010
@@ -64,7 +64,7 @@ public class TestScorerPerf extends Luce
Document d = new Document();
for (int j=0; j<nTerms; j++) {
if (random.nextInt(freq[j]) == 0) {
- d.add(new Field("f", terms[j].text(), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ d.add(newField("f", terms[j].text(), Field.Store.NO, Field.Index.NOT_ANALYZED));
//System.out.println(d);
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSetNorm.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSetNorm.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSetNorm.java Sun Sep 12 09:38:26 2010
@@ -42,7 +42,7 @@ public class TestSetNorm extends LuceneT
IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
// add the same document four times
- Fieldable f1 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
+ Fieldable f1 = newField("field", "word", Field.Store.YES, Field.Index.ANALYZED);
Document d1 = new Document();
d1.add(f1);
writer.addDocument(d1);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimilarity.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimilarity.java Sun Sep 12 09:38:26 2010
@@ -68,10 +68,10 @@ public class TestSimilarity extends Luce
.setSimilarity(new SimpleSimilarity()));
Document d1 = new Document();
- d1.add(new Field("field", "a c", Field.Store.YES, Field.Index.ANALYZED));
+ d1.add(newField("field", "a c", Field.Store.YES, Field.Index.ANALYZED));
Document d2 = new Document();
- d2.add(new Field("field", "a b c", Field.Store.YES, Field.Index.ANALYZED));
+ d2.add(newField("field", "a b c", Field.Store.YES, Field.Index.ANALYZED));
writer.addDocument(d1);
writer.addDocument(d2);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java Sun Sep 12 09:38:26 2010
@@ -310,11 +310,11 @@ public class TestSimpleExplanations exte
Directory indexStoreB = newDirectory();
Document lDoc = new Document();
- lDoc.add(new Field("handle", "1 2", Field.Store.YES, Field.Index.ANALYZED));
+ lDoc.add(newField("handle", "1 2", Field.Store.YES, Field.Index.ANALYZED));
Document lDoc2 = new Document();
- lDoc2.add(new Field("handle", "1 2", Field.Store.YES, Field.Index.ANALYZED));
+ lDoc2.add(newField("handle", "1 2", Field.Store.YES, Field.Index.ANALYZED));
Document lDoc3 = new Document();
- lDoc3.add(new Field("handle", "1 2", Field.Store.YES, Field.Index.ANALYZED));
+ lDoc3.add(newField("handle", "1 2", Field.Store.YES, Field.Index.ANALYZED));
IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig(
TEST_VERSION_CURRENT, new StandardAnalyzer(
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java Sun Sep 12 09:38:26 2010
@@ -40,7 +40,7 @@ public class TestSpanQueryFilter extends
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
for (int i = 0; i < 500; i++) {
Document document = new Document();
- document.add(new Field("field", English.intToEnglish(i) + " equals " + English.intToEnglish(i),
+ document.add(newField("field", English.intToEnglish(i) + " equals " + English.intToEnglish(i),
Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(document);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Sun Sep 12 09:38:26 2010
@@ -41,17 +41,18 @@ public class TestSubScorerFreqs extends
@BeforeClass
public static void makeIndex() throws Exception {
dir = new RAMDirectory();
+ Random random = newStaticRandom(TestSubScorerFreqs.class);
RandomIndexWriter w = new RandomIndexWriter(
- newStaticRandom(TestSubScorerFreqs.class), dir);
+ random, dir);
// make sure we have more than one segment occationally
for (int i = 0; i < 31 * RANDOM_MULTIPLIER; i++) {
Document doc = new Document();
- doc.add(new Field("f", "a b c d b c d c d d", Field.Store.NO,
+ doc.add(newField(random, "f", "a b c d b c d c d d", Field.Store.NO,
Field.Index.ANALYZED));
w.addDocument(doc);
doc = new Document();
- doc.add(new Field("f", "a b c d", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField(random, "f", "a b c d", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java Sun Sep 12 09:38:26 2010
@@ -401,10 +401,10 @@ public class TestTermRangeFilter extends
Directory farsiIndex = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, farsiIndex);
Document doc = new Document();
- doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES,
+ doc.add(newField("content", "\u0633\u0627\u0628", Field.Store.YES,
Field.Index.NOT_ANALYZED));
doc
- .add(new Field("body", "body", Field.Store.YES,
+ .add(newField("body", "body", Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
@@ -445,9 +445,9 @@ public class TestTermRangeFilter extends
String[] words = {"H\u00D8T", "H\u00C5T", "MAND"};
for (int docnum = 0; docnum < words.length; ++docnum) {
Document doc = new Document();
- doc.add(new Field("content", words[docnum], Field.Store.YES,
+ doc.add(newField("content", words[docnum], Field.Store.YES,
Field.Index.NOT_ANALYZED));
- doc.add(new Field("body", "body", Field.Store.YES,
+ doc.add(newField("body", "body", Field.Store.YES,
Field.Index.NOT_ANALYZED));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=996278&r1=996277&r2=996278&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java Sun Sep 12 09:38:26 2010
@@ -335,8 +335,8 @@ public class TestTermRangeQuery extends
private void insertDoc(IndexWriter writer, String content) throws IOException {
Document doc = new Document();
- doc.add(new Field("id", "id" + docCount, Field.Store.YES, Field.Index.NOT_ANALYZED));
- doc.add(new Field("content", content, Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("id", "id" + docCount, Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("content", content, Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
docCount++;