You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by us...@apache.org on 2009/11/05 02:55:44 UTC
svn commit: r832972 [3/3] - in
/lucene/java/trunk/src/test/org/apache/lucene: ./ analysis/ index/
queryParser/ search/ search/function/ search/payloads/ search/spans/ store/
util/
Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Thu Nov 5 01:55:39 2009
@@ -49,6 +49,7 @@
protected IndexSearcher searcher;
+ @Override
public void setUp() throws Exception {
super.setUp();
RAMDirectory directory = new RAMDirectory();
@@ -114,6 +115,7 @@
searcher = new IndexSearcher(directory, true);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
searcher.close();
@@ -140,6 +142,7 @@
// mask an anon SpanQuery class that rewrites to something else.
SpanQuery q = new FieldMaskingSpanQuery
(new SpanTermQuery(new Term("last", "sally")) {
+ @Override
public Query rewrite(IndexReader reader) {
return new SpanOrQuery(new SpanQuery[] {
new SpanTermQuery(new Term("first", "sally")),
Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Thu Nov 5 01:55:39 2009
@@ -39,11 +39,13 @@
public static final QueryParser qp =
new QueryParser(Version.LUCENE_CURRENT, FIELD, new WhitespaceAnalyzer());
+ @Override
public void tearDown() throws Exception {
super.tearDown();
searcher.close();
}
+ @Override
public void setUp() throws Exception {
super.setUp();
RAMDirectory directory = new RAMDirectory();
Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Thu Nov 5 01:55:39 2009
@@ -59,6 +59,7 @@
super(s);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
PayloadHelper helper = new PayloadHelper();
@@ -472,6 +473,7 @@
class PayloadAnalyzer extends Analyzer {
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
TokenStream result = new LowerCaseTokenizer(reader);
result = new PayloadFilter(result, fieldName);
@@ -502,6 +504,7 @@
payloadAtt = addAttribute(PayloadAttribute.class);
}
+ @Override
public boolean incrementToken() throws IOException {
if (input.incrementToken()) {
String token = new String(termAtt.termBuffer(), 0, termAtt.termLength());
@@ -522,6 +525,7 @@
public class TestPayloadAnalyzer extends Analyzer {
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
TokenStream result = new LowerCaseTokenizer(reader);
result = new PayloadFilter(result, fieldName);
Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java Thu Nov 5 01:55:39 2009
@@ -33,6 +33,7 @@
*
* @see CheckHits#checkNoMatchExplanations
*/
+ @Override
public void qtest(Query q, int[] expDocNrs) throws Exception {
CheckHits.checkNoMatchExplanations(q, FIELD, searcher, expDocNrs);
}
Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpans.java Thu Nov 5 01:55:39 2009
@@ -46,6 +46,7 @@
public static final String field = "field";
+ @Override
public void setUp() throws Exception {
super.setUp();
RAMDirectory directory = new RAMDirectory();
@@ -393,6 +394,7 @@
int slop = 1;
final Similarity sim = new DefaultSimilarity() {
+ @Override
public float sloppyFreq(int distance) {
return 0.0f;
}
@@ -404,6 +406,7 @@
makeSpanTermQuery("t2") },
slop,
ordered) {
+ @Override
public Similarity getSimilarity(Searcher s) {
return sim;
}
Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Thu Nov 5 01:55:39 2009
@@ -49,6 +49,7 @@
/**
* Initializes the tests by adding 4 identical documents to the index.
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
super.setUp();
@@ -64,6 +65,7 @@
searcher = new IndexSearcher(mDirectory, true);
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
searcher.close();
Modified: lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java Thu Nov 5 01:55:39 2009
@@ -35,6 +35,7 @@
/**
* Initializes the tests by adding documents to the index.
*/
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -99,6 +100,7 @@
*
* @throws IOException
*/
+ @Override
public void testBooleanQueryWithSpanQueries() throws IOException {
doTestBooleanQueryWithSpanQueries(searcher2, 0.73500174f);
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMDirectory.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMDirectory.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMDirectory.java Thu Nov 5 01:55:39 2009
@@ -77,6 +77,7 @@
preventDoubleWrite = value;
}
+ @Override
public synchronized void sync(String name) throws IOException {
maybeThrowDeterministicException();
if (crashed)
@@ -170,6 +171,7 @@
}
}
+ @Override
public synchronized void deleteFile(String name) throws IOException {
deleteFile(name, false);
}
@@ -191,6 +193,7 @@
super.deleteFile(name);
}
+ @Override
public synchronized IndexOutput createOutput(String name) throws IOException {
if (crashed)
throw new IOException("cannot createOutput after crash");
@@ -220,6 +223,7 @@
return new MockRAMOutputStream(this, file, name);
}
+ @Override
public synchronized IndexInput openInput(String name) throws IOException {
RAMFile file = fileMap.get(name);
if (file == null)
@@ -258,6 +262,7 @@
return size;
}
+ @Override
public synchronized void close() {
if (openFiles == null) {
openFiles = new HashMap();
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMInputStream.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMInputStream.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMInputStream.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMInputStream.java Thu Nov 5 01:55:39 2009
@@ -37,6 +37,7 @@
this.dir = dir;
}
+ @Override
public void close() {
super.close();
// Pending resolution on LUCENE-686 we may want to
@@ -58,6 +59,7 @@
}
}
+ @Override
public Object clone() {
MockRAMInputStream clone = (MockRAMInputStream) super.clone();
clone.isClone = true;
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMOutputStream.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMOutputStream.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/MockRAMOutputStream.java Thu Nov 5 01:55:39 2009
@@ -40,6 +40,7 @@
this.name = name;
}
+ @Override
public void close() throws IOException {
super.close();
@@ -51,16 +52,19 @@
}
}
+ @Override
public void flush() throws IOException {
dir.maybeThrowDeterministicException();
super.flush();
}
+ @Override
public void writeByte(byte b) throws IOException {
singleByte[0] = b;
writeBytes(singleByte, 0, 1);
}
+ @Override
public void writeBytes(byte[] b, int offset, int len) throws IOException {
long freeSpace = dir.maxSize - dir.sizeInBytes();
long realUsage = 0;
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/TestBufferedIndexInput.java Thu Nov 5 01:55:39 2009
@@ -176,31 +176,31 @@
// reads up to the EOF will succeed. The EOF is determined by the
// BufferedIndexInput's arbitrary length() value.
public void testEOF() throws Exception {
- MyBufferedIndexInput input = new MyBufferedIndexInput(1024);
- // see that we can read all the bytes at one go:
- checkReadBytes(input, (int)input.length(), 0);
- // go back and see that we can't read more than that, for small and
- // large overflows:
- int pos = (int)input.length()-10;
- input.seek(pos);
- checkReadBytes(input, 10, pos);
- input.seek(pos);
- try {
- checkReadBytes(input, 11, pos);
+ MyBufferedIndexInput input = new MyBufferedIndexInput(1024);
+ // see that we can read all the bytes at one go:
+ checkReadBytes(input, (int)input.length(), 0);
+ // go back and see that we can't read more than that, for small and
+ // large overflows:
+ int pos = (int)input.length()-10;
+ input.seek(pos);
+ checkReadBytes(input, 10, pos);
+ input.seek(pos);
+ try {
+ checkReadBytes(input, 11, pos);
fail("Block read past end of file");
} catch (IOException e) {
/* success */
}
- input.seek(pos);
- try {
- checkReadBytes(input, 50, pos);
+ input.seek(pos);
+ try {
+ checkReadBytes(input, 50, pos);
fail("Block read past end of file");
} catch (IOException e) {
/* success */
}
- input.seek(pos);
- try {
- checkReadBytes(input, 100000, pos);
+ input.seek(pos);
+ try {
+ checkReadBytes(input, 100000, pos);
fail("Block read past end of file");
} catch (IOException e) {
/* success */
@@ -210,34 +210,38 @@
// byten emulates a file - byten(n) returns the n'th byte in that file.
// MyBufferedIndexInput reads this "file".
private static byte byten(long n){
- return (byte)(n*n%256);
+ return (byte)(n*n%256);
}
private static class MyBufferedIndexInput extends BufferedIndexInput {
- private long pos;
- private long len;
- public MyBufferedIndexInput(long len){
- this.len = len;
- this.pos = 0;
- }
- public MyBufferedIndexInput(){
- // an infinite file
- this(Long.MAX_VALUE);
- }
- protected void readInternal(byte[] b, int offset, int length) throws IOException {
- for(int i=offset; i<offset+length; i++)
- b[i] = byten(pos++);
- }
-
- protected void seekInternal(long pos) throws IOException {
- this.pos = pos;
- }
-
- public void close() throws IOException {
- }
-
- public long length() {
- return len;
- }
+ private long pos;
+ private long len;
+ public MyBufferedIndexInput(long len){
+ this.len = len;
+ this.pos = 0;
+ }
+ public MyBufferedIndexInput(){
+ // an infinite file
+ this(Long.MAX_VALUE);
+ }
+ @Override
+ protected void readInternal(byte[] b, int offset, int length) throws IOException {
+ for(int i=offset; i<offset+length; i++)
+ b[i] = byten(pos++);
+ }
+
+ @Override
+ protected void seekInternal(long pos) throws IOException {
+ this.pos = pos;
+ }
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ @Override
+ public long length() {
+ return len;
+ }
}
public void testSetBufferSize() throws IOException {
@@ -300,6 +304,7 @@
dir = new SimpleFSDirectory(path, null);
}
+ @Override
public IndexInput openInput(String name) throws IOException {
return openInput(name, BufferedIndexInput.BUFFER_SIZE);
}
@@ -316,6 +321,7 @@
//System.out.println("tweak'd " + count + " buffer sizes");
}
+ @Override
public IndexInput openInput(String name, int bufferSize) throws IOException {
// Make random changes to buffer size
bufferSize = 1+(int) Math.abs(rand.nextInt() % 10);
@@ -324,40 +330,48 @@
return f;
}
+ @Override
public IndexOutput createOutput(String name) throws IOException {
return dir.createOutput(name);
}
+ @Override
public void close() throws IOException {
dir.close();
}
+ @Override
public void deleteFile(String name)
throws IOException
{
dir.deleteFile(name);
}
+ @Override
public void touchFile(String name)
throws IOException
{
dir.touchFile(name);
}
+ @Override
public long fileModified(String name)
throws IOException
{
return dir.fileModified(name);
}
+ @Override
public boolean fileExists(String name)
throws IOException
{
return dir.fileExists(name);
}
+ @Override
public String[] listAll()
throws IOException
{
return dir.listAll();
}
+ @Override
public long fileLength(String name) throws IOException {
return dir.fileLength(name);
}
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/TestHugeRamFile.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/TestHugeRamFile.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/TestHugeRamFile.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/TestHugeRamFile.java Thu Nov 5 01:55:39 2009
@@ -32,6 +32,7 @@
private static class DenseRAMFile extends RAMFile {
private long capacity = 0;
private HashMap singleBuffers = new HashMap();
+ @Override
byte[] newBuffer(int size) {
capacity += size;
if (capacity <= MAX_VALUE) {
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/TestLock.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/TestLock.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/TestLock.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/TestLock.java Thu Nov 5 01:55:39 2009
@@ -38,13 +38,16 @@
private class LockMock extends Lock {
public int lockAttempts;
+ @Override
public boolean obtain() {
lockAttempts++;
return false;
}
+ @Override
public void release() {
// do nothing
}
+ @Override
public boolean isLocked() {
return false;
}
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/TestLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/TestLockFactory.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/TestLockFactory.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/TestLockFactory.java Thu Nov 5 01:55:39 2009
@@ -242,6 +242,7 @@
this.numIteration = numIteration;
this.dir = dir;
}
+ @Override
public void run() {
WhitespaceAnalyzer analyzer = new WhitespaceAnalyzer();
IndexWriter writer = null;
@@ -299,6 +300,7 @@
this.numIteration = numIteration;
this.dir = dir;
}
+ @Override
public void run() {
IndexSearcher searcher = null;
Query query = new TermQuery(new Term("content", "aaa"));
@@ -342,11 +344,13 @@
public Map locksCreated = Collections.synchronizedMap(new HashMap());
public int makeLockCount = 0;
+ @Override
public void setLockPrefix(String lockPrefix) {
super.setLockPrefix(lockPrefix);
lockPrefixSet = true;
}
+ @Override
synchronized public Lock makeLock(String lockName) {
Lock lock = new MockLock();
locksCreated.put(lockName, lock);
@@ -354,18 +358,22 @@
return lock;
}
+ @Override
public void clearLock(String specificLockName) {}
public class MockLock extends Lock {
public int lockAttempts;
+ @Override
public boolean obtain() {
lockAttempts++;
return true;
}
+ @Override
public void release() {
// do nothing
}
+ @Override
public boolean isLocked() {
return false;
}
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/TestRAMDirectory.java Thu Nov 5 01:55:39 2009
@@ -46,6 +46,7 @@
private final int docsToAdd = 500;
// setup the index
+ @Override
public void setUp () throws Exception {
super.setUp();
String tempDir = System.getProperty("java.io.tmpdir");
@@ -114,6 +115,7 @@
for (int i=0; i<numThreads; i++) {
final int num = i;
threads[i] = new Thread(){
+ @Override
public void run() {
for (int j=1; j<docsPerThread; j++) {
Document doc = new Document();
@@ -153,6 +155,7 @@
assertTrue("contains more then just header", headerSize < bos.size());
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
// cleanup
Modified: lucene/java/trunk/src/test/org/apache/lucene/store/TestWindowsMMap.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/store/TestWindowsMMap.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/store/TestWindowsMMap.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/store/TestWindowsMMap.java Thu Nov 5 01:55:39 2009
@@ -30,60 +30,61 @@
import org.apache.lucene.search.IndexSearcher;
public class TestWindowsMMap extends LuceneTestCase {
-
- private final static String alphabet = "abcdefghijklmnopqrstuvwzyz";
- private Random random;
-
- public void setUp() throws Exception {
- super.setUp();
- random = newRandom();
- }
-
- private String randomToken() {
- int tl = 1 + random.nextInt(7);
- StringBuilder sb = new StringBuilder();
- for(int cx = 0; cx < tl; cx ++) {
- int c = random.nextInt(25);
- sb.append(alphabet.substring(c, c+1));
- }
- return sb.toString();
- }
-
- private String randomField() {
- int fl = 1 + random.nextInt(3);
- StringBuilder fb = new StringBuilder();
- for(int fx = 0; fx < fl; fx ++) {
- fb.append(randomToken());
- fb.append(" ");
- }
- return fb.toString();
- }
-
- private final static String storePathname =
+
+ private final static String alphabet = "abcdefghijklmnopqrstuvwzyz";
+ private Random random;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ random = newRandom();
+ }
+
+ private String randomToken() {
+ int tl = 1 + random.nextInt(7);
+ StringBuilder sb = new StringBuilder();
+ for(int cx = 0; cx < tl; cx ++) {
+ int c = random.nextInt(25);
+ sb.append(alphabet.substring(c, c+1));
+ }
+ return sb.toString();
+ }
+
+ private String randomField() {
+ int fl = 1 + random.nextInt(3);
+ StringBuilder fb = new StringBuilder();
+ for(int fx = 0; fx < fl; fx ++) {
+ fb.append(randomToken());
+ fb.append(" ");
+ }
+ return fb.toString();
+ }
+
+ private final static String storePathname =
new File(System.getProperty("tempDir"),"testLuceneMmap").getAbsolutePath();
- public void testMmapIndex() throws Exception {
- FSDirectory storeDirectory;
- storeDirectory = new MMapDirectory(new File(storePathname), null);
+ public void testMmapIndex() throws Exception {
+ FSDirectory storeDirectory;
+ storeDirectory = new MMapDirectory(new File(storePathname), null);
- // plan to add a set of useful stopwords, consider changing some of the
- // interior filters.
- StandardAnalyzer analyzer = new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT, Collections.emptySet());
- // TODO: something about lock timeouts and leftover locks.
- IndexWriter writer = new IndexWriter(storeDirectory, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
- IndexSearcher searcher = new IndexSearcher(storeDirectory, true);
-
- for(int dx = 0; dx < 1000; dx ++) {
- String f = randomField();
- Document doc = new Document();
- doc.add(new Field("data", f, Field.Store.YES, Field.Index.ANALYZED));
- writer.addDocument(doc);
- }
-
- searcher.close();
- writer.close();
+ // plan to add a set of useful stopwords, consider changing some of the
+ // interior filters.
+ StandardAnalyzer analyzer = new StandardAnalyzer(org.apache.lucene.util.Version.LUCENE_CURRENT, Collections.emptySet());
+ // TODO: something about lock timeouts and leftover locks.
+ IndexWriter writer = new IndexWriter(storeDirectory, analyzer, true, IndexWriter.MaxFieldLength.LIMITED);
+ IndexSearcher searcher = new IndexSearcher(storeDirectory, true);
+
+ for(int dx = 0; dx < 1000; dx ++) {
+ String f = randomField();
+ Document doc = new Document();
+ doc.add(new Field("data", f, Field.Store.YES, Field.Index.ANALYZED));
+ writer.addDocument(doc);
+ }
+
+ searcher.close();
+ writer.close();
rmDir(new File(storePathname));
- }
+ }
private void rmDir(File dir) {
File[] files = dir.listFiles();
Modified: lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java Thu Nov 5 01:55:39 2009
@@ -58,6 +58,7 @@
super(name);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
ConcurrentMergeScheduler.setTestMode();
@@ -81,6 +82,7 @@
return getClass().getName() + "." + getName();
}
+ @Override
protected void tearDown() throws Exception {
try {
// this isn't as useful as calling directly from the scope where the
Modified: lucene/java/trunk/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java Thu Nov 5 01:55:39 2009
@@ -43,6 +43,7 @@
}
public class InitValueThreadLocal extends CloseableThreadLocal {
+ @Override
protected Object initialValue() {
return TEST_VALUE;
}
Modified: lucene/java/trunk/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java Thu Nov 5 01:55:39 2009
@@ -38,6 +38,7 @@
private static final int NUM_DOCS = 1000;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -76,6 +77,7 @@
readerX = new MultiReader(new IndexReader[] { readerA, readerB });
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
readerA.close();
Modified: lucene/java/trunk/src/test/org/apache/lucene/util/TestPriorityQueue.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/TestPriorityQueue.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/TestPriorityQueue.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/TestPriorityQueue.java Thu Nov 5 01:55:39 2009
@@ -30,6 +30,7 @@
initialize(count);
}
+ @Override
protected boolean lessThan(Integer a, Integer b) {
return (a < b);
}
Modified: lucene/java/trunk/src/test/org/apache/lucene/util/TestStringIntern.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/TestStringIntern.java?rev=832972&r1=832971&r2=832972&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/TestStringIntern.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/TestStringIntern.java Thu Nov 5 01:55:39 2009
@@ -57,6 +57,7 @@
for (int i=0; i<nThreads; i++) {
final int seed = i;
threads[i] = new Thread() {
+ @Override
public void run() {
Random rand = new Random(seed);
String[] myInterned = new String[testStrings.length];