You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2014/03/27 11:45:44 UTC
svn commit: r1582248 [2/4] - in /lucene/dev/branches/solr5914: ./
lucene/analysis/common/src/test/org/apache/lucene/analysis/util/
lucene/analysis/stempel/src/test/org/egothor/stemmer/
lucene/benchmark/src/test/org/apache/lucene/benchmark/ lucene/bench...
Modified: lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java (original)
+++ lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java Thu Mar 27 10:45:40 2014
@@ -42,7 +42,7 @@ public class TestOfflineSorter extends L
@Override
public void setUp() throws Exception {
super.setUp();
- tempDir = TestUtil.getTempDir("mergesort");
+ tempDir = TestUtil.createTempDir("mergesort");
TestUtil.rmDir(tempDir);
tempDir.mkdirs();
}
Modified: lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java (original)
+++ lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java Thu Mar 27 10:45:40 2014
@@ -37,7 +37,7 @@ public class TestPagedBytes extends Luce
public void testDataInputOutput() throws Exception {
Random random = random();
for(int iter=0;iter<5*RANDOM_MULTIPLIER;iter++) {
- BaseDirectoryWrapper dir = newFSDirectory(TestUtil.getTempDir("testOverflow"));
+ BaseDirectoryWrapper dir = newFSDirectory(TestUtil.createTempDir("testOverflow"));
if (dir instanceof MockDirectoryWrapper) {
((MockDirectoryWrapper)dir).setThrottling(MockDirectoryWrapper.Throttling.NEVER);
}
@@ -150,7 +150,7 @@ public class TestPagedBytes extends Luce
@Ignore // memory hole
public void testOverflow() throws IOException {
- BaseDirectoryWrapper dir = newFSDirectory(TestUtil.getTempDir("testOverflow"));
+ BaseDirectoryWrapper dir = newFSDirectory(TestUtil.createTempDir("testOverflow"));
if (dir instanceof MockDirectoryWrapper) {
((MockDirectoryWrapper)dir).setThrottling(MockDirectoryWrapper.Throttling.NEVER);
}
Modified: lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java (original)
+++ lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java Thu Mar 27 10:45:40 2014
@@ -45,7 +45,7 @@ public class Test2BFST extends LuceneTes
IntsRef input = new IntsRef(ints, 0, ints.length);
long seed = random().nextLong();
- Directory dir = new MMapDirectory(TestUtil.getTempDir("2BFST"));
+ Directory dir = new MMapDirectory(TestUtil.createTempDir("2BFST"));
for(int doPackIter=0;doPackIter<2;doPackIter++) {
boolean doPack = doPackIter == 1;
Modified: lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Thu Mar 27 10:45:40 2014
@@ -309,7 +309,7 @@ public class TestFSTs extends LuceneTest
analyzer.setMaxTokenLength(TestUtil.nextInt(random(), 1, IndexWriter.MAX_TERM_LENGTH));
final IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(-1).setRAMBufferSizeMB(64);
- final File tempDir = TestUtil.getTempDir("fstlines");
+ final File tempDir = TestUtil.createTempDir("fstlines");
final Directory dir = newFSDirectory(tempDir);
final IndexWriter writer = new IndexWriter(dir, conf);
final long stopTime = System.currentTimeMillis() + RUN_TIME_MSEC;
Modified: lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java (original)
+++ lucene/dev/branches/solr5914/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestLeaveFilesIfTestFails.java Thu Mar 27 10:45:40 2014
@@ -33,7 +33,7 @@ public class TestLeaveFilesIfTestFails e
public static class Nested1 extends WithNestedTests.AbstractNestedTest {
static File file;
public void testDummy() {
- file = TestUtil.getTempDir("leftover");
+ file = TestUtil.createTempDir("leftover");
file.mkdirs();
fail();
}
Modified: lucene/dev/branches/solr5914/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java (original)
+++ lucene/dev/branches/solr5914/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java Thu Mar 27 10:45:40 2014
@@ -44,7 +44,7 @@ public class TestDemo extends LuceneTest
public void testIndexSearch() throws Exception {
File dir = getDataFile("test-files/docs");
- File indexDir = TestUtil.getTempDir("ContribDemoTest");
+ File indexDir = TestUtil.createTempDir("ContribDemoTest");
IndexFiles.main(new String[] { "-create", "-docs", dir.getPath(), "-index", indexDir.getPath()});
testOneSearch(indexDir, "apache", 3);
testOneSearch(indexDir, "patent", 8);
Modified: lucene/dev/branches/solr5914/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original)
+++ lucene/dev/branches/solr5914/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Thu Mar 27 10:45:40 2014
@@ -941,10 +941,12 @@ public class DirectoryTaxonomyWriter imp
map[origordinal] = newordinal;
}
in.close();
+
// Delete the temporary file, which is no longer needed.
if (!tmpfile.delete()) {
tmpfile.deleteOnExit();
}
+
return map;
}
}
Modified: lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java (original)
+++ lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestAddTaxonomy.java Thu Mar 27 10:45:40 2014
@@ -74,7 +74,7 @@ public class TestAddTaxonomy extends Fac
private OrdinalMap randomOrdinalMap() throws IOException {
if (random().nextBoolean()) {
- return new DiskOrdinalMap(TestUtil.createTempFile("taxoMap", "", TEMP_DIR));
+ return new DiskOrdinalMap(TestUtil.createTempFile("taxoMap", ""));
} else {
return new MemoryOrdinalMap();
}
Modified: lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCharBlockArray.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCharBlockArray.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCharBlockArray.java (original)
+++ lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCharBlockArray.java Thu Mar 27 10:45:40 2014
@@ -85,7 +85,7 @@ public class TestCharBlockArray extends
assertEqualsInternal("GrowingCharArray<->StringBuilder mismatch.", builder, array);
- File tempDir = TestUtil.getTempDir("growingchararray");
+ File tempDir = TestUtil.createTempDir("growingchararray");
File f = new File(tempDir, "GrowingCharArrayTest.tmp");
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(f));
array.flush(out);
Modified: lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java (original)
+++ lucene/dev/branches/solr5914/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java Thu Mar 27 10:45:40 2014
@@ -68,7 +68,7 @@ public class TestCompactLabelToOrdinal e
}
}
- File tmpDir = TestUtil.getTempDir("testLableToOrdinal");
+ File tmpDir = TestUtil.createTempDir("testLableToOrdinal");
File f = new File(tmpDir, "CompactLabelToOrdinalTest.tmp");
int flushInterval = 10;
Modified: lucene/dev/branches/solr5914/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java (original)
+++ lucene/dev/branches/solr5914/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java Thu Mar 27 10:45:40 2014
@@ -28,12 +28,8 @@ import org.apache.lucene.util.TestUtil;
public class TestIndexSplitter extends LuceneTestCase {
public void test() throws Exception {
- File dir = new File(TEMP_DIR, "testfilesplitter");
- TestUtil.rmDir(dir);
- dir.mkdirs();
- File destDir = new File(TEMP_DIR, "testfilesplitterdest");
- TestUtil.rmDir(destDir);
- destDir.mkdirs();
+ File dir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
+ File destDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
Directory fsDir = newFSDirectory(dir);
// IndexSplitter.split makes its own commit directly with SIPC/SegmentInfos,
// so the unreferenced files are expected.
@@ -80,9 +76,7 @@ public class TestIndexSplitter extends L
fsDirDest.close();
// now test cmdline
- File destDir2 = new File(TEMP_DIR, "testfilesplitterdest2");
- TestUtil.rmDir(destDir2);
- destDir2.mkdirs();
+ File destDir2 = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
IndexSplitter.main(new String[] {dir.getAbsolutePath(), destDir2.getAbsolutePath(), splitSegName});
assertEquals(5, destDir2.listFiles().length);
Directory fsDirDest2 = newFSDirectory(destDir2);
Modified: lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java (original)
+++ lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java Thu Mar 27 10:45:40 2014
@@ -191,7 +191,7 @@ public class IndexAndTaxonomyReplication
publishTaxoDir = newDirectory();
handlerIndexDir = newMockDirectory();
handlerTaxoDir = newMockDirectory();
- clientWorkDir = TestUtil.getTempDir("replicationClientTest");
+ clientWorkDir = TestUtil.createTempDir("replicationClientTest");
sourceDirFactory = new PerSessionDirectoryFactory(clientWorkDir);
replicator = new LocalReplicator();
callback = new IndexAndTaxonomyReadyCallback(handlerIndexDir, handlerTaxoDir);
Modified: lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java (original)
+++ lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java Thu Mar 27 10:45:40 2014
@@ -136,7 +136,7 @@ public class IndexReplicationClientTest
super.setUp();
publishDir = newMockDirectory();
handlerDir = newMockDirectory();
- sourceDirFactory = new PerSessionDirectoryFactory(TestUtil.getTempDir("replicationClientTest"));
+ sourceDirFactory = new PerSessionDirectoryFactory(TestUtil.createTempDir("replicationClientTest"));
replicator = new LocalReplicator();
callback = new IndexReadyCallback(handlerDir);
handler = new IndexReplicationHandler(handlerDir, callback);
Modified: lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java (original)
+++ lucene/dev/branches/solr5914/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java Thu Mar 27 10:45:40 2014
@@ -68,7 +68,7 @@ public class HttpReplicatorTest extends
public void setUp() throws Exception {
super.setUp();
System.setProperty("org.eclipse.jetty.LEVEL", "DEBUG"); // sets stderr logging to DEBUG level
- clientWorkDir = TestUtil.getTempDir("httpReplicatorTest");
+ clientWorkDir = TestUtil.createTempDir("httpReplicatorTest");
handlerIndexDir = newDirectory();
serverIndexDir = newDirectory();
serverReplicator = new LocalReplicator();
Modified: lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java (original)
+++ lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java Thu Mar 27 10:45:40 2014
@@ -162,7 +162,7 @@ public class LookupBenchmarkTest extends
} catch (InstantiationException e) {
Analyzer a = new MockAnalyzer(random, MockTokenizer.KEYWORD, false);
if (cls == AnalyzingInfixSuggester.class) {
- lookup = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, FSDirectory.open(TestUtil.getTempDir("LookupBenchmarkTest")), a);
+ lookup = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, FSDirectory.open(TestUtil.createTempDir("LookupBenchmarkTest")), a);
} else {
Constructor<? extends Lookup> ctor = cls.getConstructor(Analyzer.class);
lookup = ctor.newInstance(a);
Modified: lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java (original)
+++ lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/PersistenceTest.java Thu Mar 27 10:45:40 2014
@@ -70,7 +70,7 @@ public class PersistenceTest extends Luc
lookup.build(new InputArrayIterator(keys));
// Store the suggester.
- File storeDir = TEMP_DIR;
+ File storeDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
lookup.store(new FileOutputStream(new File(storeDir, "lookup.dat")));
// Re-read it from disk.
Modified: lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java (original)
+++ lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java Thu Mar 27 10:45:40 2014
@@ -94,7 +94,7 @@ public class AnalyzingInfixSuggesterTest
new Input("a penny saved is a penny earned", 10, new BytesRef("foobaz")),
};
- File tempDir = TestUtil.getTempDir("AnalyzingInfixSuggesterTest");
+ File tempDir = TestUtil.createTempDir("AnalyzingInfixSuggesterTest");
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
AnalyzingInfixSuggester suggester = new AnalyzingInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a, 3);
@@ -213,7 +213,7 @@ public class AnalyzingInfixSuggesterTest
new Input("lend me your ear", 8, new BytesRef("foobar")),
new Input("a penny saved is a penny earned", 10, new BytesRef("foobaz")),
};
- File tempDir = TestUtil.getTempDir("AnalyzingInfixSuggesterTest");
+ File tempDir = TestUtil.createTempDir("AnalyzingInfixSuggesterTest");
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
int minPrefixLength = random().nextInt(10);
@@ -474,7 +474,7 @@ public class AnalyzingInfixSuggesterTest
}
public void testRandomNRT() throws Exception {
- final File tempDir = TestUtil.getTempDir("AnalyzingInfixSuggesterTest");
+ final File tempDir = TestUtil.createTempDir("AnalyzingInfixSuggesterTest");
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
int minPrefixChars = random().nextInt(7);
if (VERBOSE) {
@@ -809,7 +809,7 @@ public class AnalyzingInfixSuggesterTest
new Input("a penny saved is a penny earned", 10, new BytesRef("foobaz"), asSet("foo", "baz"))
};
- File tempDir = TestUtil.getTempDir("analyzingInfixContext");
+ File tempDir = TestUtil.createTempDir("analyzingInfixContext");
for(int iter=0;iter<2;iter++) {
AnalyzingInfixSuggester suggester;
Modified: lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java (original)
+++ lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java Thu Mar 27 10:45:40 2014
@@ -921,7 +921,7 @@ public class AnalyzingSuggesterTest exte
assertEquals(3, results.get(2).value);
// Try again after save/load:
- File tmpDir = TestUtil.getTempDir("AnalyzingSuggesterTest");
+ File tmpDir = TestUtil.createTempDir("AnalyzingSuggesterTest");
tmpDir.mkdir();
File path = new File(tmpDir, "suggester");
@@ -983,7 +983,7 @@ public class AnalyzingSuggesterTest exte
assertEquals(5, results.get(1).value);
// Try again after save/load:
- File tmpDir = TestUtil.getTempDir("AnalyzingSuggesterTest");
+ File tmpDir = TestUtil.createTempDir("AnalyzingSuggesterTest");
tmpDir.mkdir();
File path = new File(tmpDir, "suggester");
@@ -1053,7 +1053,7 @@ public class AnalyzingSuggesterTest exte
assertEquals(5, results.get(1).value);
// Try again after save/load:
- File tmpDir = TestUtil.getTempDir("AnalyzingSuggesterTest");
+ File tmpDir = TestUtil.createTempDir("AnalyzingSuggesterTest");
tmpDir.mkdir();
File path = new File(tmpDir, "suggester");
Modified: lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java (original)
+++ lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java Thu Mar 27 10:45:40 2014
@@ -45,7 +45,7 @@ public class BlendedInfixSuggesterTest e
new Input("star wars: episode v - the empire strikes back", 8, payload)
};
- File tempDir = TestUtil.getTempDir("BlendedInfixSuggesterTest");
+ File tempDir = TestUtil.createTempDir("BlendedInfixSuggesterTest");
Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET);
BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
@@ -84,7 +84,7 @@ public class BlendedInfixSuggesterTest e
new Input("top of the lake", w, pl)
};
- File tempDir = TestUtil.getTempDir("BlendedInfixSuggesterTest");
+ File tempDir = TestUtil.createTempDir("BlendedInfixSuggesterTest");
Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET);
// BlenderType.LINEAR is used by default (remove position*10%)
@@ -125,7 +125,7 @@ public class BlendedInfixSuggesterTest e
new Input("the returned", 10, ret),
};
- File tempDir = TestUtil.getTempDir("BlendedInfixSuggesterTest");
+ File tempDir = TestUtil.createTempDir("BlendedInfixSuggesterTest");
Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET);
// if factor is small, we don't get the expected element
@@ -175,7 +175,7 @@ public class BlendedInfixSuggesterTest e
new Input("the returned", 10, ret),
};
- File tempDir = TestUtil.getTempDir("BlendedInfixSuggesterTest");
+ File tempDir = TestUtil.createTempDir("BlendedInfixSuggesterTest");
Analyzer a = new StandardAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET);
// if factor is small, we don't get the expected element
Modified: lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java (original)
+++ lucene/dev/branches/solr5914/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java Thu Mar 27 10:45:40 2014
@@ -82,7 +82,7 @@ public class TestFreeTextSuggester exten
toString(sug.lookup("b", 10)));
// Try again after save/load:
- File tmpDir = TestUtil.getTempDir("FreeTextSuggesterTest");
+ File tmpDir = TestUtil.createTempDir("FreeTextSuggesterTest");
tmpDir.mkdir();
File path = new File(tmpDir, "suggester");
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java Thu Mar 27 10:45:40 2014
@@ -502,7 +502,7 @@ public abstract class BaseTokenStreamTes
!(postingsFormat.equals("Memory") ||
postingsFormat.equals("SimpleText"));
if (rarely(random) && codecOk) {
- dir = newFSDirectory(TestUtil.getTempDir("bttc"));
+ dir = newFSDirectory(TestUtil.createTempDir("bttc"));
iw = new RandomIndexWriter(new Random(seed), dir, a);
}
boolean success = false;
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java Thu Mar 27 10:45:40 2014
@@ -2615,7 +2615,7 @@ public abstract class BaseDocValuesForma
Analyzer analyzer = new MockAnalyzer(random());
// FSDirectory because SimpleText will consume gobbs of
// space when storing big binary values:
- Directory d = newFSDirectory(TestUtil.getTempDir("hugeBinaryValues"));
+ Directory d = newFSDirectory(TestUtil.createTempDir("hugeBinaryValues"));
boolean doFixed = random().nextBoolean();
int numDocs;
int fixedLength = 0;
@@ -2713,7 +2713,7 @@ public abstract class BaseDocValuesForma
Analyzer analyzer = new MockAnalyzer(random());
// FSDirectory because SimpleText will consume gobbs of
// space when storing big binary values:
- Directory d = newFSDirectory(TestUtil.getTempDir("hugeBinaryValues"));
+ Directory d = newFSDirectory(TestUtil.createTempDir("hugeBinaryValues"));
boolean doFixed = random().nextBoolean();
int numDocs;
int fixedLength = 0;
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Thu Mar 27 10:45:40 2014
@@ -1211,7 +1211,7 @@ public abstract class BasePostingsFormat
/** Indexes all fields/terms at the specified
* IndexOptions, and fully tests at that IndexOptions. */
private void testFull(IndexOptions options, boolean withPayloads) throws Exception {
- File path = TestUtil.getTempDir("testPostingsFormat.testExact");
+ File path = TestUtil.createTempDir("testPostingsFormat.testExact");
Directory dir = newFSDirectory(path);
// TODO test thread safety of buildIndex too
@@ -1264,7 +1264,7 @@ public abstract class BasePostingsFormat
int iters = 5;
for(int iter=0;iter<iters;iter++) {
- File path = TestUtil.getTempDir("testPostingsFormat");
+ File path = TestUtil.createTempDir("testPostingsFormat");
Directory dir = newFSDirectory(path);
boolean indexPayloads = random().nextBoolean();
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java Thu Mar 27 10:45:40 2014
@@ -598,7 +598,7 @@ public abstract class BaseStoredFieldsFo
// for this test we force a FS dir
// we can't just use newFSDirectory, because this test doesn't really index anything.
// so if we get NRTCachingDir+SimpleText, we make massive stored fields and OOM (LUCENE-4484)
- Directory dir = new MockDirectoryWrapper(random(), new MMapDirectory(TestUtil.getTempDir("testBigDocuments")));
+ Directory dir = new MockDirectoryWrapper(random(), new MMapDirectory(TestUtil.createTempDir("testBigDocuments")));
IndexWriterConfig iwConf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
iwConf.setMaxBufferedDocs(RandomInts.randomIntBetween(random(), 2, 30));
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf);
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Thu Mar 27 10:45:40 2014
@@ -435,7 +435,7 @@ public abstract class ThreadedIndexingAn
Random random = new Random(random().nextLong());
final LineFileDocs docs = new LineFileDocs(random, true);
- final File tempDir = TestUtil.getTempDir(testName);
+ final File tempDir = TestUtil.createTempDir(testName);
dir = getDirectory(newMockFSDirectory(tempDir)); // some subclasses rely on this being MDW
if (dir instanceof BaseDirectoryWrapper) {
((BaseDirectoryWrapper) dir).setCheckIndexOnClose(false); // don't double-checkIndex, we do it ourselves.
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java Thu Mar 27 10:45:40 2014
@@ -447,7 +447,7 @@ public abstract class ShardSearchingTest
public NodeState(Random random, int nodeID, int numNodes) throws IOException {
myNodeID = nodeID;
- dir = newFSDirectory(TestUtil.getTempDir("ShardSearchingTestBase"));
+ dir = newFSDirectory(TestUtil.createTempDir("ShardSearchingTestBase"));
// TODO: set warmer
MockAnalyzer analyzer = new MockAnalyzer(random());
analyzer.setMaxTokenLength(TestUtil.nextInt(random(), 1, IndexWriter.MAX_TERM_LENGTH));
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/CloseableFile.java Thu Mar 27 10:45:40 2014
@@ -1,6 +1,8 @@
package org.apache.lucene.util;
-import java.io.*;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,10 +27,17 @@ import java.io.*;
final class CloseableFile implements Closeable {
private final File file;
private final TestRuleMarkFailure failureMarker;
+ private final String creationStack;
public CloseableFile(File file, TestRuleMarkFailure failureMarker) {
this.file = file;
this.failureMarker = failureMarker;
+
+ StringBuilder b = new StringBuilder();
+ for (StackTraceElement e : Thread.currentThread().getStackTrace()) {
+ b.append('\t').append(e.toString()).append('\n');
+ }
+ creationStack = b.toString();
}
@Override
@@ -36,6 +45,10 @@ final class CloseableFile implements Clo
// only if there were no other test failures.
if (failureMarker.wasSuccessful()) {
if (file.exists()) {
+ if (file.listFiles().length > 0) {
+ // throw new IOException("Temporary folder not clean: " + file.getAbsolutePath() + ". Created at stack trace:\n" + creationStack);
+ }
+
try {
TestUtil.rmDir(file);
} catch (IOException e) {
@@ -45,9 +58,9 @@ final class CloseableFile implements Clo
// Re-check.
if (file.exists()) {
throw new IOException(
- "Could not remove: " + file.getAbsolutePath());
+ "Could not remove temporary folder: " + file.getAbsolutePath() + ". Created at stack trace:\n" + creationStack);
}
- }
+ }
}
}
}
\ No newline at end of file
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Thu Mar 27 10:45:40 2014
@@ -290,16 +290,6 @@ public abstract class LuceneTestCase ext
/** Throttling, see {@link MockDirectoryWrapper#setThrottling(Throttling)}. */
public static final Throttling TEST_THROTTLING = TEST_NIGHTLY ? Throttling.SOMETIMES : Throttling.NEVER;
- /** Create indexes in this directory, optimally use a subdir, named after the test */
- public static final File TEMP_DIR;
- static {
- String s = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
- if (s == null)
- throw new RuntimeException("To run tests, you need to define system property 'tempDir' or 'java.io.tmpdir'.");
- TEMP_DIR = new File(s);
- TEMP_DIR.mkdirs();
- }
-
/**
* These property keys will be ignored in verification of altered properties.
* @see SystemPropertiesInvariantRule
@@ -1164,7 +1154,7 @@ public abstract class LuceneTestCase ext
final Class<? extends Directory> clazz = CommandLineUtil.loadDirectoryClass(clazzName);
// If it is a FSDirectory type, try its ctor(File)
if (FSDirectory.class.isAssignableFrom(clazz)) {
- final File dir = TestUtil.getTempDir("index");
+ final File dir = TestUtil.createTempDir("index");
dir.mkdirs(); // ensure it's created so we 'have' it.
return newFSDirectoryImpl(clazz.asSubclass(FSDirectory.class), dir);
}
Modified: lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java (original)
+++ lucene/dev/branches/solr5914/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java Thu Mar 27 10:45:40 2014
@@ -103,34 +103,6 @@ public final class TestUtil {
private static final int GET_TEMP_DIR_RETRY_THRESHOLD = 1000;
/**
- * Returns a temp directory, based on the given description. Creates the
- * directory.
- */
- public static File getTempDir(String desc) {
- if (desc.length() < 3) {
- throw new IllegalArgumentException("description must be at least 3 characters");
- }
- // always pull a long from master random. that way, the randomness of the test
- // is not affected by whether it initialized the counter (in genTempFile) or not.
- // note that the Random used by genTempFile is *not* the master Random, and therefore
- // does not affect the randomness of the test.
- final Random random = new Random(RandomizedContext.current().getRandom().nextLong());
- int attempt = 0;
- File f;
- do {
- f = genTempFile(random, desc, "tmp", LuceneTestCase.TEMP_DIR);
- } while (!f.mkdir() && (attempt++) < GET_TEMP_DIR_RETRY_THRESHOLD);
-
- if (attempt > GET_TEMP_DIR_RETRY_THRESHOLD) {
- throw new RuntimeException(
- "failed to get a temporary dir too many times. check your temp directory and consider manually cleaning it.");
- }
-
- LuceneTestCase.closeAfterSuite(new CloseableFile(f, LuceneTestCase.suiteFailureMarker));
- return f;
- }
-
- /**
* Deletes a directory and everything underneath it.
*/
public static void rmDir(File dir) throws IOException {
@@ -809,9 +781,45 @@ public final class TestUtil {
Assert.assertEquals("Reflection does not produce same map", reflectedValues, map);
}
+ /**
+ * Returns a new, empty temporary folder, based on the given name. The folder will be
+ * deleted at the end of the suite. Failure to delete the temporary folder will cause
+ * an exception (typically on Windows).
+ */
+ public static File createTempDir(String name) {
+ if (name.length() < 3) {
+ throw new IllegalArgumentException("description must be at least 3 characters");
+ }
+
+ // always pull a long from master random. that way, the randomness of the test
+ // is not affected by whether it initialized the counter (in genTempFile) or not.
+ // note that the Random used by genTempFile is *not* the master Random, and therefore
+ // does not affect the randomness of the test.
+ final Random random = new Random(RandomizedContext.current().getRandom().nextLong());
+ int attempt = 0;
+ String tmpDir = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
+ File f;
+ do {
+ f = genTempFile(random, name + "_", "", new File(tmpDir));
+ } while (!f.mkdir() && (attempt++) < GET_TEMP_DIR_RETRY_THRESHOLD);
+
+ if (attempt > GET_TEMP_DIR_RETRY_THRESHOLD) {
+ throw new RuntimeException(
+ "failed to get a temporary dir too many times. check your temp directory and consider manually cleaning it.");
+ }
+
+ LuceneTestCase.closeAfterSuite(new CloseableFile(f, LuceneTestCase.suiteFailureMarker));
+ return f;
+ }
+
+ public static File createTempFile(String prefix, String suffix) throws IOException {
+ String tmpDir = System.getProperty("tempDir", System.getProperty("java.io.tmpdir"));
+ return createTempFile(prefix, suffix, new File(tmpDir));
+ }
+
/**
- * insecure, fast version of File.createTempFile
- * uses Random instead of SecureRandom.
+ * Insecure, fast version of {@link File#createTempFile(String, String)}, uses
+ * Random instead of SecureRandom.
*/
public static File createTempFile(String prefix, String suffix, File directory)
throws IOException {
@@ -828,6 +836,7 @@ public final class TestUtil {
do {
result = genTempFile(random, prefix, newSuffix, directory);
} while (!result.createNewFile());
+ LuceneTestCase.closeAfterSuite(new CloseableFile(result, LuceneTestCase.suiteFailureMarker));
return result;
}
Modified: lucene/dev/branches/solr5914/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java Thu Mar 27 10:45:40 2014
@@ -22,6 +22,8 @@ import java.io.FileOutputStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
@@ -62,7 +64,7 @@ public class TestICUCollationField exten
*/
public static String setupSolrHome() throws Exception {
// make a solr home underneath the test's TEMP_DIR
- File tmpFile = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpFile = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
tmpFile.delete();
tmpFile.mkdir();
Modified: lucene/dev/branches/solr5914/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java Thu Mar 27 10:45:40 2014
@@ -22,6 +22,8 @@ import java.io.FileOutputStream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.solr.SolrTestCaseJ4;
import org.junit.BeforeClass;
@@ -64,7 +66,7 @@ public class TestICUCollationFieldDocVal
*/
public static String setupSolrHome() throws Exception {
// make a solr home underneath the test's TEMP_DIR
- File tmpFile = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpFile = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
tmpFile.delete();
tmpFile.mkdir();
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java Thu Mar 27 10:45:40 2014
@@ -16,6 +16,8 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.junit.After;
import org.junit.Before;
@@ -54,9 +56,7 @@ public abstract class AbstractSqlEntityP
@Before
public void beforeSqlEntitiyProcessorTestCase() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
fileLocation = tmpdir.getPath();
fileName = "the.properties";
}
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Thu Mar 27 10:45:40 2014
@@ -16,7 +16,12 @@
*/
package org.apache.solr.handler.dataimport;
+import java.io.File;
+import java.util.List;
+
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.request.DirectXmlRequest;
@@ -25,14 +30,10 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.UpdateParams;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.io.File;
-import java.util.List;
-
/**
* Test for ContentStreamDataSource
*
@@ -150,10 +151,7 @@ public class TestContentStreamDataSource
public void setUp() throws Exception {
-
- File home = new File(TEMP_DIR,
- getClass().getName() + "-" + System.currentTimeMillis());
-
+ File home = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
homeDir = new File(home, "inst");
dataDir = new File(homeDir + "/collection1", "data");
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java Thu Mar 27 10:45:40 2014
@@ -20,6 +20,8 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.request.LocalSolrQueryRequest;
import java.util.ArrayList;
@@ -240,10 +242,7 @@ public class TestDocBuilder2 extends Abs
@Test
@Ignore("Fix Me. See SOLR-4103.")
public void testFileListEntityProcessor_lastIndexTime() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
- tmpdir.deleteOnExit();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
Map<String, String> params = createMap("baseDir", tmpdir.getAbsolutePath());
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java Thu Mar 27 10:45:40 2014
@@ -16,6 +16,8 @@ package org.apache.solr.handler.dataimpo
* limitations under the License.
*/
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.junit.Ignore;
import org.junit.Test;
@@ -37,10 +39,7 @@ public class TestFileListEntityProcessor
@Test
@SuppressWarnings("unchecked")
public void testSimple() throws IOException {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
- tmpdir.deleteOnExit();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
createFile(tmpdir, "a.xml", "a.xml".getBytes("UTF-8"), false);
createFile(tmpdir, "b.xml", "b.xml".getBytes("UTF-8"), false);
createFile(tmpdir, "c.props", "c.props".getBytes("UTF-8"), false);
@@ -63,10 +62,7 @@ public class TestFileListEntityProcessor
@Test
public void testBiggerSmallerFiles() throws IOException {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
- tmpdir.deleteOnExit();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
long minLength = Long.MAX_VALUE;
String smallestFile = "";
byte[] content = "abcdefgij".getBytes("UTF-8");
@@ -133,10 +129,7 @@ public class TestFileListEntityProcessor
@Test
public void testNTOT() throws IOException {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
- tmpdir.deleteOnExit();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
createFile(tmpdir, "a.xml", "a.xml".getBytes("UTF-8"), true);
createFile(tmpdir, "b.xml", "b.xml".getBytes("UTF-8"), true);
createFile(tmpdir, "c.props", "c.props".getBytes("UTF-8"), true);
@@ -169,13 +162,8 @@ public class TestFileListEntityProcessor
@Test
public void testRECURSION() throws IOException {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
- tmpdir.deleteOnExit();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
File childdir = new File(tmpdir + "/child" );
- childdir.mkdirs();
- childdir.deleteOnExit();
createFile(childdir, "a.xml", "a.xml".getBytes("UTF-8"), true);
createFile(childdir, "b.xml", "b.xml".getBytes("UTF-8"), true);
createFile(childdir, "c.props", "c.props".getBytes("UTF-8"), true);
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java Thu Mar 27 10:45:40 2014
@@ -2,6 +2,8 @@ package org.apache.solr.handler.dataimpo
import java.io.File;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.junit.BeforeClass;
@@ -29,10 +31,7 @@ public class TestFileListWithLineEntityP
}
public void test() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
- tmpdir.deleteOnExit();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
createFile(tmpdir, "a.txt", "a line one\na line two\na line three".getBytes("UTF-8"), false);
createFile(tmpdir, "b.txt", "b line one\nb line two".getBytes("UTF-8"), false);
createFile(tmpdir, "c.txt", "c line one\nc line two\nc line three\nc line four".getBytes("UTF-8"), false);
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java Thu Mar 27 10:45:40 2014
@@ -17,6 +17,8 @@
package org.apache.solr.handler.dataimport;
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -53,7 +55,7 @@ public class TestNonWritablePersistFile
@BeforeClass
public static void createTempSolrHomeAndCore() throws Exception {
createTempDir();
- tmpSolrHome = TEMP_DIR + File.separator + TestNonWritablePersistFile.class.getSimpleName() + System.currentTimeMillis();
+ tmpSolrHome = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName()).getAbsolutePath();
FileUtils.copyDirectory(getFile("dih/solr"), new File(tmpSolrHome).getAbsoluteFile());
initCore("dataimport-solrconfig.xml", "dataimport-schema.xml",
new File(tmpSolrHome).getAbsolutePath());
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java Thu Mar 27 10:45:40 2014
@@ -14,6 +14,8 @@ import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -46,9 +48,7 @@ public class TestSimplePropertiesWriter
@Before
public void spwBefore() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
fileLocation = tmpdir.getPath();
fileName = "the.properties";
}
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java Thu Mar 27 10:45:40 2014
@@ -26,6 +26,8 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -316,9 +318,7 @@ public class TestSolrEntityProcessorEndT
}
public void setUp() throws Exception {
-
- File home = new File(TEMP_DIR, getClass().getName() + "-"
- + System.currentTimeMillis());
+ File home = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
homeDir = new File(home + "inst");
dataDir = new File(homeDir + "/collection1", "data");
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java Thu Mar 27 10:45:40 2014
@@ -16,6 +16,8 @@
*/
package org.apache.solr.handler.dataimport;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.junit.Test;
import java.io.File;
@@ -42,10 +44,7 @@ public class TestXPathEntityProcessor ex
@Test
public void withFieldsAndXpath() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
- tmpdir.deleteOnExit();
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
createFile(tmpdir, "x.xsl", xsl.getBytes("UTF-8"), false);
Map entityAttrs = createMap("name", "e", "url", "cd.xml",
XPathEntityProcessor.FOR_EACH, "/catalog/cd");
@@ -333,12 +332,8 @@ public class TestXPathEntityProcessor ex
@Test
public void withDefaultSolrAndXsl() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
- tmpdir.delete();
- tmpdir.mkdir();
- tmpdir.deleteOnExit();
- AbstractDataImportHandlerTestCase.createFile(tmpdir, "x.xsl", xsl.getBytes("UTF-8"),
- false);
+ File tmpdir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
+ AbstractDataImportHandlerTestCase.createFile(tmpdir, "x.xsl", xsl.getBytes("UTF-8"), false);
Map entityAttrs = createMap("name", "e",
XPathEntityProcessor.USE_SOLR_ADD_SCHEMA, "true", "xsl", ""
+ new File(tmpdir, "x.xsl").toURI(), "url", "cd.xml");
Modified: lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java Thu Mar 27 10:45:40 2014
@@ -21,6 +21,8 @@ import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.hadoop.morphline.MorphlineMapRunner;
import org.apache.solr.morphlines.solr.AbstractSolrMorphlineTestBase;
@@ -45,11 +47,9 @@ public abstract class MRUnitBase extends
}
protected void setupHadoopConfig(Configuration config) throws IOException {
-
- String tempDir = TEMP_DIR + "/test-morphlines-" + System.currentTimeMillis();
- new File(tempDir).mkdirs();
+ String tempDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName()).getAbsolutePath();
FileUtils.copyFile(new File(RESOURCES_DIR + "/custom-mimetypes.xml"), new File(tempDir + "/custom-mimetypes.xml"));
-
+
AbstractSolrMorphlineTestBase.setupMorphline(tempDir, "test-morphlines/solrCellDocumentTypes", true);
config.set(MorphlineMapRunner.MORPHLINE_FILE_PARAM, tempDir + "/test-morphlines/solrCellDocumentTypes.conf");
Modified: lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java Thu Mar 27 10:45:40 2014
@@ -27,6 +27,8 @@ import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.lucene.util.Constants;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.cloud.AbstractZkTestCase;
import org.apache.solr.hadoop.dedup.NoChangeUpdateConflictResolver;
@@ -55,11 +57,12 @@ public class MapReduceIndexerToolArgumen
private static final Logger LOG = LoggerFactory.getLogger(MapReduceIndexerToolArgumentParserTest.class);
- private static final File solrHomeDirectory = new File(TEMP_DIR, MorphlineGoLiveMiniMRTest.class.getName());
+ private static File solrHomeDirectory;
@BeforeClass
public static void beforeClass() {
assumeFalse("Does not work on Windows, because it uses UNIX shell commands or POSIX paths", Constants.WINDOWS);
+ solrHomeDirectory = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
}
@Before
Modified: lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java Thu Mar 27 10:45:40 2014
@@ -38,6 +38,8 @@ import org.apache.hadoop.util.JarFinder;
import org.apache.hadoop.util.ToolRunner;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.lucene.util.Constants;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.cloud.AbstractZkTestCase;
@@ -79,7 +81,7 @@ public class MorphlineBasicMiniMRTest ex
private static String tempDir;
- private static final File solrHomeDirectory = new File(TEMP_DIR, MorphlineBasicMiniMRTest.class.getName());
+ private static File solrHomeDirectory;
protected MapReduceIndexerTool createTool() {
return new MapReduceIndexerTool();
@@ -108,6 +110,8 @@ public class MorphlineBasicMiniMRTest ex
@BeforeClass
public static void setupClass() throws Exception {
+ solrHomeDirectory = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
+
assumeTrue(
"Currently this test can only be run without the lucene test security policy in place",
System.getProperty("java.security.manager", "").equals(""));
@@ -121,8 +125,8 @@ public class MorphlineBasicMiniMRTest ex
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(MINIMR_CONF_DIR, solrHomeDirectory);
-
- tempDir = TEMP_DIR + "/test-morphlines-" + System.currentTimeMillis();
+
+ tempDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName()).getAbsolutePath();
new File(tempDir).mkdirs();
FileUtils.copyFile(new File(RESOURCES_DIR + "/custom-mimetypes.xml"), new File(tempDir + "/custom-mimetypes.xml"));
Modified: lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java Thu Mar 27 10:45:40 2014
@@ -43,6 +43,8 @@ import org.apache.hadoop.util.JarFinder;
import org.apache.hadoop.util.ToolRunner;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.lucene.util.Constants;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
@@ -108,8 +110,8 @@ public class MorphlineGoLiveMiniMRTest e
private final String inputAvroFile2;
private final String inputAvroFile3;
- private static final File solrHomeDirectory = new File(TEMP_DIR, MorphlineGoLiveMiniMRTest.class.getName());
-
+ private static File solrHomeDirectory;
+
@Override
public String getSolrHome() {
return solrHomeDirectory.getPath();
@@ -138,11 +140,11 @@ public class MorphlineGoLiveMiniMRTest e
assumeFalse("FIXME: This test fails under Java 8 due to the Saxon dependency - see SOLR-1301", Constants.JRE_IS_MINIMUM_JAVA8);
assumeFalse("FIXME: This test fails under J9 due to the Saxon dependency - see SOLR-1301", System.getProperty("java.vm.info", "<?>").contains("IBM J9"));
+ solrHomeDirectory = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
- FileUtils.copyDirectory(MINIMR_INSTANCE_DIR, solrHomeDirectory);
+ FileUtils.copyDirectory(MINIMR_INSTANCE_DIR, AbstractZkTestCase.SOLRHOME);
- tempDir = TEMP_DIR + "/test-morphlines-" + System.currentTimeMillis();
- new File(tempDir).mkdirs();
+ tempDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName()).getAbsolutePath();
FileUtils.copyFile(new File(RESOURCES_DIR + "/custom-mimetypes.xml"), new File(tempDir + "/custom-mimetypes.xml"));
AbstractSolrMorphlineTestBase.setupMorphline(tempDir, "test-morphlines/solrCellDocumentTypes", true);
Modified: lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java Thu Mar 27 10:45:40 2014
@@ -32,6 +32,8 @@ import java.util.TimeZone;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
@@ -118,8 +120,7 @@ public class AbstractSolrMorphlineTestBa
testServer = new SolrServerDocumentLoader(solrServer, batchSize);
deleteAllDocuments();
- tempDir = new File(TEMP_DIR + "/test-morphlines-" + System.currentTimeMillis()).getAbsolutePath();
- new File(tempDir).mkdirs();
+ tempDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName()).getAbsolutePath();
}
@After
Modified: lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java Thu Mar 27 10:45:40 2014
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.Iterator;
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
@@ -47,8 +48,8 @@ import com.google.common.collect.ListMul
import com.typesafe.config.Config;
public abstract class AbstractSolrMorphlineZkTestBase extends AbstractFullDistribZkTestBase {
- private static final File solrHomeDirectory = new File(TEMP_DIR, AbstractSolrMorphlineZkTestBase.class.getName());
-
+ private static File solrHomeDirectory;
+
protected static final String RESOURCES_DIR = getFile("morphlines-core.marker").getParent();
private static final File SOLR_INSTANCE_DIR = new File(RESOURCES_DIR + "/solr");
private static final File SOLR_CONF_DIR = new File(RESOURCES_DIR + "/solr/collection1");
@@ -69,6 +70,7 @@ public abstract class AbstractSolrMorphl
@BeforeClass
public static void setupClass() throws Exception {
+ solrHomeDirectory = TestUtil.createTempDir(AbstractSolrMorphlineZkTestBase.class.getName());
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(SOLR_INSTANCE_DIR, solrHomeDirectory);
createTempDir();
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java Thu Mar 27 10:45:40 2014
@@ -18,6 +18,7 @@ package org.apache.solr;
*/
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
@@ -43,7 +44,7 @@ public class AnalysisAfterCoreReloadTest
@BeforeClass
public static void beforeClass() throws Exception {
createTempDir();
- tmpSolrHome = TEMP_DIR + File.separator + AnalysisAfterCoreReloadTest.class.getSimpleName() + System.currentTimeMillis();
+ tmpSolrHome = TestUtil.createTempDir(AnalysisAfterCoreReloadTest.class.getSimpleName()).getAbsolutePath();
FileUtils.copyDirectory(new File(TEST_HOME()), new File(tmpSolrHome).getAbsoluteFile());
initCore("solrconfig.xml", "schema.xml", new File(tmpSolrHome).getAbsolutePath());
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java Thu Mar 27 10:45:40 2014
@@ -18,6 +18,8 @@ package org.apache.solr;
*/
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -31,11 +33,10 @@ public class SolrTestCaseJ4Test extends
@BeforeClass
public static void beforeClass() throws Exception {
-
// Create a temporary directory that holds a core NOT named "collection1". Use the smallest configuration sets
// we can so we don't copy that much junk around.
createTempDir();
- tmpSolrHome = TEMP_DIR + File.separator + SolrTestCaseJ4Test.class.getSimpleName() + System.currentTimeMillis();
+ tmpSolrHome = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName()).getAbsolutePath();
File subHome = new File(new File(tmpSolrHome, "core0"), "conf");
assertTrue("Failed to make subdirectory ", subHome.mkdirs());
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java Thu Mar 27 10:45:40 2014
@@ -17,6 +17,7 @@
package org.apache.solr;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.TestUtil;
//import org.apache.lucene.util.LuceneTestCase;
//import org.apache.solr.util.AbstractSolrTestCase;
//import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -45,8 +46,7 @@ public class TestSolrCoreProperties exte
@BeforeClass
public static void beforeTest() throws Exception {
- File homeDir = new File(TEMP_DIR,
- "solrtest-TestSolrCoreProperties-" + System.currentTimeMillis());
+ File homeDir = TestUtil.createTempDir(TestSolrCoreProperties.class.getSimpleName());
File collDir = new File(homeDir, "collection1");
File dataDir = new File(collDir, "data");
File confDir = new File(collDir, "conf");
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java Thu Mar 27 10:45:40 2014
@@ -26,6 +26,8 @@ import java.util.regex.Pattern;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.BasicResponseHandler;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
@@ -415,15 +417,15 @@ public class BasicDistributedZk2Test ext
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("qt", "/replication");
params.set("command", "backup");
- File location = new File(TEMP_DIR, BasicDistributedZk2Test.class.getName() + "-backupdir-" + System.currentTimeMillis());
+ File location = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName() + "-backupdir");
params.set("location", location.getAbsolutePath());
QueryRequest request = new QueryRequest(params);
NamedList<Object> results = client.request(request );
checkForBackupSuccess(client, location);
-
}
+
private void checkForBackupSuccess(final HttpSolrServer client, File location)
throws InterruptedException, IOException {
class CheckStatus extends Thread {
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java Thu Mar 27 10:45:40 2014
@@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.ClusterState;
@@ -67,11 +68,11 @@ public class ClusterStateUpdateTest exte
private File dataDir4;
-
- private static final File solrHomeDirectory = new File(TEMP_DIR, "ZkControllerTest");
+ private static File solrHomeDirectory;
@BeforeClass
public static void beforeClass() throws IOException {
+ solrHomeDirectory = TestUtil.createTempDir(ClusterStateUpdateTest.class.getSimpleName());
System.setProperty("solrcloud.skip.autorecovery", "true");
System.setProperty("genericCoreNodeNames", "false");
if (solrHomeDirectory.exists()) {
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java Thu Mar 27 10:45:40 2014
@@ -17,10 +17,13 @@
package org.apache.solr.cloud;
+import java.io.File;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.ExternalPaths;
import org.junit.After;
import org.junit.Before;
@@ -28,8 +31,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-
public class TestMultiCoreConfBootstrap extends SolrTestCaseJ4 {
protected static Logger log = LoggerFactory.getLogger(TestMultiCoreConfBootstrap.class);
protected CoreContainer cores = null;
@@ -45,9 +46,7 @@ public class TestMultiCoreConfBootstrap
super.setUp();
createTempDir();
- dataDir2 = new File(TEMP_DIR, getSimpleClassName() + "-core1-"
- + System.currentTimeMillis());
- dataDir2.mkdirs();
+ dataDir2 = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
home = ExternalPaths.EXAMPLE_MULTICORE_HOME;
System.setProperty("solr.solr.home", home);
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java Thu Mar 27 10:45:40 2014
@@ -28,6 +28,8 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.filefilter.RegexFileFilter;
import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -231,11 +233,9 @@ public class ZkCLITest extends SolrTestC
assertEquals(confsetname, collectionProps.getStr("configName"));
// test down config
- File confDir = new File(TEMP_DIR,
- "solrtest-confdropspot-" + this.getClass().getName() + "-" + System.currentTimeMillis());
-
+ File confDir = new File(TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName()), "solrtest-confdropspot");
assertFalse(confDir.exists());
-
+
args = new String[] {"-zkhost", zkServer.getZkAddress(), "-cmd",
"downconfig", "-confdir", confDir.getAbsolutePath(), "-confname", confsetname};
ZkCLI.main(args);
@@ -281,8 +281,7 @@ public class ZkCLITest extends SolrTestC
byte [] data = new String("getFileNode-data").getBytes("UTF-8");
this.zkClient.create(getNode, data, CreateMode.PERSISTENT, true);
- File file = new File(TEMP_DIR,
- "solrtest-getfile-" + this.getClass().getName() + "-" + System.currentTimeMillis());
+ File file = TestUtil.createTempFile("solrtest-getfile", "");
String[] args = new String[] {"-zkhost", zkServer.getZkAddress(), "-cmd",
"getfile", getNode, file.getAbsolutePath()};
ZkCLI.main(args);
@@ -295,8 +294,7 @@ public class ZkCLITest extends SolrTestC
public void testGetFileNotExists() throws Exception {
String getNode = "/getFileNotExistsNode";
- File file = new File(TEMP_DIR,
- "solrtest-getfilenotexists-" + this.getClass().getName() + "-" + System.currentTimeMillis());
+ File file = TestUtil.createTempFile("solrtest-getfilenotexists", "");
String[] args = new String[] {"-zkhost", zkServer.getZkAddress(), "-cmd",
"getfile", getNode, file.getAbsolutePath()};
try {
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java Thu Mar 27 10:45:40 2014
@@ -17,11 +17,11 @@ package org.apache.solr.cloud.hdfs;
* limitations under the License.
*/
-import java.io.File;
import java.io.IOException;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.cloud.BasicDistributedZk2Test;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -38,9 +38,7 @@ public class HdfsBasicDistributedZk2Test
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
- HdfsBasicDistributedZk2Test.class.getName() + "_"
- + System.currentTimeMillis()).getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass();
}
@AfterClass