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/08/14 15:06:23 UTC
svn commit: r985485 [3/8] - 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...
Propchange: lucene/dev/branches/branch_3x/lucene/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src: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,963720,963781,963873,963906,963909,963920,964019,964054,964430,9
64459,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,985453,985455
+/lucene/dev/trunk/lucene/src: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,963720,963781,963873,963906,963909,963920,964019,964054,964430,9
64459,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,984968,985453,985455
/lucene/dev/trunk/src:932749
/lucene/java/branches/flex_1458/src:924791,924850,930201
/lucene/java/branches/lucene_2_4/src:748824
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:967125-979432
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963
781,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,985453,985455
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,963
781,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,984968,985453,985455
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:896850,909334,948516
/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:924483-925561
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java Sat Aug 14 13:06:17 2010
@@ -99,6 +99,7 @@ public class PersistentSnapshotDeletionP
Document doc = r.document(r.maxDoc() - 1);
Field sid = doc.getField(SNAPSHOTS_ID);
if (sid == null) {
+ writer.close();
throw new IllegalStateException("directory is not a valid snapshots store!");
}
doc.removeField(SNAPSHOTS_ID);
@@ -106,6 +107,7 @@ public class PersistentSnapshotDeletionP
registerSnapshotInfo(f.name(), f.stringValue(), null);
}
} else if (numDocs != 0) {
+ writer.close();
throw new IllegalStateException(
"should be at most 1 document in the snapshots directory: " + numDocs);
}
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:967125-979432
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,9
63654,963720,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,985453,985455
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,9
63654,963720,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,984968,985453,985455
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:896850,909334,948516
/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-925561
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestMergeSchedulerExternal.java Sat Aug 14 13:06:17 2010
@@ -17,10 +17,13 @@ package org.apache.lucene;
* limitations under the License.
*/
import java.io.IOException;
+import java.util.Random;
+
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.LogMergePolicy;
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
@@ -80,17 +83,20 @@ public class TestMergeSchedulerExternal
}
public void testSubclassConcurrentMergeScheduler() throws IOException {
- MockRAMDirectory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
dir.failOn(new FailOnlyOnMerge());
Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
doc.add(idField);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMergeScheduler(new MyMergeScheduler())
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH));
+ LogMergePolicy logMP = (LogMergePolicy) writer.getConfig().getMergePolicy();
+ logMP.setMergeFactor(10);
for(int i=0;i<20;i++)
writer.addDocument(doc);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestSearch.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestSearch.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestSearch.java Sat Aug 14 13:06:17 2010
@@ -18,6 +18,7 @@ package org.apache.lucene;
*/
import java.util.GregorianCalendar;
+import java.util.Random;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -50,9 +51,10 @@ public class TestSearch extends LuceneTe
* single-file formats, even if the results are wrong.
*/
public void testSearch() throws Exception {
+ Random random = newRandom();
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw, true);
- doTestSearch(pw, false);
+ doTestSearch(random, pw, false);
pw.close();
sw.close();
String multiFileOutput = sw.getBuffer().toString();
@@ -60,7 +62,7 @@ public class TestSearch extends LuceneTe
sw = new StringWriter();
pw = new PrintWriter(sw, true);
- doTestSearch(pw, true);
+ doTestSearch(random, pw, true);
pw.close();
sw.close();
String singleFileOutput = sw.getBuffer().toString();
@@ -69,11 +71,11 @@ public class TestSearch extends LuceneTe
}
- private void doTestSearch(PrintWriter out, boolean useCompoundFile)
+ private void doTestSearch(Random random, PrintWriter out, boolean useCompoundFile)
throws Exception {
- Directory directory = new MockRAMDirectory();
+ Directory directory = newDirectory(random);
Analyzer analyzer = new SimpleAnalyzer(TEST_VERSION_CURRENT);
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
+ IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer);
LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
@@ -129,6 +131,7 @@ public class TestSearch extends LuceneTe
}
}
searcher.close();
+ directory.close();
}
static long Time(int year, int month, int day) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/TestSearchForDuplicates.java Sat Aug 14 13:06:17 2010
@@ -20,6 +20,7 @@ package org.apache.lucene;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.Random;
import org.apache.lucene.store.*;
import org.apache.lucene.document.*;
@@ -58,7 +59,8 @@ public class TestSearchForDuplicates ext
public void testRun() throws Exception {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw, true);
- doTest(pw, false);
+ Random random = newRandom();
+ doTest(random, pw, false);
pw.close();
sw.close();
String multiFileOutput = sw.getBuffer().toString();
@@ -66,7 +68,7 @@ public class TestSearchForDuplicates ext
sw = new StringWriter();
pw = new PrintWriter(sw, true);
- doTest(pw, true);
+ doTest(random, pw, true);
pw.close();
sw.close();
String singleFileOutput = sw.getBuffer().toString();
@@ -75,10 +77,10 @@ public class TestSearchForDuplicates ext
}
- private void doTest(PrintWriter out, boolean useCompoundFiles) throws Exception {
- Directory directory = new MockRAMDirectory();
+ private void doTest(Random random, PrintWriter out, boolean useCompoundFiles) throws Exception {
+ Directory directory = newDirectory(random);
Analyzer analyzer = new SimpleAnalyzer(TEST_VERSION_CURRENT);
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
+ IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer);
LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFiles);
lmp.setUseCompoundDocStore(useCompoundFiles);
@@ -122,6 +124,7 @@ public class TestSearchForDuplicates ext
checkHits(hits, MAX_DOCS, searcher);
searcher.close();
+ directory.close();
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java Sat Aug 14 13:06:17 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.analysis;
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -30,14 +31,14 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermPositions;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
public class TestCachingTokenFilter extends BaseTokenStreamTestCase {
private String[] tokens = new String[] {"term1", "term2", "term3", "term2"};
public void testCaching() throws IOException {
- Directory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
TokenStream stream = new TokenStream() {
@@ -93,6 +94,7 @@ public class TestCachingTokenFilter exte
// 3) reset stream and consume tokens again
stream.reset();
checkTokens(stream);
+ dir.close();
}
private void checkTokens(TokenStream stream) throws IOException {
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,9
63654,963720,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,985453,985455
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,9
63654,963720,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,984968,985453,985455
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036,896850,909334,948516
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestBinaryDocument.java Sat Aug 14 13:06:17 2010
@@ -1,5 +1,7 @@
package org.apache.lucene.document;
+import java.util.Random;
+
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexReader;
@@ -55,8 +57,9 @@ public class TestBinaryDocument extends
assertEquals(2, doc.fields.size());
/** add the doc to a ram index */
- MockRAMDirectory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(doc);
/** open a reader and fetch the document */
@@ -94,8 +97,9 @@ public class TestBinaryDocument extends
doc.add(stringFldCompressed);
/** add the doc to a ram index */
- MockRAMDirectory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(doc);
/** open a reader and fetch the document */
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/document/TestDateTools.java:967125-979432
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720
,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,985453,985455
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720
,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,984968,985453,985455
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036,896850,909334,948516
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDocument.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDocument.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDocument.java Sat Aug 14 13:06:17 2010
@@ -1,5 +1,7 @@
package org.apache.lucene.document;
+import java.util.Random;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -152,8 +154,9 @@ public class TestDocument extends Lucene
* @throws Exception on error
*/
public void testGetValuesForIndexedDocument() throws Exception {
- MockRAMDirectory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(makeDocumentWithFields());
IndexReader reader = writer.getReader();
@@ -230,8 +233,9 @@ public class TestDocument extends Lucene
doc.add(new Field("keyword", "test", Field.Store.YES,
Field.Index.NOT_ANALYZED));
- MockRAMDirectory dir = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), dir);
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(doc);
field.setValue("id2");
writer.addDocument(doc);
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:967125-979432
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.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,953628,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,985453,985455
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.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,953628,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,984968,985453,985455
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036,896850,909334,948516
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index: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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,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,985453,985455
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index: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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963654,963720,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,984968,985453,985455
/lucene/dev/trunk/src/test/org/apache/lucene/index:932749
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index:924791,924850,928295,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index:748824
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java Sat Aug 14 13:06:17 2010
@@ -41,10 +41,10 @@ public class TestAddIndexes extends Luce
public void testSimpleCase() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// two auxiliary directories
- Directory aux = new MockRAMDirectory();
- Directory aux2 = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
+ Directory aux2 = newDirectory(random);
IndexWriter writer = null;
@@ -84,7 +84,7 @@ public class TestAddIndexes extends Luce
verifyNumDocs(dir, 190);
// now add another set in.
- Directory aux3 = new MockRAMDirectory();
+ Directory aux3 = newDirectory(random);
writer = newWriter(aux3, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
// add 40 documents
addDocs(writer, 40);
@@ -118,7 +118,7 @@ public class TestAddIndexes extends Luce
verifyTermDocs(dir, new Term("content", "bbb"), 50);
// now add a single document
- Directory aux4 = new MockRAMDirectory();
+ Directory aux4 = newDirectory(random);
writer = newWriter(aux4, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
addDocs2(writer, 1);
writer.close();
@@ -132,13 +132,18 @@ public class TestAddIndexes extends Luce
verifyNumDocs(dir, 231);
verifyTermDocs(dir, new Term("content", "bbb"), 51);
+ dir.close();
+ aux.close();
+ aux2.close();
+ aux3.close();
+ aux4.close();
}
public void testWithPendingDeletes() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
IndexWriter writer = newWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.APPEND));
@@ -173,9 +178,9 @@ public class TestAddIndexes extends Luce
public void testWithPendingDeletes2() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
IndexWriter writer = newWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.APPEND));
@@ -211,9 +216,9 @@ public class TestAddIndexes extends Luce
public void testWithPendingDeletes3() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
IndexWriter writer = newWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.APPEND));
@@ -251,9 +256,9 @@ public class TestAddIndexes extends Luce
// case 0: add self or exceed maxMergeDocs, expect exception
public void testAddSelf() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
IndexWriter writer = null;
@@ -288,6 +293,8 @@ public class TestAddIndexes extends Luce
// make sure the index is correct
verifyNumDocs(dir, 100);
+ dir.close();
+ aux.close();
}
// in all the remaining tests, make the doc count of the oldest segment
@@ -295,9 +302,9 @@ public class TestAddIndexes extends Luce
// case 1: no tail segments
public void testNoTailSegments() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
@@ -314,14 +321,16 @@ public class TestAddIndexes extends Luce
// make sure the index is correct
verifyNumDocs(dir, 1040);
+ dir.close();
+ aux.close();
}
// case 2: tail segments, invariants hold, no copy
public void testNoCopySegments() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
@@ -336,14 +345,16 @@ public class TestAddIndexes extends Luce
// make sure the index is correct
verifyNumDocs(dir, 1032);
+ dir.close();
+ aux.close();
}
// case 3: tail segments, invariants hold, copy, invariants hold
public void testNoMergeAfterCopy() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
@@ -359,14 +370,16 @@ public class TestAddIndexes extends Luce
// make sure the index is correct
verifyNumDocs(dir, 1060);
+ dir.close();
+ aux.close();
}
// case 4: tail segments, invariants hold, copy, invariants not hold
public void testMergeAfterCopy() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
setUpDirs(dir, aux);
@@ -386,15 +399,17 @@ public class TestAddIndexes extends Luce
assertEquals(1060, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
writer.close();
+ dir.close();
+ aux.close();
}
// case 5: tail segments, invariants not hold
public void testMoreMerges() throws IOException {
// main directory
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
// auxiliary directory
- Directory aux = new MockRAMDirectory();
- Directory aux2 = new MockRAMDirectory();
+ Directory aux = newDirectory(random);
+ Directory aux2 = newDirectory(random);
setUpDirs(dir, aux);
@@ -428,6 +443,9 @@ public class TestAddIndexes extends Luce
assertEquals(1060, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
writer.close();
+ dir.close();
+ aux.close();
+ aux2.close();
}
private IndexWriter newWriter(Directory dir, IndexWriterConfig conf)
@@ -504,7 +522,7 @@ public class TestAddIndexes extends Luce
// LUCENE-1270
public void testHangOnClose() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
LogByteSizeMergePolicy lmp = new LogByteSizeMergePolicy();
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
@@ -532,7 +550,7 @@ public class TestAddIndexes extends Luce
writer.addDocument(doc2);
writer.close();
- Directory dir2 = new MockRAMDirectory();
+ Directory dir2 = newDirectory(random);
lmp = new LogByteSizeMergePolicy();
lmp.setMinMergeMB(0.0001);
lmp.setUseCompoundFile(false);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Sat Aug 14 13:06:17 2010
@@ -247,7 +247,7 @@ public class TestBackwardsCompatibility
String fullPath = fullDir(name);
Directory dir = FSDirectory.open(new File(fullPath));
- Directory targetDir = new MockRAMDirectory();
+ Directory targetDir = newDirectory(random);
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
w.addIndexes(new Directory[] { dir });
@@ -256,6 +256,7 @@ public class TestBackwardsCompatibility
_TestUtil.checkIndex(targetDir);
dir.close();
+ targetDir.close();
rmDir(name);
}
}
@@ -268,7 +269,7 @@ public class TestBackwardsCompatibility
Directory dir = FSDirectory.open(new File(fullPath));
IndexReader reader = IndexReader.open(dir);
- Directory targetDir = new MockRAMDirectory();
+ Directory targetDir = newDirectory(random);
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
w.addIndexes(new IndexReader[] { reader });
@@ -278,6 +279,7 @@ public class TestBackwardsCompatibility
_TestUtil.checkIndex(targetDir);
dir.close();
+ targetDir.close();
rmDir(name);
}
}
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:967125-979432
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963
654,963720,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,985453,985455
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.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,953628,955547,955613,955615,955796-955797,955809-955996,956097,956125,956173,956316,956715,957465,957520,957634,957707,960367,960371,960374,960719,962555,963372,963
654,963720,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,984968,985453,985455
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,928295,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036,896850,909334,948516
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCheckIndex.java Sat Aug 14 13:06:17 2010
@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.List;
import java.util.ArrayList;
+import java.util.Random;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.store.MockRAMDirectory;
@@ -33,8 +34,9 @@ import org.apache.lucene.util.Constants;
public class TestCheckIndex extends LuceneTestCase {
public void testDeletedDocs() throws IOException {
- MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
Document doc = new Document();
doc.add(new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
for(int i=0;i<19;i++) {
@@ -87,6 +89,7 @@ public class TestCheckIndex extends Luce
onlySegments.add("_0");
assertTrue(checker.checkIndex(onlySegments).clean == true);
+ dir.close();
}
public void testLuceneConstantVersion() throws IOException {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Sat Aug 14 13:06:17 2010
@@ -61,12 +61,12 @@ public class TestConcurrentMergeSchedule
// Make sure running BG merges still work fine even when
// we are hitting exceptions during flushing.
public void testFlushExceptions() throws IOException {
-
- MockRAMDirectory directory = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
FailOnlyOnFlush failure = new FailOnlyOnFlush();
directory.failOn(failure);
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
doc.add(idField);
@@ -107,15 +107,15 @@ public class TestConcurrentMergeSchedule
// Test that deletes committed after a merge started and
// before it finishes, are correctly merged back:
public void testDeleteMerging() throws IOException {
-
- MockRAMDirectory directory = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
LogDocMergePolicy mp = new LogDocMergePolicy();
// Force degenerate merging so we can get a mix of
// merging of segments with and without deletes at the
// start:
mp.setMinMergeDocs(1000);
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
.setMergePolicy(mp));
@@ -146,9 +146,8 @@ public class TestConcurrentMergeSchedule
}
public void testNoExtraFiles() throws IOException {
-
- MockRAMDirectory directory = new MockRAMDirectory();
Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2));
@@ -176,8 +175,8 @@ public class TestConcurrentMergeSchedule
}
public void testNoWaitClose() throws IOException {
- MockRAMDirectory directory = new MockRAMDirectory();
Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
doc.add(idField);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCrash.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCrash.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCrash.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCrash.java Sat Aug 14 13:06:17 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.document.Field;
public class TestCrash extends LuceneTestCase {
private IndexWriter initIndex(Random random, boolean initialCommit) throws IOException {
- return initIndex(random, new MockRAMDirectory(), initialCommit);
+ return initIndex(random, newDirectory(random), initialCommit);
}
private IndexWriter initIndex(Random random, MockRAMDirectory dir, boolean initialCommit) throws IOException {
@@ -70,6 +70,8 @@ public class TestCrash extends LuceneTes
crash(writer);
IndexReader reader = IndexReader.open(dir, false);
assertTrue(reader.numDocs() < 157);
+ reader.close();
+ dir.close();
}
public void testWriterAfterCrash() throws IOException {
@@ -86,6 +88,8 @@ public class TestCrash extends LuceneTes
IndexReader reader = IndexReader.open(dir, false);
assertTrue(reader.numDocs() < 314);
+ reader.close();
+ dir.close();
}
public void testCrashAfterReopen() throws IOException {
@@ -108,6 +112,8 @@ public class TestCrash extends LuceneTes
IndexReader reader = IndexReader.open(dir, false);
assertTrue(reader.numDocs() >= 157);
+ reader.close();
+ dir.close();
}
public void testCrashAfterClose() throws IOException {
@@ -127,6 +133,8 @@ public class TestCrash extends LuceneTes
IndexReader reader = IndexReader.open(dir, false);
assertEquals(157, reader.numDocs());
+ reader.close();
+ dir.close();
}
public void testCrashAfterCloseNoWait() throws IOException {
@@ -146,6 +154,8 @@ public class TestCrash extends LuceneTes
*/
IndexReader reader = IndexReader.open(dir, false);
assertEquals(157, reader.numDocs());
+ reader.close();
+ dir.close();
}
public void testCrashReaderDeletes() throws IOException {
@@ -167,6 +177,8 @@ public class TestCrash extends LuceneTes
*/
reader = IndexReader.open(dir, false);
assertEquals(157, reader.numDocs());
+ reader.close();
+ dir.close();
}
public void testCrashReaderDeletesAfterClose() throws IOException {
@@ -189,5 +201,7 @@ public class TestCrash extends LuceneTes
*/
reader = IndexReader.open(dir, false);
assertEquals(156, reader.numDocs());
+ reader.close();
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDeletionPolicy.java Sat Aug 14 13:06:17 2010
@@ -202,7 +202,7 @@ public class TestDeletionPolicy extends
boolean useCompoundFile = true;
Random random = newRandom();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
ExpirationTimeDeletionPolicy policy = new ExpirationTimeDeletionPolicy(dir, SECONDS);
IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
@@ -282,7 +282,7 @@ public class TestDeletionPolicy extends
// Never deletes a commit
KeepAllDeletionPolicy policy = new KeepAllDeletionPolicy();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
policy.dir = dir;
IndexWriterConfig conf = newIndexWriterConfig(random,
@@ -365,7 +365,7 @@ public class TestDeletionPolicy extends
// Never deletes a commit
KeepAllDeletionPolicy policy = new KeepAllDeletionPolicy();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
policy.dir = dir;
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
@@ -474,7 +474,7 @@ public class TestDeletionPolicy extends
KeepNoneOnInitDeletionPolicy policy = new KeepNoneOnInitDeletionPolicy();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
@@ -523,7 +523,7 @@ public class TestDeletionPolicy extends
boolean useCompoundFile = (pass % 2) != 0;
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
@@ -588,7 +588,7 @@ public class TestDeletionPolicy extends
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy);
@@ -697,7 +697,7 @@ public class TestDeletionPolicy extends
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriterConfig conf = newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy)
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java Sat Aug 14 13:06:17 2010
@@ -35,6 +35,7 @@ public class TestDirectoryReader extends
private Document doc2;
protected SegmentReader [] readers = new SegmentReader[2];
protected SegmentInfos sis;
+ private Random random;
public TestDirectoryReader(String s) {
@@ -44,7 +45,8 @@ public class TestDirectoryReader extends
@Override
protected void setUp() throws Exception {
super.setUp();
- dir = new MockRAMDirectory();
+ random = newRandom();
+ dir = newDirectory(random);
doc1 = new Document();
doc2 = new Document();
DocHelper.setupDoc(doc1);
@@ -54,6 +56,14 @@ public class TestDirectoryReader extends
sis = new SegmentInfos();
sis.read(dir);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ if (readers[0] != null) readers[0].close();
+ if (readers[1] != null) readers[1].close();
+ dir.close();
+ super.tearDown();
+ }
protected IndexReader openReader() throws IOException {
IndexReader reader;
@@ -85,6 +95,7 @@ public class TestDirectoryReader extends
TermFreqVector vector = reader.getTermFreqVector(0, DocHelper.TEXT_FIELD_2_KEY);
assertTrue(vector != null);
TestSegmentReader.checkNorms(reader);
+ reader.close();
}
public void doTestUndeleteAll() throws IOException {
@@ -121,13 +132,13 @@ public class TestDirectoryReader extends
sis.read(dir);
reader = openReader();
assertEquals( 1, reader.numDocs() );
+ reader.close();
}
public void testIsCurrent() throws IOException {
- Random random = newRandom();
- MockRAMDirectory ramDir1=new MockRAMDirectory();
+ MockRAMDirectory ramDir1=newDirectory(random);
addDoc(random, ramDir1, "test foo", true);
- MockRAMDirectory ramDir2=new MockRAMDirectory();
+ MockRAMDirectory ramDir2=newDirectory(random);
addDoc(random, ramDir2, "test blah", true);
IndexReader[] readers = new IndexReader[]{IndexReader.open(ramDir1, false), IndexReader.open(ramDir2, false)};
MultiReader mr = new MultiReader(readers);
@@ -143,15 +154,16 @@ public class TestDirectoryReader extends
// expected exception
}
mr.close();
+ ramDir1.close();
+ ramDir2.close();
}
public void testMultiTermDocs() throws IOException {
- Random random = newRandom();
- MockRAMDirectory ramDir1=new MockRAMDirectory();
+ MockRAMDirectory ramDir1=newDirectory(random);
addDoc(random, ramDir1, "test foo", true);
- MockRAMDirectory ramDir2=new MockRAMDirectory();
+ MockRAMDirectory ramDir2=newDirectory(random);
addDoc(random, ramDir2, "test blah", true);
- MockRAMDirectory ramDir3=new MockRAMDirectory();
+ MockRAMDirectory ramDir3=newDirectory(random);
addDoc(random, ramDir3, "test wow", true);
IndexReader[] readers1 = new IndexReader[]{IndexReader.open(ramDir1, false), IndexReader.open(ramDir3, false)};
@@ -174,6 +186,14 @@ public class TestDirectoryReader extends
// really a dummy assert to ensure that we got some docs and to ensure that
// nothing is optimized out.
assertTrue(ret > 0);
+ readers1[0].close();
+ readers1[1].close();
+ readers2[0].close();
+ readers2[1].close();
+ readers2[2].close();
+ ramDir1.close();
+ ramDir2.close();
+ ramDir3.close();
}
public void testAllTermDocs() throws IOException {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java Sat Aug 14 13:06:17 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.io.Reader;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.SimpleAnalyzer;
@@ -43,7 +44,8 @@ import org.apache.lucene.util._TestUtil;
public class TestDocumentWriter extends LuceneTestCase {
private MockRAMDirectory dir;
-
+ private Random random;
+
public TestDocumentWriter(String s) {
super(s);
}
@@ -51,7 +53,14 @@ public class TestDocumentWriter extends
@Override
protected void setUp() throws Exception {
super.setUp();
- dir = new MockRAMDirectory();
+ random = newRandom();
+ dir = newDirectory(random);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ dir.close();
+ super.tearDown();
}
public void test() {
@@ -61,7 +70,7 @@ public class TestDocumentWriter extends
public void testAddDocument() throws Exception {
Document testDoc = new Document();
DocHelper.setupDoc(testDoc);
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.addDocument(testDoc);
writer.commit();
SegmentInfo info = writer.newestSegment();
@@ -103,6 +112,7 @@ public class TestDocumentWriter extends
assertTrue(fi.omitNorms == !reader.hasNorms(fi.name));
}
}
+ reader.close();
}
public void testPositionIncrementGap() throws IOException {
@@ -118,7 +128,7 @@ public class TestDocumentWriter extends
}
};
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, analyzer));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
doc.add(new Field("repeated", "repeated one", Field.Store.YES, Field.Index.ANALYZED));
@@ -136,6 +146,7 @@ public class TestDocumentWriter extends
assertEquals(2, freq);
assertEquals(0, termPositions.nextPosition());
assertEquals(502, termPositions.nextPosition());
+ reader.close();
}
public void testTokenReuse() throws IOException {
@@ -181,7 +192,7 @@ public class TestDocumentWriter extends
}
};
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, analyzer));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
doc.add(new Field("f1", "a 5 a a", Field.Store.YES, Field.Index.ANALYZED));
@@ -202,11 +213,12 @@ public class TestDocumentWriter extends
assertEquals(false, termPositions.isPayloadAvailable());
assertEquals(7, termPositions.nextPosition());
assertEquals(false, termPositions.isPayloadAvailable());
+ reader.close();
}
public void testPreAnalyzedField() throws IOException {
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(
TEST_VERSION_CURRENT)));
Document doc = new Document();
@@ -251,7 +263,7 @@ public class TestDocumentWriter extends
assertTrue(termPositions.next());
assertEquals(1, termPositions.freq());
assertEquals(2, termPositions.nextPosition());
-
+ reader.close();
}
/**
@@ -267,7 +279,7 @@ public class TestDocumentWriter extends
doc.add(new Field("f2", "v1", Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
doc.add(new Field("f2", "v2", Store.YES, Index.NOT_ANALYZED, TermVector.NO));
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(
TEST_VERSION_CURRENT)));
writer.addDocument(doc);
@@ -284,6 +296,7 @@ public class TestDocumentWriter extends
TermFreqVector tfv2 = reader.getTermFreqVector(0, "f2");
assertNotNull(tfv2);
assertEquals("the 'with_tv' setting should rule!",2,tfv2.getTerms().length);
+ reader.close();
}
/**
@@ -302,7 +315,7 @@ public class TestDocumentWriter extends
doc.add(f);
doc.add(new Field("f2", "v2", Store.YES, Index.NO));
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(
TEST_VERSION_CURRENT)));
writer.addDocument(doc);
@@ -319,5 +332,6 @@ public class TestDocumentWriter extends
// f2
assertTrue("f2 should have norms", reader.hasNorms("f2"));
assertTrue("omitTermFreqAndPositions field bit should be set for f2", fi.fieldInfo("f2").omitTermFreqAndPositions);
+ reader.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java Sat Aug 14 13:06:17 2010
@@ -47,7 +47,7 @@ public class TestFieldInfos extends Luce
fieldInfos.add(testDoc);
//Since the complement is stored as well in the fields map
assertTrue(fieldInfos.size() == DocHelper.all.size()); //this is all b/c we are using the no-arg constructor
- MockRAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = newDirectory(newRandom());
String name = "testFile";
IndexOutput output = dir.createOutput(name);
assertTrue(output != null);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java Sat Aug 14 13:06:17 2010
@@ -45,7 +45,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util._TestUtil;
public class TestFieldsReader extends LuceneTestCase {
- private MockRAMDirectory dir = new MockRAMDirectory();
+ private MockRAMDirectory dir;
private Document testDoc = new Document();
private FieldInfos fieldInfos = null;
private Random random;
@@ -62,6 +62,7 @@ public class TestFieldsReader extends Lu
DocHelper.setupDoc(testDoc);
fieldInfos.add(testDoc);
random = newRandom();
+ dir = newDirectory(random);
IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(false);
((LogMergePolicy) conf.getMergePolicy()).setUseCompoundDocStore(false);
@@ -70,6 +71,11 @@ public class TestFieldsReader extends Lu
writer.close();
}
+ @Override
+ protected void tearDown() throws Exception {
+ dir.close();
+ super.tearDown();
+ }
public void test() throws IOException {
assertTrue(dir != null);
assertTrue(fieldInfos != null);
@@ -157,6 +163,7 @@ public class TestFieldsReader extends Lu
assertTrue("byte[" + i + "] is mismatched", bytes[i] == DocHelper.LAZY_FIELD_BINARY_BYTES[i]);
}
+ reader.close();
}
public void testLatentFields() throws Exception {
@@ -226,6 +233,7 @@ public class TestFieldsReader extends Lu
assertTrue("byte[" + i + "] is mismatched", bytes[i] == DocHelper.LAZY_FIELD_BINARY_BYTES[i]);
}
+ reader.close();
}
@@ -278,6 +286,7 @@ public class TestFieldsReader extends Lu
count++;
}
assertTrue(count + " does not equal: " + 1, count == 1);
+ reader.close();
}
/**
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java Sat Aug 14 13:06:17 2010
@@ -97,7 +97,7 @@ public class TestFilterIndexReader exten
*/
public void testFilterIndexReader() throws Exception {
Random random = newRandom();
- MockRAMDirectory directory = new MockRAMDirectory();
+ MockRAMDirectory directory = newDirectory(random);
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document d1 = new Document();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java Sat Aug 14 13:06:17 2010
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Map;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCaseJ4;
import org.junit.Test;
@@ -33,7 +32,7 @@ public class TestIndexCommit extends Luc
@Test
public void testEqualsHashCode() throws Exception {
// LUCENE-2417: equals and hashCode() impl was inconsistent
- final Directory dir = new MockRAMDirectory();
+ final Directory dir = newDirectory(newRandom());
IndexCommit ic1 = new IndexCommit() {
@Override public String getSegmentsFileName() { return "a"; }
@@ -63,5 +62,6 @@ public class TestIndexCommit extends Luc
assertEquals(ic1, ic2);
assertEquals("hash codes are not equals", ic1.hashCode(), ic2.hashCode());
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexFileDeleter.java Sat Aug 14 13:06:17 2010
@@ -39,7 +39,7 @@ public class TestIndexFileDeleter extend
public void testDeleteLeftoverFiles() throws IOException {
Random random = newRandom();
- MockRAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = newDirectory(random);
dir.setPreventDoubleWrite(false);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))