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 [4/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/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java (original)
+++ lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java Thu Mar 27 10:45:40 2014
@@ -17,6 +17,12 @@
package org.apache.solr.client.solrj;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
@@ -30,10 +36,6 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.util.ExternalPaths;
import org.junit.BeforeClass;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
/**
* Abstract base class for testing merge indexes command
*
@@ -73,8 +75,7 @@ public abstract class MergeIndexesExampl
// setup datadirs
System.setProperty( "solr.core0.data.dir", SolrTestCaseJ4.dataDir.getCanonicalPath() );
- dataDir2 = new File(TEMP_DIR, getClass().getName() + "-"
- + System.currentTimeMillis());
+ dataDir2 = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
dataDir2.mkdirs();
System.setProperty( "solr.core1.data.dir", this.dataDir2.getCanonicalPath() );
Modified: lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java (original)
+++ lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java Thu Mar 27 10:45:40 2014
@@ -21,6 +21,8 @@ import java.io.File;
import java.util.HashSet;
import java.util.Set;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest.ACTION;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;
@@ -56,17 +58,11 @@ public abstract class MultiCoreExampleTe
@Override public void setUp() throws Exception {
super.setUp();
- dataDir1 = new File(TEMP_DIR, getClass().getName() + "-core0-"
- + System.currentTimeMillis());
- dataDir1.mkdirs();
-
- dataDir2 = new File(TEMP_DIR, getClass().getName() + "-core1-"
- + System.currentTimeMillis());
- dataDir2.mkdirs();
-
+ dataDir1 = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName() + "-core0");
+ dataDir2 = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName() + "-core1");
+
System.setProperty( "solr.core0.data.dir", this.dataDir1.getCanonicalPath() );
System.setProperty( "solr.core1.data.dir", this.dataDir2.getCanonicalPath() );
-
}
@Override
Modified: lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (original)
+++ lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java Thu Mar 27 10:45:40 2014
@@ -31,6 +31,7 @@ import org.apache.http.client.HttpClient
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.QuickPatchThreadsFilter;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -284,10 +285,7 @@ public class TestLBHttpSolrServer extend
public void setUp() throws Exception {
- File home = new File(LuceneTestCase.TEMP_DIR,
- getClass().getName() + "-" + System.currentTimeMillis());
-
-
+ File home = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
homeDir = new File(home, name);
dataDir = new File(homeDir + "/collection1", "data");
confDir = new File(homeDir + "/collection1", "conf");
Modified: lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java (original)
+++ lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java Thu Mar 27 10:45:40 2014
@@ -18,6 +18,7 @@ package org.apache.solr.client.solrj.emb
*/
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.core.CoreContainer;
@@ -38,13 +39,6 @@ public abstract class AbstractEmbeddedSo
protected CoreContainer cores = null;
protected File tempDir;
- protected void createTempDir() {
- if (tempDir == null) {
- tempDir = new File(TEMP_DIR, "solrtest-" + getTestClass().getSimpleName() + "-" + System.currentTimeMillis());
- tempDir.mkdirs();
- }
- }
-
@Override
@Before
public void setUp() throws Exception {
@@ -55,7 +49,7 @@ public abstract class AbstractEmbeddedSo
System.out.println("Solr home: " + SOLR_HOME.getAbsolutePath());
//The index is always stored within a temporary directory
- createTempDir();
+ tempDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
File dataDir = new File(tempDir,"data1");
File dataDir2 = new File(tempDir,"data2");
Modified: lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Thu Mar 27 10:45:40 2014
@@ -23,6 +23,7 @@ import java.util.Random;
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.apache.solr.util.ExternalPaths;
import org.eclipse.jetty.server.Connector;
@@ -58,9 +59,7 @@ public class JettyWebappTest extends Sol
System.setProperty("solr.solr.home", ExternalPaths.EXAMPLE_HOME);
System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
- File dataDir = new File(LuceneTestCase.TEMP_DIR,
- getClass().getName() + "-" + System.currentTimeMillis());
- dataDir.mkdirs();
+ File dataDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
System.setProperty("solr.data.dir", dataDir.getCanonicalPath());
String path = ExternalPaths.WEBAPP_HOME;
Modified: lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java (original)
+++ lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java Thu Mar 27 10:45:40 2014
@@ -17,9 +17,14 @@
package org.apache.solr.client.solrj.request;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.core.Is.is;
+
+import java.io.File;
+
import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.embedded.AbstractEmbeddedSolrServerTestCase;
@@ -38,10 +43,8 @@ import org.junit.rules.TestRule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.core.Is.is;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
@ThreadLeakFilters(defaultFilters = true, filters = {SolrIgnoredThreadsFilter.class})
public class TestCoreAdmin extends AbstractEmbeddedSolrServerTestCase {
@@ -73,7 +76,7 @@ public class TestCoreAdmin extends Abstr
public void testConfigSet() throws Exception {
SolrServer server = getSolrAdmin();
- File testDir = createTestDirectory();
+ File testDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
File newCoreInstanceDir = new File(testDir, "newcore");
@@ -91,18 +94,12 @@ public class TestCoreAdmin extends Abstr
}
- private File createTestDirectory() {
- File tmp = new File(TEMP_DIR, "solrtest-" + getTestClass().getSimpleName() + "-" + System.currentTimeMillis());
- assertTrue("Couldn't create temporary directory " + tmp.getAbsolutePath(), tmp.mkdirs());
- return tmp;
- }
-
@Test
public void testCustomUlogDir() throws Exception {
SolrServer server = getSolrAdmin();
- File tmp = createTestDirectory();
+ File tmp = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
log.info("Creating cores underneath {}", tmp);
Modified: lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java (original)
+++ lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java Thu Mar 27 10:45:40 2014
@@ -27,6 +27,7 @@ import java.net.URL;
import org.apache.commons.io.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
import org.apache.solr.core.SolrResourceLoader;
/**
@@ -46,7 +47,7 @@ public class ContentStreamTest extends L
{
InputStream is = new SolrResourceLoader(null, null).openResource( "solrj/README" );
assertNotNull( is );
- File file = new File(TEMP_DIR, "README");
+ File file = TestUtil.createTempFile("README", "");
FileOutputStream os = new FileOutputStream(file);
IOUtils.copy(is, os);
os.close();
@@ -62,7 +63,7 @@ public class ContentStreamTest extends L
{
InputStream is = new SolrResourceLoader(null, null).openResource( "solrj/README" );
assertNotNull( is );
- File file = new File(TEMP_DIR, "README");
+ File file = TestUtil.createTempFile("README", "");
FileOutputStream os = new FileOutputStream(file);
IOUtils.copy(is, os);
os.close();
Modified: lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Thu Mar 27 10:45:40 2014
@@ -37,6 +37,7 @@ import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.util.Constants;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.SolrServer;
@@ -53,7 +54,6 @@ import org.apache.solr.common.params.Mod
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.schema.TrieDateField;
-import org.apache.solr.util.AbstractSolrTestCase;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -278,8 +278,7 @@ public abstract class BaseDistributedSea
super.setUp();
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
- testDir = new File(TEMP_DIR,
- getClass().getName() + "-" + System.currentTimeMillis());
+ testDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
testDir.mkdirs();
}
Modified: lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Thu Mar 27 10:45:40 2014
@@ -540,7 +540,7 @@ public abstract class SolrTestCaseJ4 ext
}
/**
- * The directory used to story the index managed by the TestHarness h
+ * The directory used to story the index managed by the TestHarness
*/
protected static volatile File dataDir;
@@ -563,10 +563,7 @@ public abstract class SolrTestCaseJ4 ext
private static String factoryProp;
public static void createTempDir() {
- String cname = getSimpleClassName();
- dataDir = new File(TEMP_DIR,
- "solrtest-" + cname + "-" + System.currentTimeMillis());
- dataDir.mkdirs();
+ dataDir = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName() + "-datadir");
System.err.println("Creating dataDir: " + dataDir.getAbsolutePath());
}
Modified: lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1582248&r1=1582218&r2=1582248&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Thu Mar 27 10:45:40 2014
@@ -40,6 +40,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.commons.io.FilenameUtils;
import org.apache.http.params.CoreConnectionPNames;
+import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrRequest;
@@ -284,8 +285,7 @@ public abstract class AbstractFullDistri
// System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
System.setProperty(ZkStateReader.NUM_SHARDS_PROP, "1");
- File controlJettyDir = new File(TEMP_DIR,
- getClass().getName() + "-controljetty-" + System.currentTimeMillis());
+ File controlJettyDir = TestUtil.createTempDir(getClass().getSimpleName() + "-controljetty");
setupJettySolrHome(controlJettyDir);
controlJetty = createJetty(controlJettyDir, testDir + "/control/data"); // don't pass shard name... let it default to "shard1"
@@ -360,8 +360,7 @@ public abstract class AbstractFullDistri
for (int i = 1; i <= numJettys; i++) {
if (sb.length() > 0) sb.append(',');
int cnt = this.jettyIntCntr.incrementAndGet();
- File jettyDir = new File(TEMP_DIR,
- getClass().getName() + "-jetty" + cnt + "-" + System.currentTimeMillis());
+ File jettyDir = TestUtil.createTempDir(getClass().getSimpleName() + "-jetty" + cnt);
jettyDir.mkdirs();
setupJettySolrHome(jettyDir);
log.info("create jetty " + i);
@@ -417,7 +416,6 @@ public abstract class AbstractFullDistri
protected SolrServer startCloudJetty(String collection, String shard) throws Exception {
-
// TODO: use the collection string!!!!
collection = DEFAULT_COLLECTION;
@@ -425,8 +423,7 @@ public abstract class AbstractFullDistri
int cnt = this.jettyIntCntr.incrementAndGet();
- File jettyDir = new File(TEMP_DIR,
- getClass().getName() + "-jetty" + cnt + "-" + System.currentTimeMillis());
+ File jettyDir = TestUtil.createTempDir(getClass().getSimpleName() + "-jetty" + cnt);
jettyDir.mkdirs();
org.apache.commons.io.FileUtils.copyDirectory(new File(getSolrHome()), jettyDir);
JettySolrRunner j = createJetty(jettyDir, testDir + "/jetty" + cnt, shard, "solrconfig.xml", null);