You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by bi...@apache.org on 2014/02/19 02:38:39 UTC
svn commit: r1569597 [4/10] - in /lucene/dev/trunk:
lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/hunsp...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java Wed Feb 19 01:38:33 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
import static org.apache.lucene.index.TestIndexWriter.assertNoUnreferencedFiles;
@@ -55,7 +55,7 @@ public class TestIndexWriterOnDiskFull e
System.out.println("TEST: pass=" + pass);
}
boolean doAbort = pass == 1;
- long diskFree = _TestUtil.nextInt(random(), 100, 300);
+ long diskFree = TestUtil.nextInt(random(), 100, 300);
while(true) {
if (VERBOSE) {
System.out.println("TEST: cycle: diskFree=" + diskFree);
@@ -112,7 +112,7 @@ public class TestIndexWriterOnDiskFull e
//_TestUtil.syncConcurrentMerges(ms);
- if (_TestUtil.anyFilesExceptWriteLock(dir)) {
+ if (TestUtil.anyFilesExceptWriteLock(dir)) {
assertNoUnreferencedFiles(dir, "after disk full during addDocument");
// Make sure reader can open the index:
@@ -122,7 +122,7 @@ public class TestIndexWriterOnDiskFull e
dir.close();
// Now try again w/ more space:
- diskFree += TEST_NIGHTLY ? _TestUtil.nextInt(random(), 400, 600) : _TestUtil.nextInt(random(), 3000, 5000);
+ diskFree += TEST_NIGHTLY ? TestUtil.nextInt(random(), 400, 600) : TestUtil.nextInt(random(), 3000, 5000);
} else {
//_TestUtil.syncConcurrentMerges(writer);
dir.setMaxSizeInBytes(0);
@@ -156,8 +156,8 @@ public class TestIndexWriterOnDiskFull e
// sum because the merged FST may use array encoding for
// some arcs (which uses more space):
- final String idFormat = _TestUtil.getPostingsFormat("id");
- final String contentFormat = _TestUtil.getPostingsFormat("content");
+ final String idFormat = TestUtil.getPostingsFormat("id");
+ final String contentFormat = TestUtil.getPostingsFormat("content");
assumeFalse("This test cannot run with Memory codec", idFormat.equals("Memory") || contentFormat.equals("Memory"));
int START_COUNT = 57;
@@ -227,7 +227,7 @@ public class TestIndexWriterOnDiskFull e
}
// Start with 100 bytes more than we are currently using:
- long diskFree = diskUsage+_TestUtil.nextInt(random(), 50, 200);
+ long diskFree = diskUsage+ TestUtil.nextInt(random(), 50, 200);
int method = iter;
@@ -355,7 +355,7 @@ public class TestIndexWriterOnDiskFull e
// Make sure all threads from
// ConcurrentMergeScheduler are done
- _TestUtil.syncConcurrentMerges(writer);
+ TestUtil.syncConcurrentMerges(writer);
if (VERBOSE) {
System.out.println(" now test readers");
@@ -442,12 +442,12 @@ public class TestIndexWriterOnDiskFull e
// Wait for all BG threads to finish else
// dir.close() will throw IOException because
// there are still open files
- _TestUtil.syncConcurrentMerges(ms);
+ TestUtil.syncConcurrentMerges(ms);
dir.close();
// Try again with more free space:
- diskFree += TEST_NIGHTLY ? _TestUtil.nextInt(random(), 4000, 8000) : _TestUtil.nextInt(random(), 40000, 80000);
+ diskFree += TEST_NIGHTLY ? TestUtil.nextInt(random(), 4000, 8000) : TestUtil.nextInt(random(), 40000, 80000);
}
}
@@ -514,7 +514,7 @@ public class TestIndexWriterOnDiskFull e
// expected
assertTrue(ftdm.didFail1 || ftdm.didFail2);
}
- _TestUtil.checkIndex(dir);
+ TestUtil.checkIndex(dir);
ftdm.clearDoFail();
w.addDocument(doc);
w.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java Wed Feb 19 01:38:33 2014
@@ -30,7 +30,7 @@ import java.util.List;
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.util.Constants;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
import com.carrotsearch.randomizedtesting.SeedUtils;
/**
@@ -43,7 +43,7 @@ public class TestIndexWriterOnJRECrash e
@Override
public void setUp() throws Exception {
super.setUp();
- tempDir = _TestUtil.getTempDir("jrecrash");
+ tempDir = TestUtil.getTempDir("jrecrash");
tempDir.delete();
tempDir.mkdir();
}
@@ -67,7 +67,7 @@ public class TestIndexWriterOnJRECrash e
// Codec.getDefault().getName().equals("Lucene4x"));
// we are the fork, setup a crashing thread
- final int crashTime = _TestUtil.nextInt(random(), 3000, 4000);
+ final int crashTime = TestUtil.nextInt(random(), 3000, 4000);
Thread t = new Thread() {
@Override
public void run() {
@@ -162,7 +162,7 @@ public class TestIndexWriterOnJRECrash e
// design we don't try to be smart about this case
// since that too risky):
if (SegmentInfos.getLastCommitGeneration(dir) > 1) {
- _TestUtil.checkIndex(dir);
+ TestUtil.checkIndex(dir);
}
dir.close();
return true;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java Wed Feb 19 01:38:33 2014
@@ -28,11 +28,11 @@ import org.apache.lucene.store.MockDirec
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.PrintStreamInfoStream;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestIndexWriterOutOfFileDescriptors extends LuceneTestCase {
public void test() throws Exception {
- MockDirectoryWrapper dir = newMockFSDirectory(_TestUtil.getTempDir("TestIndexWriterOutOfFileDescriptors"));
+ MockDirectoryWrapper dir = newMockFSDirectory(TestUtil.getTempDir("TestIndexWriterOutOfFileDescriptors"));
dir.setPreventDoubleWrite(false);
double rate = random().nextDouble()*0.01;
//System.out.println("rate=" + rate);
@@ -129,7 +129,7 @@ public class TestIndexWriterOutOfFileDes
// it to addIndexes later:
dir.setRandomIOExceptionRateOnOpen(0.0);
r = DirectoryReader.open(dir);
- dirCopy = newMockFSDirectory(_TestUtil.getTempDir("TestIndexWriterOutOfFileDescriptors.copy"));
+ dirCopy = newMockFSDirectory(TestUtil.getTempDir("TestIndexWriterOutOfFileDescriptors.copy"));
Set<String> files = new HashSet<String>();
for (String file : dir.listAll()) {
dir.copy(dirCopy, file, file, IOContext.DEFAULT);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java Wed Feb 19 01:38:33 2014
@@ -41,8 +41,8 @@ import org.apache.lucene.store.RAMDirect
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.ThreadInterruptedException;
-import org.apache.lucene.util._TestUtil;
import org.junit.Test;
public class TestIndexWriterReader extends LuceneTestCase {
@@ -51,11 +51,11 @@ public class TestIndexWriterReader exten
public static int count(Term t, IndexReader r) throws IOException {
int count = 0;
- DocsEnum td = _TestUtil.docs(random(), r,
- t.field(), new BytesRef(t.text()),
- MultiFields.getLiveDocs(r),
- null,
- 0);
+ DocsEnum td = TestUtil.docs(random(), r,
+ t.field(), new BytesRef(t.text()),
+ MultiFields.getLiveDocs(r),
+ null,
+ 0);
if (td != null) {
while (td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
@@ -370,7 +370,7 @@ public class TestIndexWriterReader exten
Directory mainDir = getAssertNoDeletesDirectory(newDirectory());
IndexWriter mainWriter = new IndexWriter(mainDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
- _TestUtil.reduceOpenFiles(mainWriter);
+ TestUtil.reduceOpenFiles(mainWriter);
AddDirectoriesThreads addDirThreads = new AddDirectoriesThreads(numIter, mainWriter);
addDirThreads.launchThreads(numDirs);
@@ -384,7 +384,7 @@ public class TestIndexWriterReader exten
assertTrue(addDirThreads.failures.size() == 0);
- _TestUtil.checkIndex(mainDir);
+ TestUtil.checkIndex(mainDir);
IndexReader reader = DirectoryReader.open(mainDir);
assertEquals(addDirThreads.count.intValue(), reader.numDocs());
@@ -413,7 +413,7 @@ public class TestIndexWriterReader exten
this.mainWriter = mainWriter;
addDir = newDirectory();
IndexWriter writer = new IndexWriter(addDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2));
- _TestUtil.reduceOpenFiles(writer);
+ TestUtil.reduceOpenFiles(writer);
for (int i = 0; i < NUM_INIT_DOCS; i++) {
Document doc = DocHelper.createDocument(i, "addindex", 4);
writer.addDocument(doc);
@@ -659,9 +659,9 @@ public class TestIndexWriterReader exten
// get a reader to put writer into near real-time mode
DirectoryReader r1 = writer.getReader();
- _TestUtil.checkIndex(dir1);
+ TestUtil.checkIndex(dir1);
writer.commit();
- _TestUtil.checkIndex(dir1);
+ TestUtil.checkIndex(dir1);
assertEquals(100, r1.numDocs());
for (int i = 0; i < 10; i++) {
@@ -691,7 +691,7 @@ public class TestIndexWriterReader exten
DirectoryReader r = writer.getReader();
writer.close();
- _TestUtil.checkIndex(dir1);
+ TestUtil.checkIndex(dir1);
// reader should remain usable even after IndexWriter is closed:
assertEquals(100, r.numDocs());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java Wed Feb 19 01:38:33 2014
@@ -40,8 +40,8 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.ThreadInterruptedException;
-import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.LuceneTestCase.Slow;
/**
@@ -228,12 +228,12 @@ public class TestIndexWriterWithThreads
// Quick test to make sure index is not corrupt:
IndexReader reader = DirectoryReader.open(dir);
- DocsEnum tdocs = _TestUtil.docs(random(), reader,
- "field",
- new BytesRef("aaa"),
- MultiFields.getLiveDocs(reader),
- null,
- 0);
+ DocsEnum tdocs = TestUtil.docs(random(), reader,
+ "field",
+ new BytesRef("aaa"),
+ MultiFields.getLiveDocs(reader),
+ null,
+ 0);
int count = 0;
while(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
count++;
@@ -545,7 +545,7 @@ public class TestIndexWriterWithThreads
((MockDirectoryWrapper)d).setPreventDoubleWrite(false);
}
- final int threadCount = _TestUtil.nextInt(random(), 2, 6);
+ final int threadCount = TestUtil.nextInt(random(), 2, 6);
final AtomicReference<IndexWriter> writerRef = new AtomicReference<IndexWriter>();
writerRef.set(new IndexWriter(d, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java Wed Feb 19 01:38:33 2014
@@ -35,7 +35,7 @@ import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestIndexableField extends LuceneTestCase {
@@ -172,7 +172,7 @@ public class TestIndexableField extends
int baseCount = 0;
for(int docCount=0;docCount<NUM_DOCS;docCount++) {
- final int fieldCount = _TestUtil.nextInt(random(), 1, 17);
+ final int fieldCount = TestUtil.nextInt(random(), 1, 17);
fieldsPerDoc[docCount] = fieldCount-1;
final int finalDocCount = docCount;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java Wed Feb 19 01:38:33 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
-import java.io.Reader;
import org.apache.lucene.analysis.*;
import org.apache.lucene.document.Document;
@@ -33,7 +32,7 @@ import org.apache.lucene.store.MockDirec
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
/**
* Tests lazy skipping on the proximity file.
@@ -132,7 +131,7 @@ public class TestLazyProxSkipping extend
}
public void testLazySkipping() throws IOException {
- final String fieldFormat = _TestUtil.getPostingsFormat(this.field);
+ final String fieldFormat = TestUtil.getPostingsFormat(this.field);
assumeFalse("This test cannot run with Memory postings format", fieldFormat.equals("Memory"));
assumeFalse("This test cannot run with Direct postings format", fieldFormat.equals("Direct"));
assumeFalse("This test cannot run with SimpleText postings format", fieldFormat.equals("SimpleText"));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java Wed Feb 19 01:38:33 2014
@@ -33,7 +33,8 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.FixedBitSet;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.TestUtil;
@SuppressCodecs({ "SimpleText", "Memory", "Direct" })
public class TestLongPostings extends LuceneTestCase {
@@ -43,7 +44,7 @@ public class TestLongPostings extends Lu
private String getRandomTerm(String other) throws IOException {
Analyzer a = new MockAnalyzer(random());
while(true) {
- String s = _TestUtil.randomRealisticUnicodeString(random());
+ String s = TestUtil.randomRealisticUnicodeString(random());
if (other != null && s.equals(other)) {
continue;
}
@@ -77,7 +78,7 @@ public class TestLongPostings extends Lu
public void testLongPostings() throws Exception {
// Don't use _TestUtil.getTempDir so that we own the
// randomness (ie same seed will point to same dir):
- Directory dir = newFSDirectory(_TestUtil.getTempDir("longpostings" + "." + random().nextLong()));
+ Directory dir = newFSDirectory(TestUtil.getTempDir("longpostings" + "." + random().nextLong()));
final int NUM_DOCS = atLeast(2000);
@@ -119,7 +120,7 @@ public class TestLongPostings extends Lu
final Document doc = new Document();
String s = isS1.get(idx) ? s1 : s2;
final Field f = newTextField("field", s, Field.Store.NO);
- final int count = _TestUtil.nextInt(random(), 1, 4);
+ final int count = TestUtil.nextInt(random(), 1, 4);
for(int ct=0;ct<count;ct++) {
doc.add(f);
}
@@ -219,7 +220,7 @@ public class TestLongPostings extends Lu
if (docID == -1) {
targetDocID = random().nextInt(NUM_DOCS+1);
} else {
- targetDocID = docID + _TestUtil.nextInt(random(), 1, NUM_DOCS - docID);
+ targetDocID = docID + TestUtil.nextInt(random(), 1, NUM_DOCS - docID);
}
if (VERBOSE) {
System.out.println("TEST: docID=" + docID + "; do advance(" + targetDocID + ")");
@@ -274,7 +275,7 @@ public class TestLongPostings extends Lu
public void doTestLongPostingsNoPositions(IndexOptions options) throws Exception {
// Don't use _TestUtil.getTempDir so that we own the
// randomness (ie same seed will point to same dir):
- Directory dir = newFSDirectory(_TestUtil.getTempDir("longpostings" + "." + random().nextLong()));
+ Directory dir = newFSDirectory(TestUtil.getTempDir("longpostings" + "." + random().nextLong()));
final int NUM_DOCS = atLeast(2000);
@@ -319,7 +320,7 @@ public class TestLongPostings extends Lu
final Document doc = new Document();
String s = isS1.get(idx) ? s1 : s2;
final Field f = newField("field", s, ft);
- final int count = _TestUtil.nextInt(random(), 1, 4);
+ final int count = TestUtil.nextInt(random(), 1, 4);
for(int ct=0;ct<count;ct++) {
doc.add(f);
}
@@ -374,10 +375,10 @@ public class TestLongPostings extends Lu
final DocsEnum postings;
if (options == IndexOptions.DOCS_ONLY) {
- docs = _TestUtil.docs(random(), r, "field", new BytesRef(term), null, null, DocsEnum.FLAG_NONE);
+ docs = TestUtil.docs(random(), r, "field", new BytesRef(term), null, null, DocsEnum.FLAG_NONE);
postings = null;
} else {
- docs = postings = _TestUtil.docs(random(), r, "field", new BytesRef(term), null, null, DocsEnum.FLAG_FREQS);
+ docs = postings = TestUtil.docs(random(), r, "field", new BytesRef(term), null, null, DocsEnum.FLAG_FREQS);
assert postings != null;
}
assert docs != null;
@@ -420,7 +421,7 @@ public class TestLongPostings extends Lu
if (docID == -1) {
targetDocID = random().nextInt(NUM_DOCS+1);
} else {
- targetDocID = docID + _TestUtil.nextInt(random(), 1, NUM_DOCS - docID);
+ targetDocID = docID + TestUtil.nextInt(random(), 1, NUM_DOCS - docID);
}
if (VERBOSE) {
System.out.println("TEST: docID=" + docID + "; do advance(" + targetDocID + ")");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java Wed Feb 19 01:38:33 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.search.similari
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
/**
* Tests the maxTermFrequency statistic in FieldInvertState
@@ -82,10 +82,10 @@ public class TestMaxTermFrequency extend
*/
private String addValue() {
List<String> terms = new ArrayList<String>();
- int maxCeiling = _TestUtil.nextInt(random(), 0, 255);
+ int maxCeiling = TestUtil.nextInt(random(), 0, 255);
int max = 0;
for (char ch = 'a'; ch <= 'z'; ch++) {
- int num = _TestUtil.nextInt(random(), 0, maxCeiling);
+ int num = TestUtil.nextInt(random(), 0, maxCeiling);
for (int i = 0; i < num; i++)
terms.add(Character.toString(ch));
max = Math.max(max, num);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java Wed Feb 19 01:38:33 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestMixedCodecs extends LuceneTestCase {
@@ -56,7 +56,7 @@ public class TestMixedCodecs extends Luc
w.close();
}
w = new RandomIndexWriter(random(), dir, iwc);
- docsLeftInThisSegment = _TestUtil.nextInt(random(), 10, 100);
+ docsLeftInThisSegment = TestUtil.nextInt(random(), 10, 100);
}
final Document doc = new Document();
doc.add(newStringField("id", String.valueOf(docUpto), Field.Store.YES));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java Wed Feb 19 01:38:33 2014
@@ -29,7 +29,8 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.TestUtil;
/** Tests MultiDocValues versus ordinary segment merging */
public class TestMultiDocValues extends LuceneTestCase {
@@ -81,7 +82,7 @@ public class TestMultiDocValues extends
int numDocs = atLeast(500);
for (int i = 0; i < numDocs; i++) {
- ref.copyChars(_TestUtil.randomUnicodeString(random()));
+ ref.copyChars(TestUtil.randomUnicodeString(random()));
iw.addDocument(doc);
if (random().nextInt(17) == 0) {
iw.commit();
@@ -120,7 +121,7 @@ public class TestMultiDocValues extends
int numDocs = atLeast(500);
for (int i = 0; i < numDocs; i++) {
- ref.copyChars(_TestUtil.randomUnicodeString(random()));
+ ref.copyChars(TestUtil.randomUnicodeString(random()));
if (defaultCodecSupportsDocsWithField() && random().nextInt(7) == 0) {
iw.addDocument(new Document());
}
@@ -167,7 +168,7 @@ public class TestMultiDocValues extends
int numDocs = atLeast(500);
for (int i = 0; i < numDocs; i++) {
- ref.copyChars(_TestUtil.randomSimpleString(random(), 2));
+ ref.copyChars(TestUtil.randomSimpleString(random(), 2));
iw.addDocument(doc);
if (random().nextInt(17) == 0) {
iw.commit();
@@ -210,7 +211,7 @@ public class TestMultiDocValues extends
Document doc = new Document();
int numValues = random().nextInt(5);
for (int j = 0; j < numValues; j++) {
- doc.add(new SortedSetDocValuesField("bytes", new BytesRef(_TestUtil.randomUnicodeString(random()))));
+ doc.add(new SortedSetDocValuesField("bytes", new BytesRef(TestUtil.randomUnicodeString(random()))));
}
iw.addDocument(doc);
if (random().nextInt(17) == 0) {
@@ -275,7 +276,7 @@ public class TestMultiDocValues extends
Document doc = new Document();
int numValues = random().nextInt(5);
for (int j = 0; j < numValues; j++) {
- doc.add(new SortedSetDocValuesField("bytes", new BytesRef(_TestUtil.randomSimpleString(random(), 2))));
+ doc.add(new SortedSetDocValuesField("bytes", new BytesRef(TestUtil.randomSimpleString(random(), 2))));
}
iw.addDocument(doc);
if (random().nextInt(17) == 0) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java Wed Feb 19 01:38:33 2014
@@ -44,7 +44,7 @@ public class TestMultiFields extends Luc
Set<Integer> deleted = new HashSet<Integer>();
List<BytesRef> terms = new ArrayList<BytesRef>();
- int numDocs = _TestUtil.nextInt(random(), 1, 100 * RANDOM_MULTIPLIER);
+ int numDocs = TestUtil.nextInt(random(), 1, 100 * RANDOM_MULTIPLIER);
Document doc = new Document();
Field f = newStringField("field", "", Field.Store.NO);
doc.add(f);
@@ -64,7 +64,7 @@ public class TestMultiFields extends Luc
docs.get(term).add(i);
f.setStringValue(term.utf8ToString());
} else {
- String s = _TestUtil.randomUnicodeString(random(), 10);
+ String s = TestUtil.randomUnicodeString(random(), 10);
BytesRef term = new BytesRef(s);
if (!docs.containsKey(term)) {
docs.put(term, new ArrayList<Integer>());
@@ -122,7 +122,7 @@ public class TestMultiFields extends Luc
System.out.println("TEST: seek term="+ UnicodeUtil.toHexString(term.utf8ToString()) + " " + term);
}
- DocsEnum docsEnum = _TestUtil.docs(random(), reader, "field", term, liveDocs, null, DocsEnum.FLAG_NONE);
+ DocsEnum docsEnum = TestUtil.docs(random(), reader, "field", term, liveDocs, null, DocsEnum.FLAG_NONE);
assertNotNull(docsEnum);
for(int docID : docs.get(term)) {
@@ -163,8 +163,8 @@ public class TestMultiFields extends Luc
w.addDocument(d);
IndexReader r = w.getReader();
w.close();
- DocsEnum d1 = _TestUtil.docs(random(), r, "f", new BytesRef("j"), null, null, DocsEnum.FLAG_NONE);
- DocsEnum d2 = _TestUtil.docs(random(), r, "f", new BytesRef("j"), null, null, DocsEnum.FLAG_NONE);
+ DocsEnum d1 = TestUtil.docs(random(), r, "f", new BytesRef("j"), null, null, DocsEnum.FLAG_NONE);
+ DocsEnum d2 = TestUtil.docs(random(), r, "f", new BytesRef("j"), null, null, DocsEnum.FLAG_NONE);
assertEquals(0, d1.nextDoc());
assertEquals(0, d2.nextDoc());
r.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java Wed Feb 19 01:38:33 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
-import java.io.Reader;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.analysis.*;
@@ -33,7 +32,7 @@ import org.apache.lucene.store.MockDirec
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
import org.junit.Before;
/**
@@ -69,7 +68,7 @@ public class TestMultiLevelSkipList exte
public void testSimpleSkip() throws IOException {
Directory dir = new CountingRAMDirectory(new RAMDirectory());
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new PayloadAnalyzer()).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat())).setMergePolicy(newLogMergePolicy()));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new PayloadAnalyzer()).setCodec(TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat())).setMergePolicy(newLogMergePolicy()));
Term term = new Term("test", "a");
for (int i = 0; i < 5000; i++) {
Document d1 = new Document();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java Wed Feb 19 01:38:33 2014
@@ -27,7 +27,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
// Make sure if you use NoDeletionPolicy that no file
// referenced by a commit point is ever deleted
@@ -35,7 +35,7 @@ import org.apache.lucene.util._TestUtil;
public class TestNeverDelete extends LuceneTestCase {
public void testIndexing() throws Exception {
- final File tmpDir = _TestUtil.getTempDir("TestNeverDelete");
+ final File tmpDir = TestUtil.getTempDir("TestNeverDelete");
final BaseDirectoryWrapper d = newFSDirectory(tmpDir);
// We want to "see" files removed if Lucene removed
@@ -49,7 +49,7 @@ public class TestNeverDelete extends Luc
newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random()))
.setIndexDeletionPolicy(NoDeletionPolicy.INSTANCE));
- w.w.getConfig().setMaxBufferedDocs(_TestUtil.nextInt(random(), 5, 30));
+ w.w.getConfig().setMaxBufferedDocs(TestUtil.nextInt(random(), 5, 30));
w.commit();
Thread[] indexThreads = new Thread[random().nextInt(4)];
@@ -108,6 +108,6 @@ public class TestNeverDelete extends Luc
w.close();
d.close();
- _TestUtil.rmDir(tmpDir);
+ TestUtil.rmDir(tmpDir);
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java Wed Feb 19 01:38:33 2014
@@ -36,7 +36,7 @@ import org.apache.lucene.util.LineFileDo
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
/**
* Test that norms info is preserved during index life - including
@@ -107,7 +107,7 @@ public class TestNorms extends LuceneTes
}
public void testMaxByteNorms() throws IOException {
- Directory dir = newFSDirectory(_TestUtil.getTempDir("TestNorms.testMaxByteNorms"));
+ Directory dir = newFSDirectory(TestUtil.getTempDir("TestNorms.testMaxByteNorms"));
buildIndex(dir);
AtomicReader open = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
NumericDocValues normValues = open.getNormValues(byteTestField);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java Wed Feb 19 01:38:33 2014
@@ -32,7 +32,8 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.TestUtil;
import org.junit.Test;
import com.carrotsearch.randomizedtesting.generators.RandomPicks;
@@ -981,7 +982,7 @@ public class TestNumericDocValuesUpdates
final IndexWriter writer = new IndexWriter(dir, conf);
// create index
- final int numThreads = _TestUtil.nextInt(random(), 3, 6);
+ final int numThreads = TestUtil.nextInt(random(), 3, 6);
final int numDocs = atLeast(2000);
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
@@ -1200,10 +1201,10 @@ public class TestNumericDocValuesUpdates
IndexWriter writer = new IndexWriter(dir1, conf);
final int numDocs = atLeast(50);
- final int numTerms = _TestUtil.nextInt(random(), 1, numDocs / 5);
+ final int numTerms = TestUtil.nextInt(random(), 1, numDocs / 5);
Set<String> randomTerms = new HashSet<String>();
while (randomTerms.size() < numTerms) {
- randomTerms.add(_TestUtil.randomSimpleString(random()));
+ randomTerms.add(TestUtil.randomSimpleString(random()));
}
// create first index
@@ -1298,10 +1299,10 @@ public class TestNumericDocValuesUpdates
// test data: lots of documents (few 10Ks) and lots of update terms (few hundreds)
final int numDocs = atLeast(20000);
final int numNumericFields = atLeast(5);
- final int numTerms = _TestUtil.nextInt(random, 10, 100); // terms should affect many docs
+ final int numTerms = TestUtil.nextInt(random, 10, 100); // terms should affect many docs
Set<String> updateTerms = new HashSet<String>();
while (updateTerms.size() < numTerms) {
- updateTerms.add(_TestUtil.randomSimpleString(random));
+ updateTerms.add(TestUtil.randomSimpleString(random));
}
// System.out.println("numDocs=" + numDocs + " numNumericFields=" + numNumericFields + " numTerms=" + numTerms);
@@ -1309,7 +1310,7 @@ public class TestNumericDocValuesUpdates
// build a large index with many NDV fields and update terms
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- int numUpdateTerms = _TestUtil.nextInt(random, 1, numTerms / 10);
+ int numUpdateTerms = TestUtil.nextInt(random, 1, numTerms / 10);
for (int j = 0; j < numUpdateTerms; j++) {
doc.add(new StringField("upd", RandomPicks.randomFrom(random, updateTerms), Store.NO));
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java Wed Feb 19 01:38:33 2014
@@ -27,7 +27,7 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestOmitNorms extends LuceneTestCase {
// Tests whether the DocumentWriter correctly enable the
@@ -281,7 +281,7 @@ public class TestOmitNorms extends Lucen
riw.addDocument(d);
// add a mix of f1's and f2's
- int numExtraDocs = _TestUtil.nextInt(random(), 1, 1000);
+ int numExtraDocs = TestUtil.nextInt(random(), 1, 1000);
for (int i = 0; i < numExtraDocs; i++) {
d = new Document();
d.add(random().nextBoolean() ? f1 : f2);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java Wed Feb 19 01:38:33 2014
@@ -28,7 +28,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
/**
*
@@ -53,7 +53,7 @@ public class TestOmitPositions extends L
assertNull(MultiFields.getTermPositionsEnum(reader, null, "foo", new BytesRef("test")));
- DocsEnum de = _TestUtil.docs(random(), reader, "foo", new BytesRef("test"), null, null, DocsEnum.FLAG_FREQS);
+ DocsEnum de = TestUtil.docs(random(), reader, "foo", new BytesRef("test"), null, null, DocsEnum.FLAG_FREQS);
while (de.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
assertEquals(2, de.freq());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java Wed Feb 19 01:38:33 2014
@@ -28,7 +28,7 @@ import org.apache.lucene.search.*;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestParallelAtomicReader extends LuceneTestCase {
@@ -287,7 +287,7 @@ public class TestParallelAtomicReader ex
ParallelAtomicReader pr = new ParallelAtomicReader(
SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir1)),
SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir2)));
- _TestUtil.checkReader(pr);
+ TestUtil.checkReader(pr);
return newSearcher(pr);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java Wed Feb 19 01:38:33 2014
@@ -28,7 +28,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestParallelTermEnum extends LuceneTestCase {
private AtomicReader ir1;
@@ -82,7 +82,7 @@ public class TestParallelTermEnum extend
BytesRef b = te.next();
assertNotNull(b);
assertEquals(t, b.utf8ToString());
- DocsEnum td = _TestUtil.docs(random(), te, liveDocs, null, DocsEnum.FLAG_NONE);
+ DocsEnum td = TestUtil.docs(random(), te, liveDocs, null, DocsEnum.FLAG_NONE);
assertTrue(td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(0, td.docID());
assertEquals(td.nextDoc(), DocIdSetIterator.NO_MORE_DOCS);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java Wed Feb 19 01:38:33 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
-import java.io.Reader;
import java.io.StringReader;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -38,7 +37,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestPayloads extends LuceneTestCase {
@@ -301,7 +300,7 @@ public class TestPayloads extends Lucene
static final Charset utf8 = Charset.forName("UTF-8");
private void generateRandomData(byte[] data) {
// this test needs the random data to be valid unicode
- String s = _TestUtil.randomFixedByteLengthUnicodeString(random(), data.length);
+ String s = TestUtil.randomFixedByteLengthUnicodeString(random(), data.length);
byte b[] = s.getBytes(utf8);
assert b.length == data.length;
System.arraycopy(b, 0, data, 0, b.length);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java Wed Feb 19 01:38:33 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.index.MergePolicy.MergeTrigger;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -33,7 +32,7 @@ import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestPerSegmentDeletes extends LuceneTestCase {
public void testDeletes1() throws Exception {
@@ -228,7 +227,7 @@ public class TestPerSegmentDeletes exten
Terms cterms = fields.terms(term.field);
TermsEnum ctermsEnum = cterms.iterator(null);
if (ctermsEnum.seekExact(new BytesRef(term.text()))) {
- DocsEnum docsEnum = _TestUtil.docs(random(), ctermsEnum, bits, null, DocsEnum.FLAG_NONE);
+ DocsEnum docsEnum = TestUtil.docs(random(), ctermsEnum, bits, null, DocsEnum.FLAG_NONE);
return toArray(docsEnum);
}
return null;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Wed Feb 19 01:38:33 2014
@@ -44,7 +44,7 @@ import org.apache.lucene.util.English;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
// TODO: we really need to test indexingoffsets, but then getting only docs / docs + freqs.
// not all codecs store prx separate...
@@ -183,7 +183,7 @@ public class TestPostingsOffsets extends
int numSkippingTests = atLeast(50);
for (int j = 0; j < numSkippingTests; j++) {
- int num = _TestUtil.nextInt(random(), 100, Math.min(numDocs-1, 999));
+ int num = TestUtil.nextInt(random(), 100, Math.min(numDocs - 1, 999));
DocsAndPositionsEnum dp = MultiFields.getTermPositionsEnum(reader, null, "numbers", new BytesRef("hundred"));
int doc = dp.advance(num);
assertEquals(num, doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java Wed Feb 19 01:38:33 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -26,7 +25,7 @@ import java.util.TreeSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.MergedIterator;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestPrefixCodedTerms extends LuceneTestCase {
@@ -50,7 +49,7 @@ public class TestPrefixCodedTerms extend
Set<Term> terms = new TreeSet<Term>();
int nterms = atLeast(10000);
for (int i = 0; i < nterms; i++) {
- Term term = new Term(_TestUtil.randomUnicodeString(random(), 2), _TestUtil.randomUnicodeString(random()));
+ Term term = new Term(TestUtil.randomUnicodeString(random(), 2), TestUtil.randomUnicodeString(random()));
terms.add(term);
}
@@ -89,14 +88,14 @@ public class TestPrefixCodedTerms extend
@SuppressWarnings({"unchecked","rawtypes"})
public void testMergeRandom() {
- PrefixCodedTerms pb[] = new PrefixCodedTerms[_TestUtil.nextInt(random(), 2, 10)];
+ PrefixCodedTerms pb[] = new PrefixCodedTerms[TestUtil.nextInt(random(), 2, 10)];
Set<Term> superSet = new TreeSet<Term>();
for (int i = 0; i < pb.length; i++) {
Set<Term> terms = new TreeSet<Term>();
- int nterms = _TestUtil.nextInt(random(), 0, 10000);
+ int nterms = TestUtil.nextInt(random(), 0, 10000);
for (int j = 0; j < nterms; j++) {
- Term term = new Term(_TestUtil.randomUnicodeString(random(), 2), _TestUtil.randomUnicodeString(random(), 4));
+ Term term = new Term(TestUtil.randomUnicodeString(random(), 2), TestUtil.randomUnicodeString(random(), 4));
terms.add(term);
}
superSet.addAll(terms);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java Wed Feb 19 01:38:33 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.search.TermRang
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestReaderClosed extends LuceneTestCase {
private IndexReader reader;
@@ -38,7 +38,7 @@ public class TestReaderClosed extends Lu
dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false))
- .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
+ .setMaxBufferedDocs(TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
Field field = newStringField("field", "", Field.Store.NO);
@@ -48,7 +48,7 @@ public class TestReaderClosed extends Lu
// but for preflex codec, the test can be very slow, so use less iterations.
int num = atLeast(10);
for (int i = 0; i < num; i++) {
- field.setStringValue(_TestUtil.randomUnicodeString(random(), 10));
+ field.setStringValue(TestUtil.randomUnicodeString(random(), 10));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java Wed Feb 19 01:38:33 2014
@@ -43,7 +43,7 @@ public class TestRollingUpdates extends
//provider.register(new MemoryCodec());
if (random().nextBoolean()) {
- Codec.setDefault(_TestUtil.alwaysPostingsFormat(new MemoryPostingsFormat(random().nextBoolean(), random.nextFloat())));
+ Codec.setDefault(TestUtil.alwaysPostingsFormat(new MemoryPostingsFormat(random().nextBoolean(), random.nextFloat())));
}
final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
@@ -160,7 +160,7 @@ public class TestRollingUpdates extends
final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2));
final int numUpdates = atLeast(20);
- int numThreads = _TestUtil.nextInt(random(), 2, 6);
+ int numThreads = TestUtil.nextInt(random(), 2, 6);
IndexingThread[] threads = new IndexingThread[numThreads];
for (int i = 0; i < numThreads; i++) {
threads[i] = new IndexingThread(docs, w, numUpdates);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java Wed Feb 19 01:38:33 2014
@@ -29,7 +29,8 @@ import org.apache.lucene.util.Constants;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestSegmentMerger extends LuceneTestCase {
//The variables for the new merged segment
@@ -102,12 +103,12 @@ public class TestSegmentMerger extends L
assertTrue(newDoc2 != null);
assertTrue(DocHelper.numFields(newDoc2) == DocHelper.numFields(doc2) - DocHelper.unstored.size());
- DocsEnum termDocs = _TestUtil.docs(random(), mergedReader,
- DocHelper.TEXT_FIELD_2_KEY,
- new BytesRef("field"),
- MultiFields.getLiveDocs(mergedReader),
- null,
- 0);
+ DocsEnum termDocs = TestUtil.docs(random(), mergedReader,
+ DocHelper.TEXT_FIELD_2_KEY,
+ new BytesRef("field"),
+ MultiFields.getLiveDocs(mergedReader),
+ null,
+ 0);
assertTrue(termDocs != null);
assertTrue(termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
@@ -153,8 +154,8 @@ public class TestSegmentMerger extends L
}
public void testBuildDocMap() {
- final int maxDoc = _TestUtil.nextInt(random(), 1, 128);
- final int numDocs = _TestUtil.nextInt(random(), 0, maxDoc);
+ final int maxDoc = TestUtil.nextInt(random(), 1, 128);
+ final int numDocs = TestUtil.nextInt(random(), 0, maxDoc);
final int numDeletedDocs = maxDoc - numDocs;
final FixedBitSet liveDocs = new FixedBitSet(maxDoc);
for (int i = 0; i < numDocs; ++i) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java Wed Feb 19 01:38:33 2014
@@ -28,8 +28,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
-import org.junit.Assume;
+import org.apache.lucene.util.TestUtil;
public class TestSegmentReader extends LuceneTestCase {
private Directory dir;
@@ -128,20 +127,20 @@ public class TestSegmentReader extends L
}
}
- DocsEnum termDocs = _TestUtil.docs(random(), reader,
- DocHelper.TEXT_FIELD_1_KEY,
- new BytesRef("field"),
- MultiFields.getLiveDocs(reader),
- null,
- 0);
+ DocsEnum termDocs = TestUtil.docs(random(), reader,
+ DocHelper.TEXT_FIELD_1_KEY,
+ new BytesRef("field"),
+ MultiFields.getLiveDocs(reader),
+ null,
+ 0);
assertTrue(termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
- termDocs = _TestUtil.docs(random(), reader,
- DocHelper.NO_NORMS_KEY,
- new BytesRef(DocHelper.NO_NORMS_TEXT),
- MultiFields.getLiveDocs(reader),
- null,
- 0);
+ termDocs = TestUtil.docs(random(), reader,
+ DocHelper.NO_NORMS_KEY,
+ new BytesRef(DocHelper.NO_NORMS_TEXT),
+ MultiFields.getLiveDocs(reader),
+ null,
+ 0);
assertTrue(termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Wed Feb 19 01:38:33 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestSegmentTermDocs extends LuceneTestCase {
private Document testDoc = new Document();
@@ -58,7 +58,7 @@ public class TestSegmentTermDocs extends
TermsEnum terms = reader.fields().terms(DocHelper.TEXT_FIELD_2_KEY).iterator(null);
terms.seekCeil(new BytesRef("field"));
- DocsEnum termDocs = _TestUtil.docs(random(), terms, reader.getLiveDocs(), null, DocsEnum.FLAG_FREQS);
+ DocsEnum termDocs = TestUtil.docs(random(), terms, reader.getLiveDocs(), null, DocsEnum.FLAG_FREQS);
if (termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
int docId = termDocs.docID();
assertTrue(docId == 0);
@@ -73,12 +73,12 @@ public class TestSegmentTermDocs extends
//After adding the document, we should be able to read it back in
SegmentReader reader = new SegmentReader(info, newIOContext(random()));
assertTrue(reader != null);
- DocsEnum termDocs = _TestUtil.docs(random(), reader,
- "textField2",
- new BytesRef("bad"),
- reader.getLiveDocs(),
- null,
- 0);
+ DocsEnum termDocs = TestUtil.docs(random(), reader,
+ "textField2",
+ new BytesRef("bad"),
+ reader.getLiveDocs(),
+ null,
+ 0);
assertNull(termDocs);
reader.close();
@@ -87,12 +87,12 @@ public class TestSegmentTermDocs extends
//After adding the document, we should be able to read it back in
SegmentReader reader = new SegmentReader(info, newIOContext(random()));
assertTrue(reader != null);
- DocsEnum termDocs = _TestUtil.docs(random(), reader,
- "junk",
- new BytesRef("bad"),
- reader.getLiveDocs(),
- null,
- 0);
+ DocsEnum termDocs = TestUtil.docs(random(), reader,
+ "junk",
+ new BytesRef("bad"),
+ reader.getLiveDocs(),
+ null,
+ 0);
assertNull(termDocs);
reader.close();
}
@@ -120,12 +120,12 @@ public class TestSegmentTermDocs extends
IndexReader reader = DirectoryReader.open(dir);
- DocsEnum tdocs = _TestUtil.docs(random(), reader,
- ta.field(),
- new BytesRef(ta.text()),
- MultiFields.getLiveDocs(reader),
- null,
- DocsEnum.FLAG_FREQS);
+ DocsEnum tdocs = TestUtil.docs(random(), reader,
+ ta.field(),
+ new BytesRef(ta.text()),
+ MultiFields.getLiveDocs(reader),
+ null,
+ DocsEnum.FLAG_FREQS);
// without optimization (assumption skipInterval == 16)
@@ -145,12 +145,12 @@ public class TestSegmentTermDocs extends
assertFalse(tdocs.advance(10) != DocIdSetIterator.NO_MORE_DOCS);
// without next
- tdocs = _TestUtil.docs(random(), reader,
- ta.field(),
- new BytesRef(ta.text()),
- MultiFields.getLiveDocs(reader),
- null,
- 0);
+ tdocs = TestUtil.docs(random(), reader,
+ ta.field(),
+ new BytesRef(ta.text()),
+ MultiFields.getLiveDocs(reader),
+ null,
+ 0);
assertTrue(tdocs.advance(0) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(0, tdocs.docID());
@@ -163,12 +163,12 @@ public class TestSegmentTermDocs extends
// exactly skipInterval documents and therefore with optimization
// with next
- tdocs = _TestUtil.docs(random(), reader,
- tb.field(),
- new BytesRef(tb.text()),
- MultiFields.getLiveDocs(reader),
- null,
- DocsEnum.FLAG_FREQS);
+ tdocs = TestUtil.docs(random(), reader,
+ tb.field(),
+ new BytesRef(tb.text()),
+ MultiFields.getLiveDocs(reader),
+ null,
+ DocsEnum.FLAG_FREQS);
assertTrue(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(10, tdocs.docID());
@@ -187,12 +187,12 @@ public class TestSegmentTermDocs extends
assertFalse(tdocs.advance(26) != DocIdSetIterator.NO_MORE_DOCS);
// without next
- tdocs = _TestUtil.docs(random(), reader,
- tb.field(),
- new BytesRef(tb.text()),
- MultiFields.getLiveDocs(reader),
- null,
- DocsEnum.FLAG_FREQS);
+ tdocs = TestUtil.docs(random(), reader,
+ tb.field(),
+ new BytesRef(tb.text()),
+ MultiFields.getLiveDocs(reader),
+ null,
+ DocsEnum.FLAG_FREQS);
assertTrue(tdocs.advance(5) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(10, tdocs.docID());
@@ -207,12 +207,12 @@ public class TestSegmentTermDocs extends
// much more than skipInterval documents and therefore with optimization
// with next
- tdocs = _TestUtil.docs(random(), reader,
- tc.field(),
- new BytesRef(tc.text()),
- MultiFields.getLiveDocs(reader),
- null,
- DocsEnum.FLAG_FREQS);
+ tdocs = TestUtil.docs(random(), reader,
+ tc.field(),
+ new BytesRef(tc.text()),
+ MultiFields.getLiveDocs(reader),
+ null,
+ DocsEnum.FLAG_FREQS);
assertTrue(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(26, tdocs.docID());
@@ -233,12 +233,12 @@ public class TestSegmentTermDocs extends
assertFalse(tdocs.advance(76) != DocIdSetIterator.NO_MORE_DOCS);
//without next
- tdocs = _TestUtil.docs(random(), reader,
- tc.field(),
- new BytesRef(tc.text()),
- MultiFields.getLiveDocs(reader),
- null,
- 0);
+ tdocs = TestUtil.docs(random(), reader,
+ tc.field(),
+ new BytesRef(tc.text()),
+ MultiFields.getLiveDocs(reader),
+ null,
+ 0);
assertTrue(tdocs.advance(5) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(26, tdocs.docID());
assertTrue(tdocs.advance(40) != DocIdSetIterator.NO_MORE_DOCS);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Wed Feb 19 01:38:33 2014
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat;
import org.apache.lucene.document.Document;
@@ -75,7 +75,7 @@ public class TestSegmentTermEnum extends
public void testPrevTermAtEnd() throws IOException
{
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat())));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setCodec(TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat())));
addDoc(writer, "aaa bbb");
writer.close();
SegmentReader reader = getOnlySegmentReader(DirectoryReader.open(dir));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java Wed Feb 19 01:38:33 2014
@@ -82,11 +82,11 @@ public class TestStressAdvance extends L
System.out.println("\nTEST: iter=" + iter + " iter2=" + iter2);
}
assertEquals(TermsEnum.SeekStatus.FOUND, te.seekCeil(new BytesRef("a")));
- de = _TestUtil.docs(random(), te, null, de, DocsEnum.FLAG_NONE);
+ de = TestUtil.docs(random(), te, null, de, DocsEnum.FLAG_NONE);
testOne(de, aDocIDs);
assertEquals(TermsEnum.SeekStatus.FOUND, te.seekCeil(new BytesRef("b")));
- de = _TestUtil.docs(random(), te, null, de, DocsEnum.FLAG_NONE);
+ de = TestUtil.docs(random(), te, null, de, DocsEnum.FLAG_NONE);
testOne(de, bDocIDs);
}
@@ -115,7 +115,7 @@ public class TestStressAdvance extends L
docID = docs.nextDoc();
} else {
// test advance()
- final int inc = _TestUtil.nextInt(random(), 1, expected.size()-1-upto);
+ final int inc = TestUtil.nextInt(random(), 1, expected.size() - 1 - upto);
if (VERBOSE) {
System.out.println(" do advance inc=" + inc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java Wed Feb 19 01:38:33 2014
@@ -187,7 +187,7 @@ public class TestStressIndexing2 extends
}
}
- _TestUtil.checkIndex(dir);
+ TestUtil.checkIndex(dir);
DocsAndWriter dw = new DocsAndWriter();
dw.docs = docs;
dw.writer = w;
@@ -233,7 +233,7 @@ public class TestStressIndexing2 extends
}
//System.out.println("TEST: checkindex");
- _TestUtil.checkIndex(dir);
+ TestUtil.checkIndex(dir);
return docs;
}
@@ -333,7 +333,7 @@ public class TestStressIndexing2 extends
Bits liveDocs = MultiFields.getLiveDocs(r1);
DocsEnum docs = null;
while(termsEnum.next() != null) {
- docs = _TestUtil.docs(random(), termsEnum, liveDocs, docs, DocsEnum.FLAG_NONE);
+ docs = TestUtil.docs(random(), termsEnum, liveDocs, docs, DocsEnum.FLAG_NONE);
while(docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
fail("r1 is not empty but r2 is");
}
@@ -353,9 +353,9 @@ public class TestStressIndexing2 extends
break;
}
- termDocs1 = _TestUtil.docs(random(), termsEnum, liveDocs1, termDocs1, DocsEnum.FLAG_NONE);
+ termDocs1 = TestUtil.docs(random(), termsEnum, liveDocs1, termDocs1, DocsEnum.FLAG_NONE);
if (termsEnum2.seekExact(term)) {
- termDocs2 = _TestUtil.docs(random(), termsEnum2, liveDocs2, termDocs2, DocsEnum.FLAG_NONE);
+ termDocs2 = TestUtil.docs(random(), termsEnum2, liveDocs2, termDocs2, DocsEnum.FLAG_NONE);
} else {
termDocs2 = null;
}
@@ -412,7 +412,7 @@ public class TestStressIndexing2 extends
System.out.println(" pos=" + dpEnum.nextPosition());
}
} else {
- dEnum = _TestUtil.docs(random(), termsEnum3, null, dEnum, DocsEnum.FLAG_FREQS);
+ dEnum = TestUtil.docs(random(), termsEnum3, null, dEnum, DocsEnum.FLAG_FREQS);
assertNotNull(dEnum);
assertTrue(dEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
final int freq = dEnum.freq();
@@ -444,7 +444,7 @@ public class TestStressIndexing2 extends
System.out.println(" pos=" + dpEnum.nextPosition());
}
} else {
- dEnum = _TestUtil.docs(random(), termsEnum3, null, dEnum, DocsEnum.FLAG_FREQS);
+ dEnum = TestUtil.docs(random(), termsEnum3, null, dEnum, DocsEnum.FLAG_FREQS);
assertNotNull(dEnum);
assertTrue(dEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
final int freq = dEnum.freq();
@@ -503,7 +503,7 @@ public class TestStressIndexing2 extends
}
//System.out.println("TEST: term1=" + term1);
- docs1 = _TestUtil.docs(random(), termsEnum1, liveDocs1, docs1, DocsEnum.FLAG_FREQS);
+ docs1 = TestUtil.docs(random(), termsEnum1, liveDocs1, docs1, DocsEnum.FLAG_FREQS);
while (docs1.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
int d = docs1.docID();
int f = docs1.freq();
@@ -536,7 +536,7 @@ public class TestStressIndexing2 extends
}
//System.out.println("TEST: term1=" + term1);
- docs2 = _TestUtil.docs(random(), termsEnum2, liveDocs2, docs2, DocsEnum.FLAG_FREQS);
+ docs2 = TestUtil.docs(random(), termsEnum2, liveDocs2, docs2, DocsEnum.FLAG_FREQS);
while (docs2.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
int d = r2r1[docs2.docID()];
int f = docs2.freq();
@@ -662,8 +662,8 @@ public class TestStressIndexing2 extends
assertEquals(DocIdSetIterator.NO_MORE_DOCS, dpEnum1.nextDoc());
assertEquals(DocIdSetIterator.NO_MORE_DOCS, dpEnum2.nextDoc());
} else {
- dEnum1 = _TestUtil.docs(random(), termsEnum1, null, dEnum1, DocsEnum.FLAG_FREQS);
- dEnum2 = _TestUtil.docs(random(), termsEnum2, null, dEnum2, DocsEnum.FLAG_FREQS);
+ dEnum1 = TestUtil.docs(random(), termsEnum1, null, dEnum1, DocsEnum.FLAG_FREQS);
+ dEnum2 = TestUtil.docs(random(), termsEnum2, null, dEnum2, DocsEnum.FLAG_FREQS);
assertNotNull(dEnum1);
assertNotNull(dEnum2);
int docID1 = dEnum1.nextDoc();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java Wed Feb 19 01:38:33 2014
@@ -37,7 +37,7 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestStressNRT extends LuceneTestCase {
volatile DirectoryReader reader;
@@ -71,15 +71,15 @@ public class TestStressNRT extends Lucen
final int deletePercent = random().nextInt(50);
final int deleteByQueryPercent = random().nextInt(25);
final int ndocs = atLeast(50);
- final int nWriteThreads = _TestUtil.nextInt(random(), 1, TEST_NIGHTLY ? 10 : 5);
- final int maxConcurrentCommits = _TestUtil.nextInt(random(), 1, TEST_NIGHTLY ? 10 : 5); // number of committers at a time... needed if we want to avoid commit errors due to exceeding the max
+ final int nWriteThreads = TestUtil.nextInt(random(), 1, TEST_NIGHTLY ? 10 : 5);
+ final int maxConcurrentCommits = TestUtil.nextInt(random(), 1, TEST_NIGHTLY ? 10 : 5); // number of committers at a time... needed if we want to avoid commit errors due to exceeding the max
final boolean tombstones = random().nextBoolean();
// query variables
final AtomicLong operations = new AtomicLong(atLeast(10000)); // number of query operations to perform in total
- final int nReadThreads = _TestUtil.nextInt(random(), 1, TEST_NIGHTLY ? 10 : 5);
+ final int nReadThreads = TestUtil.nextInt(random(), 1, TEST_NIGHTLY ? 10 : 5);
initModel(ndocs);
final FieldType storedOnlyType = new FieldType();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java Wed Feb 19 01:38:33 2014
@@ -21,7 +21,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
/**
* Tests {@link Terms#getSumDocFreq()}
@@ -44,11 +44,11 @@ public class TestSumDocFreq extends Luce
doc.add(field2);
for (int i = 0; i < numDocs; i++) {
id.setStringValue("" + i);
- char ch1 = (char) _TestUtil.nextInt(random(), 'a', 'z');
- char ch2 = (char) _TestUtil.nextInt(random(), 'a', 'z');
+ char ch1 = (char) TestUtil.nextInt(random(), 'a', 'z');
+ char ch2 = (char) TestUtil.nextInt(random(), 'a', 'z');
field1.setStringValue("" + ch1 + " " + ch2);
- ch1 = (char) _TestUtil.nextInt(random(), 'a', 'z');
- ch2 = (char) _TestUtil.nextInt(random(), 'a', 'z');
+ ch1 = (char) TestUtil.nextInt(random(), 'a', 'z');
+ ch2 = (char) TestUtil.nextInt(random(), 'a', 'z');
field2.setStringValue("" + ch1 + " " + ch2);
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Wed Feb 19 01:38:33 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
-import java.io.Reader;
import java.util.Arrays;
import org.apache.lucene.analysis.*;
@@ -35,7 +34,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestTermVectorsReader extends LuceneTestCase {
//Must be lexicographically sorted, will do in setup, versus trying to maintain here
@@ -226,7 +225,7 @@ public class TestTermVectorsReader exten
//System.out.println("Term: " + term);
assertEquals(testTerms[i], term);
- docsEnum = _TestUtil.docs(random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE);
+ docsEnum = TestUtil.docs(random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE);
assertNotNull(docsEnum);
int doc = docsEnum.docID();
assertEquals(-1, doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java Wed Feb 19 01:38:33 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
import java.io.IOException;
-import java.io.Reader;
import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
@@ -31,7 +30,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
class RepeatingTokenizer extends Tokenizer {
@@ -124,7 +123,7 @@ public class TestTermdocPerf extends Luc
final Random random = new Random(random().nextLong());
for (int i=0; i<iter; i++) {
tenum.seekCeil(new BytesRef("val"));
- tdocs = _TestUtil.docs(random, tenum, MultiFields.getLiveDocs(reader), tdocs, DocsEnum.FLAG_NONE);
+ tdocs = TestUtil.docs(random, tenum, MultiFields.getLiveDocs(reader), tdocs, DocsEnum.FLAG_NONE);
while (tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
ret += tdocs.docID();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java Wed Feb 19 01:38:33 2014
@@ -31,7 +31,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.BasicAutomata;
import org.apache.lucene.util.automaton.CompiledAutomaton;
@@ -93,9 +93,9 @@ public class TestTermsEnum extends Lucen
if (random().nextBoolean()) {
// likely fake term
if (random().nextBoolean()) {
- target = new BytesRef(_TestUtil.randomSimpleString(random()));
+ target = new BytesRef(TestUtil.randomSimpleString(random()));
} else {
- target = new BytesRef(_TestUtil.randomRealisticUnicodeString(random()));
+ target = new BytesRef(TestUtil.randomRealisticUnicodeString(random()));
}
exists = "likely not";
} else {
@@ -332,7 +332,7 @@ public class TestTermsEnum extends Lucen
}
assertEquals(expected, actual);
assertEquals(1, te.docFreq());
- docsEnum = _TestUtil.docs(random(), te, null, docsEnum, DocsEnum.FLAG_NONE);
+ docsEnum = TestUtil.docs(random(), te, null, docsEnum, DocsEnum.FLAG_NONE);
final int docID = docsEnum.nextDoc();
assertTrue(docID != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(docIDToID.get(docID), termToID.get(expected).intValue());
@@ -524,11 +524,11 @@ public class TestTermsEnum extends Lucen
private String getRandomString() {
//return _TestUtil.randomSimpleString(random());
- return _TestUtil.randomRealisticUnicodeString(random());
+ return TestUtil.randomRealisticUnicodeString(random());
}
public void testRandomTerms() throws Exception {
- final String[] terms = new String[_TestUtil.nextInt(random(), 1, atLeast(1000))];
+ final String[] terms = new String[TestUtil.nextInt(random(), 1, atLeast(1000))];
final Set<String> seen = new HashSet<String>();
final boolean allowEmptyString = random().nextBoolean();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java Wed Feb 19 01:38:33 2014
@@ -34,7 +34,8 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.automaton.*;
public class TestTermsEnum2 extends LuceneTestCase {
@@ -53,7 +54,7 @@ public class TestTermsEnum2 extends Luce
RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random(), MockTokenizer.KEYWORD, false))
- .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
+ .setMaxBufferedDocs(TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
Field field = newStringField("field", "", Field.Store.YES);
doc.add(field);
@@ -61,7 +62,7 @@ public class TestTermsEnum2 extends Luce
int num = atLeast(200);
for (int i = 0; i < num; i++) {
- String s = _TestUtil.randomUnicodeString(random());
+ String s = TestUtil.randomUnicodeString(random());
field.setStringValue(s);
terms.add(new BytesRef(s));
writer.addDocument(doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java Wed Feb 19 01:38:33 2014
@@ -22,7 +22,8 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.TestUtil;
public class TestTieredMergePolicy extends LuceneTestCase {
@@ -81,7 +82,7 @@ public class TestTieredMergePolicy exten
IndexWriter w = new IndexWriter(dir, conf);
int maxCount = 0;
- final int numDocs = _TestUtil.nextInt(random(), 20, 100);
+ final int numDocs = TestUtil.nextInt(random(), 20, 100);
for(int i=0;i<numDocs;i++) {
Document doc = new Document();
doc.add(newTextField("content", "aaa " + (i%4), Field.Store.NO));
@@ -94,7 +95,7 @@ public class TestTieredMergePolicy exten
w.flush(true, true);
int segmentCount = w.getSegmentCount();
- int targetCount = _TestUtil.nextInt(random(), 1, segmentCount);
+ int targetCount = TestUtil.nextInt(random(), 1, segmentCount);
if (VERBOSE) {
System.out.println("TEST: merge to " + targetCount + " segs (current count=" + segmentCount + ")");
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1569597&r1=1569596&r2=1569597&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Wed Feb 19 01:38:33 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.search.TermStat
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
/**
* Tests the uniqueTermCount statistic in FieldInvertState
@@ -83,10 +83,10 @@ public class TestUniqueTermCount extends
private String addValue() {
StringBuilder sb = new StringBuilder();
HashSet<String> terms = new HashSet<String>();
- int num = _TestUtil.nextInt(random(), 0, 255);
+ int num = TestUtil.nextInt(random(), 0, 255);
for (int i = 0; i < num; i++) {
sb.append(' ');
- char term = (char) _TestUtil.nextInt(random(), 'a', 'z');
+ char term = (char) TestUtil.nextInt(random(), 'a', 'z');
sb.append(term);
terms.add("" + term);
}