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 [2/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...
Modified: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Sat Aug 14 13:06:17 2010
@@ -28,6 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Random;
import java.util.StringTokenizer;
import javax.xml.parsers.DocumentBuilder;
@@ -99,6 +100,7 @@ public class HighlighterTest extends Bas
int numHighlights = 0;
final Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
TopDocs hits;
+ private Random random;
String[] texts = {
"Hello this is a piece of text that is very long and contains too much preamble and the meat is really here which says kennedy has been shot",
@@ -142,6 +144,7 @@ public class HighlighterTest extends Bas
if (VERBOSE) System.out.println(fragment);
}
+ searcher.close();
}
public void testHighlightingWithDefaultField() throws Exception {
@@ -432,7 +435,7 @@ public class HighlighterTest extends Bas
QueryScorer scorer = new QueryScorer(query, FIELD_NAME);
Highlighter highlighter = new Highlighter(this, scorer);
-
+
for (int i = 0; i < hits.totalHits; i++) {
String text = searcher.doc(hits.scoreDocs[i].doc).get(FIELD_NAME);
TokenStream tokenStream = analyzer.tokenStream(FIELD_NAME, new StringReader(text));
@@ -1210,6 +1213,7 @@ public class HighlighterTest extends Bas
public void run() throws Exception {
numHighlights = 0;
// test to show how rewritten query can still be used
+ if (searcher != null) searcher.close();
searcher = new IndexSearcher(ramDir, true);
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
@@ -1323,8 +1327,8 @@ public class HighlighterTest extends Bas
public void testMultiSearcher() throws Exception {
// setup index 1
- MockRAMDirectory ramDir1 = new MockRAMDirectory();
- IndexWriter writer1 = new IndexWriter(ramDir1, new IndexWriterConfig(
+ MockRAMDirectory ramDir1 = newDirectory(random);
+ IndexWriter writer1 = new IndexWriter(ramDir1, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
Document d = new Document();
Field f = new Field(FIELD_NAME, "multiOne", Field.Store.YES, Field.Index.ANALYZED);
@@ -1335,8 +1339,8 @@ public class HighlighterTest extends Bas
IndexReader reader1 = IndexReader.open(ramDir1, true);
// setup index 2
- MockRAMDirectory ramDir2 = new MockRAMDirectory();
- IndexWriter writer2 = new IndexWriter(ramDir2, new IndexWriterConfig(
+ MockRAMDirectory ramDir2 = newDirectory(random);
+ IndexWriter writer2 = new IndexWriter(ramDir2, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
d = new Document();
f = new Field(FIELD_NAME, "multiTwo", Field.Store.YES, Field.Index.ANALYZED);
@@ -1375,7 +1379,12 @@ public class HighlighterTest extends Bas
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 2);
-
+ reader1.close();
+ reader2.close();
+ searchers[0].close();
+ searchers[1].close();
+ ramDir1.close();
+ ramDir2.close();
}
public void testFieldSpecificHighlighting() throws Exception {
@@ -1591,7 +1600,7 @@ public class HighlighterTest extends Bas
helper.start();
}
- private Directory dir = new MockRAMDirectory();
+ private Directory dir;
private Analyzer a = new WhitespaceAnalyzer(TEST_VERSION_CURRENT);
public void testWeightedTermsWithDeletes() throws IOException, ParseException, InvalidTokenOffsetsException {
@@ -1688,6 +1697,7 @@ public class HighlighterTest extends Bas
}
public void doSearching(Query unReWrittenQuery) throws Exception {
+ if (searcher != null) searcher.close();
searcher = new IndexSearcher(ramDir, true);
// for any multi-term queries to work (prefix, wildcard, range,fuzzy etc)
// you must use a rewritten query!
@@ -1718,8 +1728,10 @@ public class HighlighterTest extends Bas
@Override
protected void setUp() throws Exception {
super.setUp();
- ramDir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig(
+ random = newRandom();
+ dir = newDirectory(random);
+ ramDir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
for (int i = 0; i < texts.length; i++) {
addDoc(writer, texts[i]);
@@ -1750,6 +1762,14 @@ public class HighlighterTest extends Bas
numHighlights = 0;
}
+ @Override
+ protected void tearDown() throws Exception {
+ if (searcher != null) searcher.close();
+ reader.close();
+ dir.close();
+ ramDir.close();
+ super.tearDown();
+ }
private void addDoc(IndexWriter writer, String text) throws IOException {
Document d = new Document();
Field f = new Field(FIELD_NAME, text, Field.Store.YES, Field.Index.ANALYZED);
Modified: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Sat Aug 14 13:06:17 2010
@@ -91,7 +91,7 @@ public abstract class AbstractTestCase e
analyzerK = new KeywordAnalyzer();
paW = new QueryParser(TEST_VERSION_CURRENT, F, analyzerW );
paB = new QueryParser(TEST_VERSION_CURRENT, F, analyzerB );
- dir = new MockRAMDirectory();
+ dir = newDirectory(newRandom());
}
@Override
@@ -100,6 +100,7 @@ public abstract class AbstractTestCase e
reader.close();
reader = null;
}
+ dir.close();
super.tearDown();
}
@@ -334,7 +335,7 @@ public abstract class AbstractTestCase e
doc.add( new Field( F, value, Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
writer.addDocument( doc );
writer.close();
-
+ if (reader != null) reader.close();
reader = IndexReader.open( dir, true );
}
@@ -347,7 +348,7 @@ public abstract class AbstractTestCase e
doc.add( new Field( F, value, Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
writer.addDocument( doc );
writer.close();
-
+ if (reader != null) reader.close();
reader = IndexReader.open( dir, true );
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java Sat Aug 14 13:06:17 2010
@@ -64,11 +64,11 @@ public class SimpleFragListBuilderTest e
FieldFragList ffl = sflb.createFieldFragList( fpl( "a", "a a" ), 100 );
assertEquals( 1, ffl.fragInfos.size() );
assertEquals( "subInfos=(a((0,1))a((2,3)))/2.0(0,100)", ffl.fragInfos.get( 0 ).toString() );
-
+
ffl = sflb.createFieldFragList( fpl( "a", "a b b b b b b b b a" ), 20 );
assertEquals( 1, ffl.fragInfos.size() );
assertEquals( "subInfos=(a((0,1))a((18,19)))/2.0(0,20)", ffl.fragInfos.get( 0 ).toString() );
-
+
ffl = sflb.createFieldFragList( fpl( "a", "b b b b a b b b b a" ), 20 );
assertEquals( 1, ffl.fragInfos.size() );
assertEquals( "subInfos=(a((8,9))a((18,19)))/2.0(2,22)", ffl.fragInfos.get( 0 ).toString() );
Modified: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Sat Aug 14 13:06:17 2010
@@ -135,7 +135,7 @@ public class SimpleFragmentsBuilderTest
doc.add( new Field( F, "aaa", Store.NO, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
writer.addDocument( doc );
writer.close();
-
+ if (reader != null) reader.close();
reader = IndexReader.open( dir, true );
}
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/icu/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/icu: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,942235,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,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/contrib/icu: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,942235,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,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/modules/analysis/icu:950008
/lucene/java/branches/flex_1458/contrib/icu:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/icu:748824
Modified: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java Sat Aug 14 13:06:17 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.store.instanti
import java.io.IOException;
import java.util.Arrays;
+import java.util.Random;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.index.IndexReader;
@@ -60,9 +61,9 @@ public class TestEmptyIndex extends Luce
ii.close();
// make sure a Directory acts the same
-
- Directory d = new MockRAMDirectory();
- new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))).close();
+ Random random = newRandom();
+ Directory d = newDirectory(random);
+ new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))).close();
r = IndexReader.open(d, false);
testNorms(r);
r.close();
@@ -93,9 +94,9 @@ public class TestEmptyIndex extends Luce
ii.close();
// make sure a Directory acts the same
-
- Directory d = new MockRAMDirectory();
- new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))).close();
+ Random random = newRandom();
+ Directory d = newDirectory(random);
+ new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))).close();
r = IndexReader.open(d, false);
termEnumTest(r);
r.close();
Modified: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java Sat Aug 14 13:06:17 2010
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Random;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
@@ -58,10 +59,11 @@ public class TestIndicesEquals extends L
public void testLoadIndexReader() throws Exception {
- MockRAMDirectory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
// create dir data
- IndexWriter indexWriter = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(
TEST_VERSION_CURRENT)));
for (int i = 0; i < 20; i++) {
@@ -77,17 +79,18 @@ public class TestIndicesEquals extends L
ir.close();
testEqualBehaviour(dir, ii);
+ dir.close();
}
public void testInstantiatedIndexWriter() throws Exception {
-
- MockRAMDirectory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
InstantiatedIndex ii = new InstantiatedIndex();
// create dir data
- IndexWriter indexWriter = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(
TEST_VERSION_CURRENT)));
for (int i = 0; i < 500; i++) {
@@ -109,7 +112,7 @@ public class TestIndicesEquals extends L
testEqualBehaviour(dir, ii);
-
+ dir.close();
}
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 14 13:06:17 2010
@@ -1,5 +1,5 @@
/lucene/dev/branches/preflexfixes/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:967125-979432
-/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.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,942235,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,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/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.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,942235,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,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/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:896850,909334,948516
/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-925561
Modified: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestSerialization.java Sat Aug 14 13:06:17 2010
@@ -17,26 +17,25 @@ package org.apache.lucene.store.instanti
*/
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
+import java.util.Random;
public class TestSerialization extends LuceneTestCase {
public void test() throws Exception {
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
- Directory dir = new MockRAMDirectory();
-
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
doc.add(new Field("foo", "bar rab abr bra rba", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
doc.add(new Field("moo", "bar rab abr bra rba", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
@@ -52,7 +51,7 @@ public class TestSerialization extends L
oos.writeObject(ii);
oos.close();
baos.close();
-
+ dir.close();
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestUnoptimizedReaderOnConstructor.java Sat Aug 14 13:06:17 2010
@@ -16,6 +16,8 @@ package org.apache.lucene.store.instanti
*/
import java.io.IOException;
+import java.util.Random;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -33,7 +35,8 @@ import org.apache.lucene.document.Field;
public class TestUnoptimizedReaderOnConstructor extends LuceneTestCase {
public void test() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
addDocument(iw, "Hello, world!");
addDocument(iw, "All work and no play makes jack a dull boy");
@@ -59,7 +62,8 @@ public class TestUnoptimizedReaderOnCons
}
// todo some assertations.
-
+ unoptimizedReader.close();
+ dir.close();
}
private void addDocument(IndexWriter iw, String text) throws IOException {
Modified: lucene/dev/branches/branch_3x/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Sat Aug 14 13:06:17 2010
@@ -105,7 +105,7 @@ public class MemoryIndexTest extends Bas
termField.append(randomTerm());
}
- MockRAMDirectory ramdir = new MockRAMDirectory();
+ MockRAMDirectory ramdir = newDirectory(random);
Analyzer analyzer = randomAnalyzer();
IndexWriter writer = new IndexWriter(ramdir,
new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
@@ -121,6 +121,7 @@ public class MemoryIndexTest extends Bas
memory.addField("foo", fooField.toString(), analyzer);
memory.addField("term", termField.toString(), analyzer);
assertAllQueries(memory, ramdir, analyzer);
+ ramdir.close();
}
/**
@@ -135,6 +136,8 @@ public class MemoryIndexTest extends Bas
TopDocs memDocs = mem.search(qp.parse(query), 1);
assertEquals(ramDocs.totalHits, memDocs.totalHits);
}
+ ram.close();
+ mem.close();
}
/**
Modified: lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Sat Aug 14 13:06:17 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.util.Arrays;
+import java.util.Random;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.Document;
@@ -44,7 +45,7 @@ public class TestFieldNormModifier exten
public static int NUM_DOCS = 5;
- public Directory store = new MockRAMDirectory();
+ public Directory store;
/** inverts the normal notion of lengthNorm */
public static Similarity s = new DefaultSimilarity() {
@@ -57,7 +58,9 @@ public class TestFieldNormModifier exten
@Override
protected void setUp() throws Exception {
super.setUp();
- IndexWriter writer = new IndexWriter(store, new IndexWriterConfig(
+ Random random = newRandom();
+ store = newDirectory(random);
+ IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(
TEST_VERSION_CURRENT)));
@@ -76,7 +79,13 @@ public class TestFieldNormModifier exten
writer.close();
}
- public void testMissingField() {
+ @Override
+ protected void tearDown() throws Exception {
+ store.close();
+ super.tearDown();
+ }
+
+ public void testMissingField() throws Exception {
FieldNormModifier fnm = new FieldNormModifier(store, s);
try {
fnm.reSetNorms("nobodyherebutuschickens");
Modified: lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Sat Aug 14 13:06:17 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.analysis.WhitespaceAnalyzer;
+import java.util.Random;
+
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
@@ -26,12 +28,15 @@ import org.apache.lucene.util.LuceneTest
public class TestMultiPassIndexSplitter extends LuceneTestCase {
IndexReader input;
int NUM_DOCS = 11;
-
+ private Random random;
+ MockRAMDirectory dir;
+
@Override
protected void setUp() throws Exception {
super.setUp();
- MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ random = newRandom();
+ dir = newDirectory(random);
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc;
for (int i = 0; i < NUM_DOCS; i++) {
doc = new Document();
@@ -43,7 +48,16 @@ public class TestMultiPassIndexSplitter
input = IndexReader.open(dir, false);
// delete the last doc
input.deleteDocument(input.maxDoc() - 1);
+ IndexReader inputOld = input;
input = input.reopen(true);
+ inputOld.close();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ input.close();
+ dir.close();
+ super.tearDown();
}
/**
@@ -52,9 +66,9 @@ public class TestMultiPassIndexSplitter
public void testSplitRR() throws Exception {
MultiPassIndexSplitter splitter = new MultiPassIndexSplitter();
Directory[] dirs = new Directory[]{
- new MockRAMDirectory(),
- new MockRAMDirectory(),
- new MockRAMDirectory()
+ newDirectory(random),
+ newDirectory(random),
+ newDirectory(random)
};
splitter.split(input, dirs, false);
IndexReader ir;
@@ -86,6 +100,9 @@ public class TestMultiPassIndexSplitter
t = new Term("id", "0");
te = ir.terms(t);
assertNotSame(t, te.term());
+ ir.close();
+ for (Directory d : dirs)
+ d.close();
}
/**
@@ -94,9 +111,9 @@ public class TestMultiPassIndexSplitter
public void testSplitSeq() throws Exception {
MultiPassIndexSplitter splitter = new MultiPassIndexSplitter();
Directory[] dirs = new Directory[]{
- new MockRAMDirectory(),
- new MockRAMDirectory(),
- new MockRAMDirectory()
+ newDirectory(random),
+ newDirectory(random),
+ newDirectory(random)
};
splitter.split(input, dirs, true);
IndexReader ir;
@@ -122,5 +139,8 @@ public class TestMultiPassIndexSplitter
t = new Term("id", (NUM_DOCS - 1) + "");
te = ir.terms(t);
assertNotSame(t, te.term());
+ ir.close();
+ for (Directory d : dirs)
+ d.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/index/TestTermVectorAccessor.java Sat Aug 14 13:06:17 2010
@@ -4,10 +4,10 @@ import org.apache.lucene.analysis.standa
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import java.util.Collections;
+import java.util.Random;
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@ import java.util.Collections;
public class TestTermVectorAccessor extends LuceneTestCase {
public void test() throws Exception {
-
- Directory dir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT, Collections.emptySet())));
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
+ IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT, Collections.emptySet())));
Document doc;
Modified: lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java Sat Aug 14 13:06:17 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.misc;
* limitations under the License.
*/
+import java.util.Random;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -35,18 +37,21 @@ public class TestHighFreqTerms extends L
public void setUp() throws Exception {
super.setUp();
- dir= new MockRAMDirectory();
- writer = new IndexWriter(dir, new IndexWriterConfig(
+ Random random = newRandom();
+ dir= newDirectory(random);
+ writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2));
indexDocs(writer);
reader = IndexReader.open(dir, true);
}
-public void tearDown()throws Exception{
- super.tearDown();
- reader.close();
-}
+ public void tearDown() throws Exception{
+ reader.close();
+ dir.close();
+ super.tearDown();
+ }
+
/******************** Tests for getHighFreqTerms **********************************/
// test without specifying field (i.e. if we pass in field=null it should examine all fields)
Modified: lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Sat Aug 14 13:06:17 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.misc;
*/
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.Document;
@@ -48,7 +49,7 @@ public class TestLengthNormModifier exte
public static int NUM_DOCS = 5;
- public Directory store = new MockRAMDirectory();
+ public Directory store;
/** inverts the normal notion of lengthNorm */
public static Similarity s = new DefaultSimilarity() {
@@ -61,7 +62,9 @@ public class TestLengthNormModifier exte
@Override
protected void setUp() throws Exception {
super.setUp();
- IndexWriter writer = new IndexWriter(store, new IndexWriterConfig(
+ Random random = newRandom();
+ store = newDirectory(random);
+ IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
for (int i = 0; i < NUM_DOCS; i++) {
@@ -82,6 +85,12 @@ public class TestLengthNormModifier exte
writer.close();
}
+ @Override
+ protected void tearDown() throws Exception {
+ store.close();
+ super.tearDown();
+ }
+
public void testMissingField() {
FieldNormModifier fnm = new FieldNormModifier(store, s);
try {
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java Sat Aug 14 13:06:17 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
@@ -35,8 +36,9 @@ public class BooleanFilterTest extends L
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
//Add series of docs with filterable fields : acces rights, prices, dates and "in-stock" flags
addDoc(writer, "admin guest", "010", "20040101","Y");
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/ChainedFilterTest.java Sat Aug 14 13:06:17 2010
@@ -60,7 +60,7 @@ public class ChainedFilterTest extends L
protected void setUp() throws Exception {
super.setUp();
random = newRandom();
- directory = new MockRAMDirectory();
+ directory = newDirectory(random);
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Calendar cal = new GregorianCalendar();
cal.clear();
@@ -195,7 +195,7 @@ public class ChainedFilterTest extends L
*/
public void testWithCachingFilter() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java Sat Aug 14 13:06:17 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Random;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
@@ -40,8 +41,9 @@ public class DuplicateFilterTest extends
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory, new StandardAnalyzer(TEST_VERSION_CURRENT));
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory, new StandardAnalyzer(TEST_VERSION_CURRENT));
//Add series of docs with filterable fields : url, text and dates flags
addDoc(writer, "http://lucene.apache.org", "lucene 1.4.3 available", "20040101");
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java Sat Aug 14 13:06:17 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.HashSet;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
@@ -40,8 +41,9 @@ public class FuzzyLikeThisQueryTest exte
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
//Add series of docs with misspelt names
addDoc(writer, "jonathon smythe","1");
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java Sat Aug 14 13:06:17 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.search;
*/
import java.util.HashSet;
+import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -50,8 +51,9 @@ public class TermsFilterTest extends Luc
public void testMissingTerms() throws Exception {
String fieldName="field1";
- MockRAMDirectory rd=new MockRAMDirectory();
- RandomIndexWriter w = new RandomIndexWriter(newRandom(), rd);
+ Random random = newRandom();
+ MockRAMDirectory rd=newDirectory(random);
+ RandomIndexWriter w = new RandomIndexWriter(random, rd);
for (int i = 0; i < 100; i++) {
Document doc=new Document();
int term=i*10; //terms are units of 10;
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestRegexQuery.java Sat Aug 14 13:06:17 2010
@@ -17,6 +17,8 @@ package org.apache.lucene.search.regex;
* limitations under the License.
*/
+import java.util.Random;
+
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.index.IndexReader;
@@ -41,8 +43,9 @@ public class TestRegexQuery extends Luce
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
doc.add(new Field(FN, "the quick brown fox jumps over the lazy dog", Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java Sat Aug 14 13:06:17 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.search.regex;
*/
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -40,13 +41,28 @@ import org.apache.lucene.util.LuceneTest
public class TestSpanRegexQuery extends LuceneTestCase {
- Directory indexStoreA = new MockRAMDirectory();
-
- Directory indexStoreB = new MockRAMDirectory();
-
+ Directory indexStoreA;
+ Directory indexStoreB;
+ Random random;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ random = newRandom();
+ indexStoreA = newDirectory(random);
+ indexStoreB = newDirectory(random);
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ indexStoreA.close();
+ indexStoreB.close();
+ super.tearDown();
+ }
+
public void testSpanRegex() throws Exception {
- MockRAMDirectory directory = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
+ MockRAMDirectory directory = newDirectory(random);
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
// doc.add(new Field("field", "the quick brown fox jumps over the lazy dog",
@@ -70,6 +86,8 @@ public class TestSpanRegexQuery extends
// true);
int numHits = searcher.search(sfq, null, 1000).totalHits;
assertEquals(1, numHits);
+ searcher.close();
+ directory.close();
}
public void testSpanRegexBug() throws CorruptIndexException, IOException {
@@ -112,14 +130,14 @@ public class TestSpanRegexQuery extends
Field.Index.ANALYZED_NO_NORMS));
// creating first index writer
- IndexWriter writerA = new IndexWriter(indexStoreA, new IndexWriterConfig(
+ IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE));
writerA.addDocument(lDoc);
writerA.optimize();
writerA.close();
// creating second index writer
- IndexWriter writerB = new IndexWriter(indexStoreB, new IndexWriterConfig(
+ IndexWriter writerB = new IndexWriter(indexStoreB, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE));
writerB.addDocument(lDoc2);
writerB.optimize();
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queries/src/test/org/apache/lucene/search/similar/TestMoreLikeThis.java Sat Aug 14 13:06:17 2010
@@ -22,6 +22,7 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
@@ -43,8 +44,9 @@ public class TestMoreLikeThis extends Lu
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(newRandom(), directory);
+ Random random = newRandom();
+ directory = newDirectory(random);
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
// Add series of docs with specific information for MoreLikeThis
addDoc(writer, "lucene");
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/complexPhrase/TestComplexPhraseQuery.java Sat Aug 14 13:06:17 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.queryParser.co
*/
import java.util.HashSet;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
@@ -35,7 +36,7 @@ import org.apache.lucene.store.MockRAMDi
import org.apache.lucene.util.LuceneTestCase;
public class TestComplexPhraseQuery extends LuceneTestCase {
-
+ MockRAMDirectory rd;
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
DocData docsContent[] = { new DocData("john smith", "1"),
@@ -113,8 +114,9 @@ public class TestComplexPhraseQuery exte
@Override
protected void setUp() throws Exception {
super.setUp();
- MockRAMDirectory rd = new MockRAMDirectory();
- IndexWriter w = new IndexWriter(rd, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ Random random = newRandom();
+ rd = newDirectory(random);
+ IndexWriter w = new IndexWriter(rd, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
for (int i = 0; i < docsContent.length; i++) {
Document doc = new Document();
doc.add(new Field("name", docsContent[i].name, Field.Store.YES,
@@ -130,6 +132,7 @@ public class TestComplexPhraseQuery exte
@Override
protected void tearDown() throws Exception {
searcher.close();
+ rd.close();
super.tearDown();
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQPHelper.java Sat Aug 14 13:06:17 2010
@@ -20,6 +20,7 @@ package org.apache.lucene.queryParser.st
import java.io.Reader;
import java.util.HashMap;
import java.util.Map;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -319,8 +320,9 @@ public class TestMultiFieldQPHelper exte
public void testStopWordSearching() throws Exception {
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
- Directory ramDir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ Random random = newRandom();
+ Directory ramDir = newDirectory(random);
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
doc.add(new Field("body", "blah the footest blah", Field.Store.NO,
Field.Index.ANALYZED));
@@ -337,6 +339,7 @@ public class TestMultiFieldQPHelper exte
ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs;
assertEquals(1, hits.length);
is.close();
+ ramDir.close();
}
/**
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java Sat Aug 14 13:06:17 2010
@@ -321,7 +321,7 @@ public class TestMultiFieldQueryParserWr
public void testStopWordSearching() throws Exception {
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
- Directory ramDir = new MockRAMDirectory();
+ Directory ramDir = newDirectory(newRandom());
IndexWriter iw = new IndexWriter(ramDir, analyzer, true,
IndexWriter.MaxFieldLength.LIMITED);
Document doc = new Document();
@@ -338,6 +338,7 @@ public class TestMultiFieldQueryParserWr
ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs;
assertEquals(1, hits.length);
is.close();
+ ramDir.close();
}
/**
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQPHelper.java Sat Aug 14 13:06:17 2010
@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Collections;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.KeywordAnalyzer;
@@ -627,9 +628,9 @@ public class TestQPHelper extends Locali
}
public void testFarsiRangeCollating() throws Exception {
-
- MockRAMDirectory ramDir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ Random random = newRandom();
+ MockRAMDirectory ramDir = newDirectory(random);
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES,
Field.Index.NOT_ANALYZED));
@@ -673,6 +674,7 @@ public class TestQPHelper extends Locali
assertEquals("The index Term should be included.", 1, result.length);
is.close();
+ ramDir.close();
}
/** for testing legacy DateField support */
@@ -1049,9 +1051,9 @@ public class TestQPHelper extends Locali
}
public void testLocalDateFormat() throws IOException, QueryNodeException {
-
- MockRAMDirectory ramDir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ Random random = newRandom();
+ MockRAMDirectory ramDir = newDirectory(random);
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw);
addDateDoc("b", 2005, 12, 4, 22, 15, 00, iw);
iw.close();
@@ -1063,6 +1065,7 @@ public class TestQPHelper extends Locali
assertHits(1, "{12/1/2005 TO 12/4/2005}", is);
assertHits(0, "{12/3/2005 TO 12/4/2005}", is);
is.close();
+ ramDir.close();
}
public void testStarParsing() throws Exception {
@@ -1248,8 +1251,9 @@ public class TestQPHelper extends Locali
}
public void testMultiPhraseQuery() throws Exception {
- MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new CannedAnalyzer()));
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new CannedAnalyzer()));
Document doc = new Document();
doc.add(new Field("field", "", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
@@ -1261,6 +1265,7 @@ public class TestQPHelper extends Locali
assertEquals(1, s.search(q, 10).totalHits);
r.close();
w.close();
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java Sat Aug 14 13:06:17 2010
@@ -628,7 +628,7 @@ public class TestQueryParserWrapper exte
public void testFarsiRangeCollating() throws Exception {
- MockRAMDirectory ramDir = new MockRAMDirectory();
+ MockRAMDirectory ramDir = newDirectory(newRandom());
IndexWriter iw = new IndexWriter(ramDir, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true,
IndexWriter.MaxFieldLength.LIMITED);
Document doc = new Document();
@@ -670,6 +670,7 @@ public class TestQueryParserWrapper exte
assertEquals("The index Term should be included.", 1, result.length);
is.close();
+ ramDir.close();
}
private String escapeDateString(String s) {
@@ -1035,7 +1036,7 @@ public class TestQueryParserWrapper exte
public void testLocalDateFormat() throws IOException, ParseException {
- MockRAMDirectory ramDir = new MockRAMDirectory();
+ MockRAMDirectory ramDir = newDirectory(newRandom());
IndexWriter iw = new IndexWriter(ramDir, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), true,
IndexWriter.MaxFieldLength.LIMITED);
addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw);
@@ -1049,6 +1050,7 @@ public class TestQueryParserWrapper exte
assertHits(1, "{12/1/2005 TO 12/4/2005}", is);
assertHits(0, "{12/3/2005 TO 12/4/2005}", is);
is.close();
+ ramDir.close();
}
public void testStarParsing() throws Exception {
Modified: lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java Sat Aug 14 13:06:17 2010
@@ -18,12 +18,14 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.analysis.SimpleAnalyzer;
+import java.util.Random;
+
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.MockRAMDirectory;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -33,11 +35,15 @@ import static org.junit.Assert.*;
* Tests that the index is cached on the searcher side of things.
*/
public class TestRemoteCachingWrapperFilter extends RemoteTestCaseJ4 {
+ private static MockRAMDirectory indexStore;
+ private static Searchable local;
+
@BeforeClass
public static void beforeClass() throws Exception {
// construct an index
- MockRAMDirectory indexStore = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
+ Random random = newStaticRandom(TestRemoteCachingWrapperFilter.class);
+ indexStore = newDirectory(random);
+ IndexWriter writer = new IndexWriter(indexStore, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(
TEST_VERSION_CURRENT)));
Document doc = new Document();
@@ -53,10 +59,17 @@ public class TestRemoteCachingWrapperFil
writer.addDocument(doc);
writer.optimize();
writer.close();
- Searchable local = new IndexSearcher(indexStore, true);
+ local = new IndexSearcher(indexStore, true);
startServer(local);
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ local.close();
+ indexStore.close();
+ indexStore = null;
+ }
+
private static void search(Query query, Filter filter, int hitNumber, String typeValue) throws Exception {
Searchable[] searchables = { lookupRemote() };
Searcher searcher = new MultiSearcher(searchables);
Modified: lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java Sat Aug 14 13:06:17 2010
@@ -20,25 +20,29 @@ package org.apache.lucene.search;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.document.*;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.MockRAMDirectory;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
import java.util.Collections;
+import java.util.Random;
import java.util.Set;
import java.util.HashSet;
public class TestRemoteSearchable extends RemoteTestCaseJ4 {
-
+ private static MockRAMDirectory indexStore;
+ private static Searchable local;
+
@BeforeClass
public static void beforeClass() throws Exception {
// construct an index
- MockRAMDirectory indexStore = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
+ Random random = newStaticRandom(TestRemoteSearchable.class);
+ indexStore = newDirectory(random);
+ IndexWriter writer = new IndexWriter(indexStore, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
doc.add(new Field("test", "test text", Field.Store.YES, Field.Index.ANALYZED));
@@ -46,10 +50,17 @@ public class TestRemoteSearchable extend
writer.addDocument(doc);
writer.optimize();
writer.close();
- Searchable local = new IndexSearcher(indexStore, true);
+ local = new IndexSearcher(indexStore, true);
startServer(local);
}
-
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ local.close();
+ indexStore.close();
+ indexStore = null;
+ }
+
private static void search(Query query) throws Exception {
// try to search the published index
Searchable[] searchables = { lookupRemote() };
Modified: lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java Sat Aug 14 13:06:17 2010
@@ -34,6 +34,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.LogMergePolicy;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.MockRAMDirectory;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -47,6 +48,7 @@ import org.junit.Test;
public class TestRemoteSort extends RemoteTestCaseJ4 {
private static IndexSearcher full;
+ private static MockRAMDirectory indexStore;
private Query queryX;
private Query queryY;
private Query queryA;
@@ -81,8 +83,9 @@ public class TestRemoteSort extends Remo
// create an index of all the documents, or just the x, or just the y documents
@BeforeClass
public static void beforeClass() throws Exception {
- MockRAMDirectory indexStore = new MockRAMDirectory ();
- IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
+ Random random = newStaticRandom(TestRemoteSort.class);
+ indexStore = newDirectory(random);
+ IndexWriter writer = new IndexWriter(indexStore, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
@@ -110,6 +113,14 @@ public class TestRemoteSort extends Remo
startServer(full);
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ full.close();
+ full = null;
+ indexStore.close();
+ indexStore = null;
+ }
+
public String getRandomNumberString(int num, int low, int high) {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < num; i++) {
Modified: lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestCartesian.java Sat Aug 14 13:06:17 2010
@@ -20,13 +20,13 @@ import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -47,7 +47,6 @@ import org.apache.lucene.spatial.tier.pr
import org.apache.lucene.spatial.tier.projections.IProjector;
import org.apache.lucene.spatial.tier.projections.SinusoidalProjector;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.NumericUtils;
@@ -70,9 +69,10 @@ public class TestCartesian extends Lucen
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
+ Random random = newRandom();
+ directory = newDirectory(random);
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
setUpPlotter( 2, 15);
@@ -80,6 +80,12 @@ public class TestCartesian extends Lucen
}
+ @Override
+ protected void tearDown() throws Exception {
+ directory.close();
+ super.tearDown();
+ }
+
private void setUpPlotter(int base, int top) {
@@ -287,6 +293,7 @@ public class TestCartesian extends Lucen
assertTrue(geo_distance >= lastDistance);
lastDistance = geo_distance;
}
+ searcher.close();
}
public void testPoleFlipping() throws IOException, InvalidGeoException {
@@ -383,6 +390,7 @@ public class TestCartesian extends Lucen
assertTrue(geo_distance >= lastDistance);
lastDistance = geo_distance;
}
+ searcher.close();
}
public void testRange() throws IOException, InvalidGeoException {
@@ -477,6 +485,7 @@ public class TestCartesian extends Lucen
lastDistance = geo_distance;
}
}
+ searcher.close();
}
@@ -570,5 +579,6 @@ public class TestCartesian extends Lucen
}
}
+ searcher.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/TestDistance.java Sat Aug 14 13:06:17 2010
@@ -17,12 +17,12 @@
package org.apache.lucene.spatial.tier;
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.QueryWrapperFilter;
@@ -44,8 +44,9 @@ public class TestDistance extends Lucene
@Override
protected void setUp() throws Exception {
super.setUp();
- directory = new MockRAMDirectory();
- writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ Random random = newRandom();
+ directory = newDirectory(random);
+ writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
addData(writer);
}
@@ -53,6 +54,7 @@ public class TestDistance extends Lucene
@Override
protected void tearDown() throws Exception {
writer.close();
+ directory.close();
super.tearDown();
}
@@ -104,6 +106,7 @@ public class TestDistance extends Lucene
for(int i=0;i<readers.length;i++) {
f.getDocIdSet(readers[i]);
}
+ r.close();
}
/* these tests do not test anything, as no assertions:
Modified: lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java Sat Aug 14 13:06:17 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.search.spell;
import java.io.IOException;
import java.util.Iterator;
+import java.util.Random;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
@@ -37,17 +38,19 @@ import org.apache.lucene.util.LuceneTest
*/
public class TestLuceneDictionary extends LuceneTestCase {
- private Directory store = new MockRAMDirectory();
+ private Directory store;
private IndexReader indexReader = null;
-
+ private Random random;
private LuceneDictionary ld;
private Iterator<String> it;
@Override
protected void setUp() throws Exception {
super.setUp();
- IndexWriter writer = new IndexWriter(store, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ random = newRandom();
+ store = newDirectory(random);
+ IndexWriter writer = new IndexWriter(store, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc;
@@ -75,6 +78,14 @@ public class TestLuceneDictionary extend
writer.close();
}
+ @Override
+ protected void tearDown() throws Exception {
+ if (indexReader != null)
+ indexReader.close();
+ store.close();
+ super.tearDown();
+ }
+
public void testFieldNonExistent() throws IOException {
try {
indexReader = IndexReader.open(store, true);
@@ -185,7 +196,8 @@ public class TestLuceneDictionary extend
}
public void testSpellchecker() throws IOException {
- SpellChecker sc = new SpellChecker(new MockRAMDirectory());
+ Directory dir = newDirectory(random);
+ SpellChecker sc = new SpellChecker(dir);
indexReader = IndexReader.open(store, true);
sc.indexDictionary(new LuceneDictionary(indexReader, "contents"));
String[] suggestions = sc.suggestSimilar("Tam", 1);
@@ -195,6 +207,8 @@ public class TestLuceneDictionary extend
assertEquals(1, suggestions.length);
assertEquals("Jerry", suggestions[0]);
indexReader.close();
+ sc.close();
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java Sat Aug 14 13:06:17 2010
@@ -33,13 +33,15 @@ public class TestPlainTextDictionary ext
final String LF = System.getProperty("line.separator");
String input = "oneword" + LF + "twoword" + LF + "threeword";
PlainTextDictionary ptd = new PlainTextDictionary(new StringReader(input));
- MockRAMDirectory ramDir = new MockRAMDirectory();
+ MockRAMDirectory ramDir = newDirectory(newRandom());
SpellChecker spellChecker = new SpellChecker(ramDir);
spellChecker.indexDictionary(ptd);
String[] similar = spellChecker.suggestSimilar("treeword", 2);
assertEquals(2, similar.length);
assertEquals(similar[0], "threeword");
assertEquals(similar[1], "twoword");
+ spellChecker.close();
+ ramDir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/spellchecker/src/test/org/apache/lucene/search/spell/TestSpellChecker.java Sat Aug 14 13:06:17 2010
@@ -36,7 +36,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
@@ -54,7 +53,7 @@ public class TestSpellChecker extends Lu
super.setUp();
//create a user index
- userindex = new MockRAMDirectory();
+ userindex = newDirectory(random);
IndexWriter writer = new IndexWriter(userindex, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
@@ -67,9 +66,18 @@ public class TestSpellChecker extends Lu
writer.close();
searchers = Collections.synchronizedList(new ArrayList<IndexSearcher>());
// create the spellChecker
- spellindex = new MockRAMDirectory();
+ spellindex = newDirectory(random);
spellChecker = new SpellCheckerMock(spellindex);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ userindex.close();
+ if (!spellChecker.isClosed())
+ spellChecker.close();
+ spellindex.close();
+ super.tearDown();
+ }
public void testBuild() throws CorruptIndexException, IOException {
@@ -99,7 +107,7 @@ public class TestSpellChecker extends Lu
spellChecker.setAccuracy(0.5f);
checkCommonSuggestions(r);
checkNGramSuggestions();
-
+ r.close();
}
private void checkCommonSuggestions(IndexReader r) throws IOException {
@@ -260,6 +268,7 @@ public class TestSpellChecker extends Lu
}
assertEquals(4, searchers.size());
assertSearchersClosed();
+ r.close();
}
/*
@@ -311,7 +320,7 @@ public class TestSpellChecker extends Lu
// 2. and 3. during addwords
assertEquals(iterations + 4, searchers.size());
assertSearchersClosed();
-
+ r.close();
}
private void assertLastSearcherOpen(int numSearchers) {
Modified: lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java Sat Aug 14 13:06:17 2010
@@ -4,6 +4,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -56,12 +57,10 @@ public class TestParser extends LuceneTe
//initialize the parser
builder=new CorePlusExtensionsParser("contents",analyzer);
- //initialize the index (done once, then cached in static data for use with ALL tests)
- if(dir==null)
- {
+ Random random = newRandom();
BufferedReader d = new BufferedReader(new InputStreamReader(TestParser.class.getResourceAsStream("reuters21578.txt")));
- dir=new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(Version.LUCENE_24, analyzer));
+ dir=newDirectory(random);
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, Version.LUCENE_24, analyzer));
String line = d.readLine();
while(line!=null)
{
@@ -79,7 +78,6 @@ public class TestParser extends LuceneTe
}
d.close();
writer.close();
- }
reader=IndexReader.open(dir, true);
searcher=new IndexSearcher(reader);
@@ -92,7 +90,7 @@ public class TestParser extends LuceneTe
protected void tearDown() throws Exception {
reader.close();
searcher.close();
-// dir.close();
+ dir.close();
super.tearDown();
}
public void testSimpleXML() throws ParserException, IOException
Modified: lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestQueryTemplateManager.java Sat Aug 14 13:06:17 2010
@@ -2,6 +2,7 @@ package org.apache.lucene.xmlparser;
import java.io.IOException;
import java.util.Properties;
+import java.util.Random;
import java.util.StringTokenizer;
import javax.xml.parsers.ParserConfigurationException;
@@ -44,6 +45,7 @@ public class TestQueryTemplateManager ex
CoreParser builder;
Analyzer analyzer=new StandardAnalyzer(TEST_VERSION_CURRENT);
private IndexSearcher searcher;
+ private MockRAMDirectory dir;
//A collection of documents' field values for use in our tests
String docFieldValues []=
@@ -141,8 +143,9 @@ public class TestQueryTemplateManager ex
//Create an index
- MockRAMDirectory dir=new MockRAMDirectory();
- IndexWriter w=new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ Random random = newRandom();
+ dir=newDirectory(random);
+ IndexWriter w=new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
for (int i = 0; i < docFieldValues.length; i++)
{
w.addDocument(getDocumentFromString(docFieldValues[i]));
@@ -160,6 +163,7 @@ public class TestQueryTemplateManager ex
@Override
protected void tearDown() throws Exception {
searcher.close();
+ dir.close();
super.tearDown();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java Sat Aug 14 13:06:17 2010
@@ -20,6 +20,7 @@ package org.apache.lucene.xmlparser.buil
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Random;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -61,9 +62,9 @@ public class TestNumericRangeFilterBuild
String xml = "<NumericRangeFilter fieldName='AGE' type='int' lowerTerm='-1' upperTerm='NaN'/>";
Document doc = getDocumentFromString(xml);
Filter filter = filterBuilder.getFilter(doc.getDocumentElement());
-
- MockRAMDirectory ramDir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ Random random = newRandom();
+ MockRAMDirectory ramDir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, null));
writer.commit();
try
{
@@ -81,6 +82,7 @@ public class TestNumericRangeFilterBuild
{
writer.commit();
writer.close();
+ ramDir.close();
}
}