You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/09/13 19:37:26 UTC
svn commit: r996611 [2/3] - in /lucene/dev/trunk:
lucene/contrib/ant/src/test/org/apache/lucene/ant/
lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/
lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/
lucen...
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDoc.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDoc.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDoc.java Mon Sep 13 17:37:20 2010
@@ -58,7 +58,7 @@ public class TestDoc extends LuceneTestC
* a few text files created in the current working directory.
*/
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
workDir = new File(TEMP_DIR,"TestDoc");
workDir.mkdirs();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestDocumentWriter.java Mon Sep 13 17:37:20 2010
@@ -42,19 +42,15 @@ import org.apache.lucene.util.BytesRef;
public class TestDocumentWriter extends LuceneTestCase {
private Directory dir;
-
- public TestDocumentWriter(String s) {
- super(s);
- }
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
dir.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldInfos.java Mon Sep 13 17:37:20 2010
@@ -30,12 +30,8 @@ public class TestFieldInfos extends Luce
private Document testDoc = new Document();
- public TestFieldInfos(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
DocHelper.setupDoc(testDoc);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java Mon Sep 13 17:37:20 2010
@@ -48,12 +48,8 @@ public class TestFieldsReader extends Lu
private FieldInfos fieldInfos = null;
private final static String TEST_SEGMENT_NAME = "_0";
- public TestFieldsReader(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
fieldInfos = new FieldInfos();
DocHelper.setupDoc(testDoc);
@@ -68,7 +64,7 @@ public class TestFieldsReader extends Lu
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
dir.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexCommit.java Mon Sep 13 17:37:20 2010
@@ -24,10 +24,10 @@ import java.util.Collection;
import java.util.Map;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
-public class TestIndexCommit extends LuceneTestCaseJ4 {
+public class TestIndexCommit extends LuceneTestCase {
@Test
public void testEqualsHashCode() throws Exception {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Mon Sep 13 17:37:20 2010
@@ -30,9 +30,6 @@ import java.util.HashMap;
import java.util.Set;
import java.util.SortedSet;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -61,18 +58,6 @@ import org.apache.lucene.util.Bits;
public class TestIndexReader extends LuceneTestCase
{
- /** Main for running test case by itself. */
- public static void main(String args[]) {
- TestRunner.run (new TestSuite(TestIndexReader.class));
-// TestRunner.run (new TestIndexReader("testBasicDelete"));
-// TestRunner.run (new TestIndexReader("testDeleteReaderWriterConflict"));
-// TestRunner.run (new TestIndexReader("testDeleteReaderReaderConflict"));
-// TestRunner.run (new TestIndexReader("testFilesOpenClose"));
- }
-
- public TestIndexReader(String name) {
- super(name);
- }
public void testCommitUserData() throws Exception {
Directory d = newDirectory();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java Mon Sep 13 17:37:20 2010
@@ -65,12 +65,8 @@ public class TestIndexReaderCloneNorms e
private float normDelta = (float) 0.001;
- public TestIndexReaderCloneNorms(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
similarityOne = new SimilarityOne();
anlzr = new MockAnalyzer();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexReaderReopen.java Mon Sep 13 17:37:20 2010
@@ -45,7 +45,7 @@ import org.apache.lucene.store.AlreadyCl
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.BitVector;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
public class TestIndexReaderReopen extends LuceneTestCase {
@@ -947,7 +947,7 @@ public class TestIndexReaderReopen exten
public static void createIndex(Random random, Directory dir, boolean multiSegment) throws IOException {
IndexWriter.unlock(dir);
- IndexWriter w = new IndexWriter(dir, LuceneTestCaseJ4.newIndexWriterConfig(random,
+ IndexWriter w = new IndexWriter(dir, LuceneTestCase.newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setMergePolicy(new LogDocMergePolicy()));
@@ -1093,7 +1093,7 @@ public class TestIndexReaderReopen exten
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
indexDir = new File(TEMP_DIR, "IndexReaderReopen");
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Mon Sep 13 17:37:20 2010
@@ -79,10 +79,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Bits;
public class TestIndexWriter extends LuceneTestCase {
-
- public TestIndexWriter(String name) {
- super(name);
- }
public void testDocCount() throws IOException {
Directory dir = newDirectory();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Mon Sep 13 17:37:20 2010
@@ -34,10 +34,10 @@ import org.apache.lucene.index.codecs.Co
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.Similarity;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
-public class TestIndexWriterConfig extends LuceneTestCaseJ4 {
+public class TestIndexWriterConfig extends LuceneTestCase {
private static final class MySimilarity extends DefaultSimilarity {
// Does not implement anything - used only for type checking on IndexWriterConfig.
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java Mon Sep 13 17:37:20 2010
@@ -36,7 +36,7 @@ public class TestIndexWriterLockRelease
private java.io.File __test_dir;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
if (this.__test_dir == null) {
this.__test_dir = new File(TEMP_DIR, "testIndexWriter");
@@ -53,7 +53,7 @@ public class TestIndexWriterLockRelease
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
if (this.__test_dir != null) {
File[] files = this.__test_dir.listFiles();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Mon Sep 13 17:37:20 2010
@@ -38,7 +38,7 @@ import org.apache.lucene.store.MockDirec
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ThreadInterruptedException;
@@ -484,7 +484,7 @@ public class TestIndexWriterReader exten
public static void createIndex(Random random, Directory dir1, String indexName,
boolean multiSegment) throws IOException {
- IndexWriter w = new IndexWriter(dir1, LuceneTestCaseJ4.newIndexWriterConfig(random,
+ IndexWriter w = new IndexWriter(dir1, LuceneTestCase.newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer())
.setMergePolicy(new LogDocMergePolicy()));
for (int i = 0; i < 100; i++) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIsCurrent.java Mon Sep 13 17:37:20 2010
@@ -29,7 +29,7 @@ import org.junit.Test;
import java.io.IOException;
-public class TestIsCurrent extends LuceneTestCaseJ4 {
+public class TestIsCurrent extends LuceneTestCase {
private RandomIndexWriter writer;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiReader.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiReader.java Mon Sep 13 17:37:20 2010
@@ -20,9 +20,6 @@ package org.apache.lucene.index;
import java.io.IOException;
public class TestMultiReader extends TestDirectoryReader {
- public TestMultiReader(String s) {
- super(s);
- }
@Override
protected IndexReader openReader() throws IOException {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java Mon Sep 13 17:37:20 2010
@@ -31,10 +31,10 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
-public class TestNoDeletionPolicy extends LuceneTestCaseJ4 {
+public class TestNoDeletionPolicy extends LuceneTestCase {
@Test
public void testNoDeletionPolicy() throws Exception {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java Mon Sep 13 17:37:20 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
-public class TestNoMergePolicy extends LuceneTestCaseJ4 {
+public class TestNoMergePolicy extends LuceneTestCase {
@Test
public void testNoMergePolicy() throws Exception {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergeScheduler.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergeScheduler.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergeScheduler.java Mon Sep 13 17:37:20 2010
@@ -24,10 +24,10 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
-public class TestNoMergeScheduler extends LuceneTestCaseJ4 {
+public class TestNoMergeScheduler extends LuceneTestCase {
@Test
public void testNoMergeScheduler() throws Exception {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java Mon Sep 13 17:37:20 2010
@@ -56,12 +56,8 @@ public class TestNorms extends LuceneTes
private float lastNorm = 0;
private float normDelta = (float) 0.001;
- public TestNorms(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
similarityOne = new SimilarityOne();
anlzr = new MockAnalyzer();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java Mon Sep 13 17:37:20 2010
@@ -42,14 +42,14 @@ public class TestParallelReader extends
private Directory dir, dir1, dir2;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
single = single(random);
parallel = parallel(random);
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
single.getIndexReader().close();
parallel.getIndexReader().close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java Mon Sep 13 17:37:20 2010
@@ -35,7 +35,7 @@ public class TestParallelTermEnum extend
private Directory rd2;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
Document doc;
rd1 = newDirectory();
@@ -68,7 +68,7 @@ public class TestParallelTermEnum extend
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
ir1.close();
ir2.close();
rd1.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java Mon Sep 13 17:37:20 2010
@@ -38,10 +38,10 @@ import org.apache.lucene.index.PayloadPr
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
-public class TestPayloadProcessorProvider extends LuceneTestCaseJ4 {
+public class TestPayloadProcessorProvider extends LuceneTestCase {
private static final class PerDirPayloadProcessor extends PayloadProcessorProvider {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPositionBasedTermVectorMapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPositionBasedTermVectorMapper.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPositionBasedTermVectorMapper.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPositionBasedTermVectorMapper.java Mon Sep 13 17:37:20 2010
@@ -28,13 +28,8 @@ public class TestPositionBasedTermVector
protected TermVectorOffsetInfo[][] offsets;
protected int numPositions;
-
- public TestPositionBasedTermVectorMapper(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
tokens = new String[]{"here", "is", "some", "text", "to", "test", "extra"};
thePositions = new int[tokens.length][];
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java Mon Sep 13 17:37:20 2010
@@ -39,14 +39,9 @@ public class TestSegmentMerger extends L
private Directory merge2Dir;
private Document doc2 = new Document();
private SegmentReader reader2 = null;
-
-
- public TestSegmentMerger(String s) {
- super(s);
- }
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
mergedDir = newDirectory();
merge1Dir = newDirectory();
@@ -60,7 +55,7 @@ public class TestSegmentMerger extends L
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
reader1.close();
reader2.close();
mergedDir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java Mon Sep 13 17:37:20 2010
@@ -34,14 +34,10 @@ public class TestSegmentReader extends L
private Directory dir;
private Document testDoc = new Document();
private SegmentReader reader = null;
-
- public TestSegmentReader(String s) {
- super(s);
- }
//TODO: Setup the reader w/ multiple documents
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
DocHelper.setupDoc(testDoc);
@@ -50,7 +46,7 @@ public class TestSegmentReader extends L
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
reader.close();
dir.close();
super.tearDown();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Mon Sep 13 17:37:20 2010
@@ -31,12 +31,8 @@ public class TestSegmentTermDocs extends
private Directory dir;
private SegmentInfo info;
- public TestSegmentTermDocs(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
DocHelper.setupDoc(testDoc);
@@ -44,7 +40,7 @@ public class TestSegmentTermDocs extends
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
dir.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java Mon Sep 13 17:37:20 2010
@@ -19,7 +19,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.KeepOnlyLastCommitDeletionPolicy;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.SnapshotDeletionPolicy;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.ThreadInterruptedException;
import org.apache.lucene.util._TestUtil;
import org.junit.Test;
@@ -29,7 +29,7 @@ import org.junit.Test;
// http://lucenebook.com
//
-public class TestSnapshotDeletionPolicy extends LuceneTestCaseJ4 {
+public class TestSnapshotDeletionPolicy extends LuceneTestCase {
public static final String INDEX_PATH = "test.snapshots";
protected IndexWriterConfig getConfig(Random random, IndexDeletionPolicy dp) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java Mon Sep 13 17:37:20 2010
@@ -22,10 +22,12 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.*;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.*;
+import org.junit.runner.RunWith;
import java.io.File;
-public class TestStressIndexing extends MultiCodecTestCase {
+@RunWith(LuceneTestCase.MultiCodecTestCaseRunner.class)
+public class TestStressIndexing extends LuceneTestCase {
private static abstract class TimedThread extends Thread {
volatile boolean failed;
int count;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Mon Sep 13 17:37:20 2010
@@ -35,8 +35,10 @@ import org.apache.lucene.document.Fielda
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
+import org.junit.runner.RunWith;
-public class TestStressIndexing2 extends MultiCodecTestCase {
+@RunWith(LuceneTestCase.MultiCodecTestCaseRunner.class)
+public class TestStressIndexing2 extends LuceneTestCase {
static int maxFields=4;
static int bigFieldSize=10;
static boolean sameFieldOrder=false;
@@ -236,7 +238,7 @@ public class TestStressIndexing2 extends
public static void indexSerial(Random random, Map<String,Document> docs, Directory dir) throws IOException {
- IndexWriter w = new IndexWriter(dir, LuceneTestCaseJ4.newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter w = new IndexWriter(dir, LuceneTestCase.newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
// index all docs in a single thread
Iterator<Document> iter = docs.values().iterator();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java Mon Sep 13 17:37:20 2010
@@ -48,10 +48,6 @@ public class TestTermVectorsReader exten
private FieldInfos fieldInfos = new FieldInfos();
private static int TERM_FREQ = 3;
- public TestTermVectorsReader(String s) {
- super(s);
- }
-
private class TestToken implements Comparable<TestToken> {
String text;
int pos;
@@ -65,7 +61,7 @@ public class TestTermVectorsReader exten
TestToken[] tokens = new TestToken[testTerms.length * TERM_FREQ];
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
/*
for (int i = 0; i < testFields.length; i++) {
@@ -125,7 +121,7 @@ public class TestTermVectorsReader exten
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
dir.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java Mon Sep 13 17:37:20 2010
@@ -122,7 +122,7 @@ public class TestTransactionRollback ext
*/
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
//Build index, of records 1 to 100, committing after each batch of 10
@@ -144,7 +144,7 @@ public class TestTransactionRollback ext
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
dir.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java Mon Sep 13 17:37:20 2010
@@ -30,7 +30,7 @@ import java.io.IOException;
import static org.junit.Assert.*;
import org.junit.Test;
-public class TestSurrogates extends LuceneTestCaseJ4 {
+public class TestSurrogates extends LuceneTestCase {
private static String makeDifficultRandomUnicodeString(Random r) {
final int end = r.nextInt(20);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflexrw/PreFlexRWCodec.java Mon Sep 13 17:37:20 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.index.codecs.pr
import org.apache.lucene.index.codecs.preflex.PreFlexFields;
import org.apache.lucene.index.codecs.FieldsConsumer;
import org.apache.lucene.index.codecs.FieldsProducer;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
/** Codec, only for testing, that can write and read the
* pre-flex index format.
@@ -63,7 +63,7 @@ public class PreFlexRWCodec extends PreF
//System.out.println(trace[i].getClassName());
if ("merge".equals(trace[i].getMethodName())) {
unicodeSortOrder = false;
- if (LuceneTestCaseJ4.VERBOSE) {
+ if (LuceneTestCase.VERBOSE) {
System.out.println("NOTE: PreFlexRW codec: forcing legacy UTF16 term sort order");
}
break;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/messages/TestNLS.java Mon Sep 13 17:37:20 2010
@@ -19,11 +19,13 @@ package org.apache.lucene.messages;
import java.util.Locale;
-import org.apache.lucene.util.LocalizedTestCase;
+import org.apache.lucene.util.LuceneTestCase;
+import org.junit.runner.RunWith;
/**
*/
-public class TestNLS extends LocalizedTestCase {
+@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
+public class TestNLS extends LuceneTestCase {
public void testMessageLoading() {
Message invalidSyntax = new MessageImpl(
MessagesTestBundle.Q0001E_INVALID_SYNTAX, "XXX");
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java Mon Sep 13 17:37:20 2010
@@ -60,23 +60,17 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.LocalizedTestCase;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.automaton.BasicAutomata;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
import org.apache.lucene.util.automaton.RegExp;
+import org.junit.runner.RunWith;
/**
* Tests QueryParser.
*/
-public class TestQueryParser extends LocalizedTestCase {
-
- public TestQueryParser(String name) {
- super(name, new HashSet<String>(Arrays.asList(
- "testLegacyDateRange", "testDateRange",
- "testCJK", "testNumber", "testFarsiRangeCollating",
- "testLocalDateFormat"
- )));
- }
+@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
+public class TestQueryParser extends LuceneTestCase {
public static Analyzer qpAnalyzer = new QPTestAnalyzer();
@@ -150,7 +144,7 @@ public class TestQueryParser extends Loc
private int originalMaxClauses;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
originalMaxClauses = BooleanQuery.getMaxClauseCount();
}
@@ -1142,7 +1136,7 @@ public class TestQueryParser extends Loc
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
BooleanQuery.setMaxClauseCount(originalMaxClauses);
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Mon Sep 13 17:37:20 2010
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Random;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -34,7 +34,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
-public class BaseTestRangeFilter extends LuceneTestCaseJ4 {
+public class BaseTestRangeFilter extends LuceneTestCase {
public static final boolean F = false;
public static final boolean T = true;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java Mon Sep 13 17:37:20 2010
@@ -24,10 +24,10 @@ import java.io.IOException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
-public class MultiCollectorTest extends LuceneTestCaseJ4 {
+public class MultiCollectorTest extends LuceneTestCase {
private static class DummyCollector extends Collector {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/QueryUtils.java Mon Sep 13 17:37:20 2010
@@ -18,7 +18,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
-import static org.apache.lucene.util.LuceneTestCaseJ4.TEST_VERSION_CURRENT;
+import static org.apache.lucene.util.LuceneTestCase.TEST_VERSION_CURRENT;
/**
* Copyright 2005 Apache Software Foundation
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java Mon Sep 13 17:37:20 2010
@@ -31,7 +31,7 @@ import org.apache.lucene.queryParser.Que
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -42,7 +42,7 @@ import static org.junit.Assert.*;
/** Test BooleanQuery2 against BooleanQuery by overriding the standard query parser.
* This also tests the scoring order of BooleanQuery.
*/
-public class TestBoolean2 extends LuceneTestCaseJ4 {
+public class TestBoolean2 extends LuceneTestCase {
private static IndexSearcher searcher;
private static IndexSearcher bigSearcher;
private static IndexReader reader;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Mon Sep 13 17:37:20 2010
@@ -37,7 +37,7 @@ public class TestBooleanMinShouldMatch e
private IndexSearcher s;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
String[] data = new String [] {
@@ -71,7 +71,7 @@ public class TestBooleanMinShouldMatch e
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
s.close();
r.close();
index.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java Mon Sep 13 17:37:20 2010
@@ -131,7 +131,7 @@ public class TestBooleanOr extends Lucen
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
//
@@ -164,7 +164,7 @@ public class TestBooleanOr extends Lucen
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
searcher.close();
reader.close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java Mon Sep 13 17:37:20 2010
@@ -18,9 +18,6 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.util.LuceneTestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
@@ -37,18 +34,6 @@ import org.apache.lucene.store.Directory
public class TestBooleanPrefixQuery extends LuceneTestCase {
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- public static Test suite() {
- return new TestSuite(TestBooleanPrefixQuery.class);
- }
-
- public TestBooleanPrefixQuery(String name) {
- super(name);
- }
-
private int getCount(IndexReader r, Query q) throws Exception {
if (q instanceof BooleanQuery) {
return ((BooleanQuery) q).getClauses().length;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java Mon Sep 13 17:37:20 2010
@@ -31,11 +31,6 @@ import org.apache.lucene.util.LuceneTest
public class TestBooleanScorer extends LuceneTestCase
{
-
- public TestBooleanScorer(String name) {
- super(name);
- }
-
private static final String FIELD = "category";
public void testMethod() throws Exception {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestComplexExplanations.java Mon Sep 13 17:37:20 2010
@@ -32,7 +32,7 @@ public class TestComplexExplanations ext
* nice with boosts of 0.0
*/
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
searcher.setSimilarity(createQnorm1Similarity());
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Mon Sep 13 17:37:20 2010
@@ -46,7 +46,7 @@ public class TestCustomSearcherSort exte
* Create index and query for test cases.
*/
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
index = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, index);
@@ -74,7 +74,7 @@ public class TestCustomSearcherSort exte
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
reader.close();
index.close();
super.tearDown();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java Mon Sep 13 17:37:20 2010
@@ -35,10 +35,7 @@ import java.io.IOException;
* @version $Revision$
*/
public class TestDateFilter extends LuceneTestCase {
- public TestDateFilter(String name) {
- super(name);
- }
-
+
/**
*
*/
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java Mon Sep 13 17:37:20 2010
@@ -47,7 +47,7 @@ public class TestDateSort extends Lucene
private IndexReader reader;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
// Create an index writer.
directory = newDirectory();
@@ -71,7 +71,7 @@ public class TestDateSort extends Lucene
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
reader.close();
directory.close();
super.tearDown();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Mon Sep 13 17:37:20 2010
@@ -75,7 +75,7 @@ public class TestDisjunctionMaxQuery ext
public IndexSearcher s;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
index = newDirectory();
@@ -150,7 +150,7 @@ public class TestDisjunctionMaxQuery ext
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
s.close();
r.close();
index.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java Mon Sep 13 17:37:20 2010
@@ -32,9 +32,6 @@ import org.apache.lucene.store.Directory
* @version $Revision$
*/
public class TestDocBoost extends LuceneTestCase {
- public TestDocBoost(String name) {
- super(name);
- }
public void testDocBoost() throws Exception {
Directory store = newDirectory();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java Mon Sep 13 17:37:20 2010
@@ -57,7 +57,7 @@ public class TestExplanations extends Lu
new QueryParser(TEST_VERSION_CURRENT, FIELD, new MockAnalyzer());
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
searcher.close();
reader.close();
directory.close();
@@ -65,7 +65,7 @@ public class TestExplanations extends Lu
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random, directory);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java Mon Sep 13 17:37:20 2010
@@ -36,13 +36,9 @@ public class TestFieldCache extends Luce
private static final int NUM_DOCS = 1000 * RANDOM_MULTIPLIER;
private String[] unicodeStrings;
private Directory directory;
-
- public TestFieldCache(String s) {
- super(s);
- }
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random, directory);
@@ -86,7 +82,7 @@ public class TestFieldCache extends Luce
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
reader.close();
directory.close();
super.tearDown();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java Mon Sep 13 17:37:20 2010
@@ -45,7 +45,7 @@ public class TestFilteredQuery extends L
private Filter filter;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter (random, directory);
@@ -97,7 +97,7 @@ public class TestFilteredQuery extends L
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
searcher.close();
reader.close();
directory.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java Mon Sep 13 17:37:20 2010
@@ -38,10 +38,6 @@ import org.apache.lucene.util.OpenBitSet
*/
public class TestFilteredSearch extends LuceneTestCase {
- public TestFilteredSearch(String name) {
- super(name);
- }
-
private static final String FIELD = "category";
public void testFilteredSearch() throws CorruptIndexException, LockObtainFailedException, IOException {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Mon Sep 13 17:37:20 2010
@@ -38,9 +38,6 @@ import java.util.LinkedList;
*
*/
public class TestMultiPhraseQuery extends LuceneTestCase {
- public TestMultiPhraseQuery(String name) {
- super(name);
- }
public void testPhrasePrefix() throws IOException {
Directory indexStore = newDirectory();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java Mon Sep 13 17:37:20 2010
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -42,11 +42,6 @@ import java.util.Set;
*/
public class TestMultiSearcher extends LuceneTestCase
{
-
- public TestMultiSearcher(String name)
- {
- super(name);
- }
/**
* ReturnS a new instance of the concrete MultiSearcher class
@@ -221,7 +216,7 @@ public class TestMultiSearcher extends L
IndexWriter indexWriter=null;
try {
- indexWriter = new IndexWriter(directory, LuceneTestCaseJ4.newIndexWriterConfig(random,
+ indexWriter = new IndexWriter(directory, LuceneTestCase.newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(
create ? OpenMode.CREATE : OpenMode.APPEND));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java Mon Sep 13 17:37:20 2010
@@ -107,7 +107,7 @@ public class TestMultiSearcherRanking ex
* initializes multiSearcher and singleSearcher with the same document set
*/
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
// create MultiSearcher from two seperate searchers
d1 = newDirectory();
@@ -136,7 +136,7 @@ public class TestMultiSearcherRanking ex
Directory d1, d2, d;
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
multiSearcher.close();
singleSearcher.close();
d1.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Mon Sep 13 17:37:20 2010
@@ -46,7 +46,7 @@ public class TestMultiTermConstantScore
static Directory small;
static IndexReader reader;
- void assertEquals(String m, float e, float a) {
+ static public void assertEquals(String m, float e, float a) {
Assert.assertEquals(m, e, a, SCORE_COMP_THRESH);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Mon Sep 13 17:37:20 2010
@@ -34,12 +34,8 @@ public class TestMultiThreadTermVectors
public int numDocs = 100;
public int numThreads = 3;
- public TestMultiThreadTermVectors(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
@@ -56,7 +52,7 @@ public class TestMultiThreadTermVectors
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
directory.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java Mon Sep 13 17:37:20 2010
@@ -33,9 +33,6 @@ import org.apache.lucene.document.Field;
* @version $Revision$
*/
public class TestNot extends LuceneTestCase {
- public TestNot(String name) {
- super(name);
- }
public void testNot() throws Exception {
Directory store = newDirectory();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Mon Sep 13 17:37:20 2010
@@ -29,7 +29,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util._TestUtil;
@@ -38,7 +38,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import static org.junit.Assert.*;
-public class TestNumericRangeQuery32 extends LuceneTestCaseJ4 {
+public class TestNumericRangeQuery32 extends LuceneTestCase {
// distance of entries
private static final int distance = 6666;
// shift the starting of the values to the left, to also have negative values:
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Mon Sep 13 17:37:20 2010
@@ -28,7 +28,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util._TestUtil;
@@ -37,7 +37,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import static org.junit.Assert.*;
-public class TestNumericRangeQuery64 extends LuceneTestCaseJ4 {
+public class TestNumericRangeQuery64 extends LuceneTestCase {
// distance of entries
private static final long distance = 66666L;
// shift the starting of the values to the left, to also have negative values:
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestParallelMultiSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestParallelMultiSearcher.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestParallelMultiSearcher.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestParallelMultiSearcher.java Mon Sep 13 17:37:20 2010
@@ -24,10 +24,6 @@ import java.io.IOException;
*/
public class TestParallelMultiSearcher extends TestMultiSearcher {
- public TestParallelMultiSearcher(String name) {
- super(name);
- }
-
@Override
protected MultiSearcher getMultiSearcherInstance(Searcher[] searchers)
throws IOException {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Mon Sep 13 17:37:20 2010
@@ -35,9 +35,6 @@ import java.util.LinkedList;
* This class tests PhrasePrefixQuery class.
*/
public class TestPhrasePrefixQuery extends LuceneTestCase {
- public TestPhrasePrefixQuery(String name) {
- super(name);
- }
/**
*
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java Mon Sep 13 17:37:20 2010
@@ -91,7 +91,7 @@ public class TestPhraseQuery extends Luc
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
searcher.close();
reader.close();
directory.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Mon Sep 13 17:37:20 2010
@@ -43,7 +43,7 @@ public class TestPrefixInBooleanQuery ex
private IndexSearcher searcher;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java Mon Sep 13 17:37:20 2010
@@ -43,7 +43,7 @@ public class TestPrefixRandom extends Lu
private Directory dir;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir,
@@ -68,7 +68,7 @@ public class TestPrefixRandom extends Lu
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
reader.close();
searcher.close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestQueryTermVector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestQueryTermVector.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestQueryTermVector.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestQueryTermVector.java Mon Sep 13 17:37:20 2010
@@ -23,11 +23,6 @@ import org.apache.lucene.analysis.MockAn
public class TestQueryTermVector extends LuceneTestCase {
-
- public TestQueryTermVector(String s) {
- super(s);
- }
-
public void testConstructor() {
BytesRef [] queryTerm = {new BytesRef("foo"), new BytesRef("bar"), new BytesRef("foo"),
new BytesRef("again"), new BytesRef("foo"), new BytesRef("bar"), new BytesRef("go"),
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java Mon Sep 13 17:37:20 2010
@@ -43,7 +43,7 @@ public class TestRegexpRandom extends Lu
private Directory dir;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir,
@@ -90,7 +90,7 @@ public class TestRegexpRandom extends Lu
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
searcher.close();
reader.close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java Mon Sep 13 17:37:20 2010
@@ -51,7 +51,7 @@ public class TestRegexpRandom2 extends L
private Directory dir;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir,
@@ -85,7 +85,7 @@ public class TestRegexpRandom2 extends L
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
reader.close();
searcher.close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSetNorm.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSetNorm.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSetNorm.java Mon Sep 13 17:37:20 2010
@@ -33,9 +33,6 @@ import org.apache.lucene.store.Directory
* @version $Revision$
*/
public class TestSetNorm extends LuceneTestCase {
- public TestSetNorm(String name) {
- super(name);
- }
public void testSetNorm() throws Exception {
Directory store = newDirectory();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSimilarity.java Mon Sep 13 17:37:20 2010
@@ -36,9 +36,6 @@ import org.apache.lucene.search.Explanat
* @version $Revision$
*/
public class TestSimilarity extends LuceneTestCase {
- public TestSimilarity(String name) {
- super(name);
- }
public static class SimpleSimilarity extends Similarity {
@Override public float lengthNorm(String field, int numTerms) { return 1.0f; }
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java Mon Sep 13 17:37:20 2010
@@ -69,15 +69,6 @@ public class TestSort extends LuceneTest
private Query queryG;
private Sort sort;
- public TestSort (String name) {
- super (name);
- }
-
- public static Test suite() {
- return new TestSuite (TestSort.class);
- }
-
-
// document data:
// the tracer field is used to determine which document was hit
// the contents field is used to search and sort by relevance
@@ -209,7 +200,7 @@ public class TestSort extends LuceneTest
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
full = getFullIndex();
searchX = getXIndex();
@@ -226,7 +217,7 @@ public class TestSort extends LuceneTest
private ArrayList<Directory> dirs = new ArrayList<Directory>();
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
full.reader.close();
searchX.reader.close();
searchY.reader.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java Mon Sep 13 17:37:20 2010
@@ -31,11 +31,6 @@ import org.apache.lucene.util.LuceneTest
public class TestSpanQueryFilter extends LuceneTestCase {
-
- public TestSpanQueryFilter(String s) {
- super(s);
- }
-
public void testFilterWorks() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Mon Sep 13 17:37:20 2010
@@ -33,7 +33,7 @@ import org.junit.BeforeClass;
import static org.junit.Assert.*;
-public class TestSubScorerFreqs extends LuceneTestCaseJ4 {
+public class TestSubScorerFreqs extends LuceneTestCase {
private static Directory dir;
private static IndexSearcher s;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java Mon Sep 13 17:37:20 2010
@@ -45,13 +45,13 @@ public class TestTermRangeQuery extends
private Directory dir;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
dir.close();
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermScorer.java Mon Sep 13 17:37:20 2010
@@ -39,12 +39,8 @@ public class TestTermScorer extends Luce
protected IndexSearcher indexSearcher;
protected IndexReader indexReader;
- public TestTermScorer(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
@@ -62,7 +58,7 @@ public class TestTermScorer extends Luce
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
indexSearcher.close();
indexReader.close();
directory.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java Mon Sep 13 17:37:20 2010
@@ -38,12 +38,8 @@ public class TestTermVectors extends Luc
private IndexReader reader;
private Directory directory;
- public TestTermVectors(String s) {
- super(s);
- }
-
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory, new MockAnalyzer(MockTokenizer.SIMPLE, true));
@@ -79,7 +75,7 @@ public class TestTermVectors extends Luc
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
searcher.close();
reader.close();
directory.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java Mon Sep 13 17:37:20 2010
@@ -55,15 +55,11 @@ public class TestTimeLimitingCollector e
private final String FIELD_NAME = "body";
private Query query;
- public TestTimeLimitingCollector(String name) {
- super(name);
- }
-
/**
* initializes searcher with a document set
*/
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
final String docText[] = {
"docThatNeverMatchesSoWeCanRequireLastDocCollectedToBeGreaterThanZero",
@@ -99,7 +95,7 @@ public class TestTimeLimitingCollector e
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
searcher.close();
reader.close();
directory.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsCollector.java Mon Sep 13 17:37:20 2010
@@ -102,7 +102,7 @@ public class TestTopDocsCollector extend
}
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
// populate an index with 30 documents, this should be enough for the test.
@@ -117,7 +117,7 @@ public class TestTopDocsCollector extend
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
reader.close();
dir.close();
dir = null;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java Mon Sep 13 17:37:20 2010
@@ -26,13 +26,6 @@ import org.apache.lucene.util.LuceneTest
public class TestTopScoreDocCollector extends LuceneTestCase {
- public TestTopScoreDocCollector() {
- }
-
- public TestTopScoreDocCollector(String name) {
- super(name);
- }
-
public void testOutOfOrderCollection() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java Mon Sep 13 17:37:20 2010
@@ -43,7 +43,7 @@ public class TestWildcardRandom extends
private Directory dir;
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir,
@@ -91,7 +91,7 @@ public class TestWildcardRandom extends
}
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
searcher.close();
reader.close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java Mon Sep 13 17:37:20 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.document.Fielda
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.junit.After;
import org.junit.Before;
@@ -35,7 +35,7 @@ import org.junit.Ignore;
* Setup for function tests
*/
@Ignore
-public class FunctionTestSetup extends LuceneTestCaseJ4 {
+public class FunctionTestSetup extends LuceneTestCase {
/**
* Actual score computation order is slightly different than assumptios
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestDocValues.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestDocValues.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/function/TestDocValues.java Mon Sep 13 17:37:20 2010
@@ -17,7 +17,7 @@ package org.apache.lucene.search.functio
* limitations under the License.
*/
-import org.apache.lucene.util.LuceneTestCaseJ4;
+import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTru
/**
* DocValues TestCase
*/
-public class TestDocValues extends LuceneTestCaseJ4 {
+public class TestDocValues extends LuceneTestCase {
@Test
public void testGetMinValue() {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=996611&r1=996610&r2=996611&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java Mon Sep 13 17:37:20 2010
@@ -33,7 +33,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
-import static org.apache.lucene.util.LuceneTestCaseJ4.TEST_VERSION_CURRENT;
+import static org.apache.lucene.util.LuceneTestCase.TEST_VERSION_CURRENT;
import java.io.Reader;
import java.io.IOException;