You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/30 19:37:32 UTC
svn commit: r1583163 - in /lucene/dev/branches/solr5914/solr:
contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
core/src/java/org/apache/solr/handler/admin/ core/src/test/org/apache/solr/
core/src/test/org/apache/solr/cloud/ core/s...
Author: markrmiller
Date: Sun Mar 30 17:37:31 2014
New Revision: 1583163
URL: http://svn.apache.org/r1583163
Log:
SOLR-5914: Polish up createTempDir calls.
Modified:
lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java
lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
lucene/dev/branches/solr5914/solr/core/src/java/org/apache/solr/handler/admin/EditFileRequestHandler.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
lucene/dev/branches/solr5914/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
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=1583163&r1=1583162&r2=1583163&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 Sun Mar 30 17:37:31 2014
@@ -16,13 +16,11 @@ 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 junit.framework.Assert;
+
import org.junit.After;
import org.junit.Before;
-import junit.framework.Assert;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
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=1583163&r1=1583162&r2=1583163&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 Sun Mar 30 17:37:31 2014
@@ -57,11 +57,6 @@ public class TestNonWritablePersistFile
initCore("dataimport-solrconfig.xml", "dataimport-schema.xml",
new File(tmpSolrHome).getAbsolutePath());
}
-
- @AfterClass
- public static void destroyTempSolrHomeAndCore() throws Exception {
- FileUtils.deleteDirectory(new File(tmpSolrHome).getAbsoluteFile());
- }
@Test
@SuppressWarnings("unchecked")
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=1583163&r1=1583162&r2=1583163&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 Sun Mar 30 17:37:31 2014
@@ -43,21 +43,10 @@ public class TestSimplePropertiesWriter
@Before
public void spwBefore() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", createTempDir());
- tmpdir.delete();
- tmpdir.mkdir();
- fileLocation = tmpdir.getPath();
+ fileLocation = createTempDir().getAbsolutePath();
fileName = "the.properties";
}
- @After
- public void spwAfter() throws Exception {
- //If an Assume was tripped while setting up the test,
- //the file might not ever have been created...
- if(fileLocation!=null) {
- new File(fileLocation + File.separatorChar + fileName).delete();
- new File(fileLocation).delete();
- }
- }
+
@Test
public void testSimplePropertiesWriter() throws Exception {
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=1583163&r1=1583162&r2=1583163&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 Sun Mar 30 17:37:31 2014
@@ -331,9 +331,7 @@ public class TestXPathEntityProcessor ex
@Test
public void withDefaultSolrAndXsl() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", createTempDir());
- tmpdir.delete();
- tmpdir.mkdir();
+ File tmpdir = createTempDir();
AbstractDataImportHandlerTestCase.createFile(tmpdir, "x.xsl", xsl.getBytes("UTF-8"),
false);
Modified: lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java (original)
+++ lucene/dev/branches/solr5914/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java Sun Mar 30 17:37:31 2014
@@ -17,7 +17,6 @@ package org.apache.solr.handler.dataimpo
* limitations under the License.
*/
-import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -50,8 +49,7 @@ public class TestZKPropertiesWriter exte
@BeforeClass
public static void dihZk_beforeClass() throws Exception {
- zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ zkDir = createTempDir("zkData").getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
Modified: lucene/dev/branches/solr5914/solr/core/src/java/org/apache/solr/handler/admin/EditFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/java/org/apache/solr/handler/admin/EditFileRequestHandler.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/java/org/apache/solr/handler/admin/EditFileRequestHandler.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/java/org/apache/solr/handler/admin/EditFileRequestHandler.java Sun Mar 30 17:37:31 2014
@@ -311,15 +311,6 @@ public class EditFileRequestHandler exte
rsp.setException(new SolrException(ErrorCode.SERVER_ERROR,
"Caught IO exception when trying to verify configs. " + ex.getMessage()));
return false;
- } finally {
- if (home != null) {
- try {
- FileUtils.deleteDirectory(home);
- } catch (IOException e) {
- log.warn("Caught IO exception trying to delete temporary directory " + home + e.getMessage());
- return true; // Don't fail for this reason!
- }
- }
}
}
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=1583163&r1=1583162&r2=1583163&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 Sun Mar 30 17:37:31 2014
@@ -49,7 +49,7 @@ public class AnalysisAfterCoreReloadTest
@AfterClass
public static void AfterClass() throws Exception {
- FileUtils.deleteDirectory(new File(tmpSolrHome).getAbsoluteFile());
+
}
public void testStopwordsAfterCoreReload() throws Exception {
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=1583163&r1=1583162&r2=1583163&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 Sun Mar 30 17:37:31 2014
@@ -51,7 +51,7 @@ public class SolrTestCaseJ4Test extends
@AfterClass
public static void AfterClass() throws Exception {
- FileUtils.deleteDirectory(new File(tmpSolrHome).getAbsoluteFile());
+
}
@Test
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=1583163&r1=1583162&r2=1583163&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 Sun Mar 30 17:37:31 2014
@@ -73,12 +73,9 @@ public class ClusterStateUpdateTest exte
@BeforeClass
public static void beforeClass() throws IOException {
- solrHomeDirectory = new File(createTempDir(), "ZkControllerTest");
+ solrHomeDirectory = createTempDir();
System.setProperty("solrcloud.skip.autorecovery", "true");
System.setProperty("genericCoreNodeNames", "false");
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
copyMinFullSetup(solrHomeDirectory);
}
@@ -87,9 +84,6 @@ public class ClusterStateUpdateTest exte
public static void afterClass() throws InterruptedException, IOException {
System.clearProperty("solrcloud.skip.autorecovery");
System.clearProperty("genericCoreNodeNames");
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
}
@@ -97,9 +91,8 @@ public class ClusterStateUpdateTest exte
public void setUp() throws Exception {
super.setUp();
System.setProperty("zkClientTimeout", "3000");
- File tmpDir = createTempDir();
- zkDir = tmpDir.getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ File tmpDir = createTempDir("zkData");
+ zkDir = tmpDir.getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
System.setProperty("zkHost", zkServer.getZkAddress());
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java Sun Mar 30 17:37:31 2014
@@ -37,8 +37,7 @@ public class ConnectionManagerTest exten
public void testConnectionManager() throws Exception {
// setup a SolrZkClient to do some getBaseUrlForNodeName testing
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
try {
@@ -72,8 +71,7 @@ public class ConnectionManagerTest exten
public void testLikelyExpired() throws Exception {
// setup a SolrZkClient to do some getBaseUrlForNodeName testing
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
try {
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java Sun Mar 30 17:37:31 2014
@@ -79,8 +79,7 @@ public class LeaderElectionIntegrationTe
System.setProperty("zkClientTimeout", "8000");
- zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ zkDir = createTempDir("zkData").getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
System.setProperty("zkHost", zkServer.getZkAddress());
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java Sun Mar 30 17:37:31 2014
@@ -66,8 +66,7 @@ public class LeaderElectionTest extends
@Override
public void setUp() throws Exception {
super.setUp();
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();;
server = new ZkTestServer(zkDir);
server.setTheTickTime(1000);
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Sun Mar 30 17:37:31 2014
@@ -203,8 +203,7 @@ public class OverseerTest extends SolrTe
@Test
public void testShardAssignment() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
@@ -259,8 +258,7 @@ public class OverseerTest extends SolrTe
@Test
public void testBadQueueItem() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
@@ -334,8 +332,7 @@ public class OverseerTest extends SolrTe
@Test
public void testShardAssignmentBigger() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
final int nodeCount = random().nextInt(50)+50; //how many simulated nodes (num of threads)
final int coreCount = random().nextInt(100)+100; //how many cores to register
@@ -505,8 +502,7 @@ public class OverseerTest extends SolrTe
@Test
public void testStateChange() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
@@ -602,8 +598,7 @@ public class OverseerTest extends SolrTe
@Test
public void testOverseerFailure() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
@@ -725,8 +720,7 @@ public class OverseerTest extends SolrTe
@Test
public void testShardLeaderChange() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
final ZkTestServer server = new ZkTestServer(zkDir);
SolrZkClient controllerClient = null;
ZkStateReader reader = null;
@@ -781,8 +775,7 @@ public class OverseerTest extends SolrTe
@Test
public void testDoubleAssignment() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
@@ -846,8 +839,7 @@ public class OverseerTest extends SolrTe
@Test
public void testPlaceholders() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java Sun Mar 30 17:37:31 2014
@@ -77,8 +77,7 @@ public class SliceStateUpdateTest extend
System.setProperty("zkClientTimeout", "3000");
- zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ zkDir = createTempDir("zkData").getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
System.setProperty("zkHost", zkServer.getZkAddress());
@@ -99,9 +98,9 @@ public class SliceStateUpdateTest extend
CreateMode.PERSISTENT, true);
zkClient.close();
- dataDir1 = new File(createTempDir() + File.separator + "data1");
+ dataDir1 = createTempDir("data1");
- dataDir2 = new File(createTempDir() + File.separator + "data2");
+ dataDir2 = createTempDir("data2");
// set some system properties for use by tests
System.setProperty("solr.test.sys.prop1", "propone");
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java Sun Mar 30 17:37:31 2014
@@ -43,8 +43,7 @@ public class TestZkChroot extends SolrTe
public void setUp() throws Exception {
super.setUp();
- zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ zkDir = createTempDir("zkData").getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
home = ExternalPaths.EXAMPLE_HOME;
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Sun Mar 30 17:37:31 2014
@@ -81,8 +81,7 @@ public class ZkControllerTest extends So
ZkController.generateNodeName("foo-bar", "77", "/solr/sub_dir/"));
// setup a SolrZkClient to do some getBaseUrlForNodeName testing
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
try {
@@ -152,8 +151,7 @@ public class ZkControllerTest extends So
@Test
public void testReadConfigName() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
CoreContainer cc = null;
ZkTestServer server = new ZkTestServer(zkDir);
@@ -208,8 +206,7 @@ public class ZkControllerTest extends So
@Test
public void testUploadToCloud() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = new ZkTestServer(zkDir);
ZkController zkController = null;
@@ -261,8 +258,7 @@ public class ZkControllerTest extends So
@Test
public void testGetHostName() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
CoreContainer cc = null;
ZkTestServer server = new ZkTestServer(zkDir);
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java Sun Mar 30 17:37:31 2014
@@ -40,8 +40,7 @@ public class ZkSolrClientTest extends Ab
}
public void testConnect() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = null;
server = new ZkTestServer(zkDir);
@@ -54,8 +53,7 @@ public class ZkSolrClientTest extends Ab
}
public void testMakeRootNode() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = null;
server = new ZkTestServer(zkDir);
@@ -73,8 +71,7 @@ public class ZkSolrClientTest extends Ab
}
public void testClean() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = null;
server = new ZkTestServer(zkDir);
@@ -99,8 +96,7 @@ public class ZkSolrClientTest extends Ab
}
public void testReconnect() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
ZkTestServer server = null;
SolrZkClient zkClient = null;
try {
@@ -193,8 +189,7 @@ public class ZkSolrClientTest extends Ab
}
public void testWatchChildren() throws Exception {
- String zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ String zkDir = createTempDir("zkData").getAbsolutePath();
final AtomicInteger cnt = new AtomicInteger();
ZkTestServer server = new ZkTestServer(zkDir);
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java Sun Mar 30 17:37:31 2014
@@ -45,12 +45,7 @@ public class CoreContainerCoreInitFailur
cc = null;
}
- if (null != solrHome) {
- if (solrHome.exists()) {
- FileUtils.deleteDirectory(solrHome);
- }
- solrHome = null;
- }
+ solrHome = null;
}
public void testFlowWithEmpty() throws Exception {
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java Sun Mar 30 17:37:31 2014
@@ -86,7 +86,6 @@ public class OpenCloseCoreStressTest ext
cumulativeDocs = 0;
solrHomeDirectory = createTempDir();
- FileUtils.deleteDirectory(solrHomeDirectory); // Ensure that a failed test didn't leave something lying around.
jetty = new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), "/solr", 0, null, null, true, null, sslConfig);
}
@@ -94,7 +93,6 @@ public class OpenCloseCoreStressTest ext
@After
public void tearDownServer() throws Exception {
if (jetty != null) jetty.stop();
- FileUtils.deleteDirectory(solrHomeDirectory);
for(SolrServer server:indexingServers) {
server.shutdown();
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java Sun Mar 30 17:37:31 2014
@@ -40,7 +40,7 @@ public class SolrCoreCheckLockOnStartupT
System.setProperty("solr.directoryFactory", "org.apache.solr.core.SimpleFSDirectoryFactory");
IndexWriterConfig indexWriterConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, null);
- Directory directory = newFSDirectory(new File(createTempDir(), "index"));
+ Directory directory = newFSDirectory(createTempDir("index"));
//creates a new index on the known location
new IndexWriter(
directory,
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Sun Mar 30 17:37:31 2014
@@ -33,8 +33,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.handler.SnapPuller;
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestConfigSets.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestConfigSets.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestConfigSets.java Sun Mar 30 17:37:31 2014
@@ -41,9 +41,8 @@ public class TestConfigSets extends Solr
public static String solrxml = "<solr><str name=\"configSetBaseDir\">${configsets:configsets}</str></solr>";
- public CoreContainer setupContainer(String testName, String configSetsBaseDir) {
- File testDirectory = new File(createTempDir(), testName);
- testDirectory.mkdirs();
+ public CoreContainer setupContainer(String configSetsBaseDir) {
+ File testDirectory = createTempDir();
System.setProperty("configsets", configSetsBaseDir);
@@ -58,7 +57,7 @@ public class TestConfigSets extends Solr
public void testConfigSetServiceFindsConfigSets() {
CoreContainer container = null;
try {
- container = setupContainer("findsConfigSets", getFile("solr/configsets").getAbsolutePath());
+ container = setupContainer(getFile("solr/configsets").getAbsolutePath());
String testDirectory = container.getResourceLoader().getInstanceDir();
SolrCore core1 = container.create("core1", testDirectory + "/core1", "configSet", "configset-2");
@@ -77,7 +76,7 @@ public class TestConfigSets extends Solr
public void testNonExistentConfigSetThrowsException() {
CoreContainer container = null;
try {
- container = setupContainer("badConfigSet", getFile("solr/configsets").getAbsolutePath());
+ container = setupContainer(getFile("solr/configsets").getAbsolutePath());
String testDirectory = container.getResourceLoader().getInstanceDir();
container.create("core1", testDirectory + "/core1", "configSet", "nonexistent");
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Sun Mar 30 17:37:31 2014
@@ -34,7 +34,6 @@ import javax.xml.parsers.ParserConfigura
import org.apache.commons.io.FileUtils;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.handler.admin.CollectionsHandler;
@@ -184,7 +183,6 @@ public class TestCoreContainer extends S
assertNull(ret);
} finally {
cores.shutdown();
- FileUtils.deleteDirectory(solrHomeDirectory);
}
}
@@ -194,22 +192,15 @@ public class TestCoreContainer extends S
assertNotNull(h.getCoreContainer().getLogging());
}
- private void SetUpHome(File solrHomeDirectory, String xmlFile) throws IOException {
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
- assertTrue("Failed to mkdirs workDir", solrHomeDirectory.mkdirs());
- try {
- File solrXmlFile = new File(solrHomeDirectory, "solr.xml");
- BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(solrXmlFile), IOUtils.CHARSET_UTF_8));
- out.write(xmlFile);
- out.close();
- } catch (IOException e) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- throw e;
- }
-
- //init
+ private void SetUpHome(File solrHomeDirectory, String xmlFile)
+ throws IOException {
+ File solrXmlFile = new File(solrHomeDirectory, "solr.xml");
+ BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
+ new FileOutputStream(solrXmlFile), IOUtils.CHARSET_UTF_8));
+ out.write(xmlFile);
+ out.close();
+
+ // init
System.setProperty(SOLR_HOME_PROP, solrHomeDirectory.getAbsolutePath());
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java Sun Mar 30 17:37:31 2014
@@ -110,9 +110,7 @@ public class TestCoreDiscovery extends S
@After
public void after() throws Exception {
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
+
}
// Test the basic setup, create some dirs with core.properties files in them, but solr.xml has discoverCores
@@ -208,12 +206,11 @@ public class TestCoreDiscovery extends S
assertNotNull(core2);
} finally {
cc.shutdown();
- if (alt.exists()) FileUtils.deleteDirectory(alt);
}
}
@Test
public void testNoCoreDir() throws Exception {
- File noCoreDir = new File(createTempDir(), "noCoreDir");
+ File noCoreDir = createTempDir();
setMeUp(noCoreDir.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true),
new File(noCoreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
@@ -226,7 +223,6 @@ public class TestCoreDiscovery extends S
assertNotNull(core2);
} finally {
cc.shutdown();
- if (noCoreDir.exists()) FileUtils.deleteDirectory(noCoreDir);
}
}
// For testing whether finding a solr.xml overrides looking at solr.properties
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java Sun Mar 30 17:37:31 2014
@@ -98,9 +98,6 @@ public class TestSolrXmlPersistence exte
origMatchesPersist(cc, SOLR_XML_LOTS_SYSVARS);
} finally {
cc.shutdown();
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
}
}
@@ -259,9 +256,6 @@ public class TestSolrXmlPersistence exte
origMatchesPersist(cc, SOLR_XML_MINIMAL);
} finally {
cc.shutdown();
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
}
}
@@ -399,10 +393,6 @@ public class TestSolrXmlPersistence exte
} finally {
cc.shutdown();
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
-
}
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java Sun Mar 30 17:37:31 2014
@@ -59,35 +59,26 @@ public class TestSolrXmlPersistor exten
@Test
public void simpleCoreDescriptorIsPersisted() throws IOException {
-
+
final String solrxml = "<solr><cores></cores></solr>";
-
+
final File solrHomeDirectory = createTempDir();
-
- try {
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
- copyMinFullSetup(solrHomeDirectory);
-
- CoreContainer cc = new CoreContainer(solrHomeDirectory.getAbsolutePath());
-
- final CoreDescriptor cd = new CoreDescriptor(cc, "testcore", "instance/dir/");
- List<CoreDescriptor> cds = ImmutableList.of(cd);
-
- SolrXMLCoresLocator persistor = new SolrXMLCoresLocator(solrxml, null);
- String xml = persistor.buildSolrXML(cds);
-
- assertTrue(xml.contains("<solr><cores>"));
- assertTrue(xml.contains("name=\"testcore\""));
- assertTrue(xml.contains("instanceDir=\"instance/dir/\""));
- assertTrue(xml.contains("</cores></solr>"));
- } finally {
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
-
- }
+
+ copyMinFullSetup(solrHomeDirectory);
+
+ CoreContainer cc = new CoreContainer(solrHomeDirectory.getAbsolutePath());
+
+ final CoreDescriptor cd = new CoreDescriptor(cc, "testcore",
+ "instance/dir/");
+ List<CoreDescriptor> cds = ImmutableList.of(cd);
+
+ SolrXMLCoresLocator persistor = new SolrXMLCoresLocator(solrxml, null);
+ String xml = persistor.buildSolrXML(cds);
+
+ assertTrue(xml.contains("<solr><cores>"));
+ assertTrue(xml.contains("name=\"testcore\""));
+ assertTrue(xml.contains("instanceDir=\"instance/dir/\""));
+ assertTrue(xml.contains("</cores></solr>"));
}
@Test
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java Sun Mar 30 17:37:31 2014
@@ -50,10 +50,6 @@ public class CoreAdminCreateDiscoverTest
useFactory(null); // I require FS-based indexes for this test.
solrHomeDirectory = createTempDir();
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
- assertTrue("Failed to mkdirs workDir", solrHomeDirectory.mkdirs());
setupNoCoreTest(solrHomeDirectory, null);
@@ -63,9 +59,6 @@ public class CoreAdminCreateDiscoverTest
@AfterClass
public static void afterClass() throws Exception {
admin = null; // Release it or the test harness complains.
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
}
private static void setupCore(String coreName, boolean blivet) throws IOException {
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java Sun Mar 30 17:37:31 2014
@@ -122,20 +122,11 @@ public class CoreAdminHandlerTest extend
assertTrue("Should have found index dir at " + test.getAbsolutePath(), test.exists());
test = new File(test,"segments.gen");
assertTrue("Should have found segments.gen at " + test.getAbsolutePath(), test.exists());
-
- // Cleanup
- FileUtils.deleteDirectory(workDir);
-
}
@Test
public void testCoreAdminHandler() throws Exception {
- final File workDir = new File(initCoreDataDir, this.getClass().getName());
-
- if (workDir.exists()) {
- FileUtils.deleteDirectory(workDir);
- }
- assertTrue("Failed to mkdirs workDir", workDir.mkdirs());
+ final File workDir = createTempDir();
final CoreContainer cores = h.getCoreContainer();
@@ -214,9 +205,6 @@ public class CoreAdminHandlerTest extend
// :TODO: because of SOLR-3665 we can't ask for status from all cores
- // cleanup
- FileUtils.deleteDirectory(workDir);
-
}
@Test
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java Sun Mar 30 17:37:31 2014
@@ -73,11 +73,6 @@ public class CoreMergeIndexesAdminHandle
public void testMergeIndexesCoreAdminHandler() throws Exception {
final File workDir = createTempDir();
- if (workDir.exists()) {
- FileUtils.deleteDirectory(workDir);
- }
- assertTrue("Failed to mkdirs workDir", workDir.mkdirs());
-
final CoreContainer cores = h.getCoreContainer();
final CoreAdminHandler admin = new CoreAdminHandler(cores);
@@ -104,8 +99,5 @@ public class CoreMergeIndexesAdminHandle
}
dirFactory.fail = false;
}
-
- // cleanup
- FileUtils.deleteDirectory(workDir);
}
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java Sun Mar 30 17:37:31 2014
@@ -49,7 +49,7 @@ public class DistributedDebugComponentTe
}
private static File createSolrHome() throws Exception {
- File workDir = new File(createTempDir(), DistributedDebugComponentTest.class.getName());
+ File workDir = createTempDir();
setupJettyTestHome(workDir, "collection1");
FileUtils.copyDirectory(new File(workDir, "collection1"), new File(workDir, "collection2"));
return workDir;
@@ -57,7 +57,7 @@ public class DistributedDebugComponentTe
@AfterClass
public static void afterTest() throws Exception {
- cleanUpJettyHome(solrHome);
+
}
@Before
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java Sun Mar 30 17:37:31 2014
@@ -62,7 +62,7 @@ public class TestRemoteStreaming extends
@AfterClass
public static void afterTest() throws Exception {
- cleanUpJettyHome(solrHomeDirectory);
+
}
@Before
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java Sun Mar 30 17:37:31 2014
@@ -22,8 +22,6 @@ import java.util.SortedMap;
import java.util.TreeMap;
import org.apache.commons.io.FileUtils;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
import org.apache.solr.util.RestTestBase;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.After;
@@ -46,8 +44,7 @@ public class TestManagedStopFilterFactor
@Before
public void before() throws Exception {
- tmpSolrHome = new File(createTempDir() + File.separator + TestManagedStopFilterFactory.class.getSimpleName()
- + System.currentTimeMillis());
+ tmpSolrHome = createTempDir();
tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
@@ -67,7 +64,6 @@ public class TestManagedStopFilterFactor
private void after() throws Exception {
jetty.stop();
jetty = null;
- FileUtils.deleteDirectory(tmpSolrHome);
System.clearProperty("managed.schema.mutable");
System.clearProperty("enable.update.log");
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java Sun Mar 30 17:37:31 2014
@@ -24,8 +24,6 @@ import java.util.ArrayList;
import org.apache.commons.codec.Charsets;
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.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.ContentStream;
@@ -54,7 +52,7 @@ public class ModifyConfFileTest extends
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
- solrHomeDirectory = TestUtil.createTempDir(LuceneTestCase.getTestClass().getSimpleName());
+ solrHomeDirectory = createTempDir();
copySolrHomeToTemp(solrHomeDirectory, "core1", true);
FileUtils.write(new File(new File(solrHomeDirectory, "core1"), "core.properties"), "", Charsets.UTF_8.toString());
@@ -148,9 +146,6 @@ public class ModifyConfFileTest extends
} finally {
cc.shutdown();
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
}
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java Sun Mar 30 17:37:31 2014
@@ -25,8 +25,6 @@ import java.util.regex.Pattern;
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.common.SolrException;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.util.NamedList;
@@ -48,8 +46,7 @@ public class TestManagedSchema extends A
@Before
private void initManagedSchemaCore() throws Exception {
- final String tmpSolrHomePath = createTempDir().getAbsolutePath();
- tmpSolrHome = new File(tmpSolrHomePath).getAbsoluteFile();
+ tmpSolrHome = createTempDir();
tmpConfDir = new File(tmpSolrHome, confDir);
File testHomeConfDir = new File(TEST_HOME(), confDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-managed-schema.xml"), tmpConfDir);
@@ -69,9 +66,8 @@ public class TestManagedSchema extends A
}
@After
- private void deleteCoreAndTempSolrHomeDirectory() throws Exception {
+ private void afterClass() throws Exception {
deleteCore();
- FileUtils.deleteDirectory(tmpSolrHome);
System.clearProperty("managed.schema.mutable");
System.clearProperty("enable.update.log");
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java Sun Mar 30 17:37:31 2014
@@ -76,9 +76,7 @@ public class TestRecoveryHdfs extends So
@BeforeClass
public static void beforeClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(createTempDir(),
- HdfsBasicDistributedZk2Test.class.getName() + "_"
- + System.currentTimeMillis()).getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
hdfsUri = dfsCluster.getFileSystem().getUri().toString();
try {
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java Sun Mar 30 17:37:31 2014
@@ -66,8 +66,7 @@ public class TestSearcherReuse extends S
}
@AfterClass
- private static void deleteCoreAndTempSolrHomeDirectory() throws Exception {
- FileUtils.deleteDirectory(solrHome);
+ private static void afterClass() throws Exception {
solrHome = null;
}
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java Sun Mar 30 17:37:31 2014
@@ -45,14 +45,14 @@ public class CacheHeaderTest extends Cac
@BeforeClass
public static void beforeTest() throws Exception {
- solrHomeDirectory = new File(createTempDir(), "CacheHeaderTest");
+ solrHomeDirectory = createTempDir();
setupJettyTestHome(solrHomeDirectory, "collection1");
createJetty(solrHomeDirectory.getAbsolutePath(), null, null);
}
@AfterClass
public static void afterTest() throws Exception {
- cleanUpJettyHome(solrHomeDirectory);
+
}
protected static final String CONTENTS = "id\n100\n101\n102";
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java Sun Mar 30 17:37:31 2014
@@ -106,7 +106,7 @@ public class FileBasedSpellCheckerTest e
spellchecker.add(AbstractLuceneSpellChecker.LOCATION, "spellings.txt");
spellchecker.add(AbstractLuceneSpellChecker.FIELD, "teststop");
spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
- File indexDir = new File(createTempDir(), "spellingIdx");
+ File indexDir = createTempDir();
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(SolrSpellChecker.FIELD_TYPE, "teststop");
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Sun Mar 30 17:37:31 2014
@@ -186,7 +186,7 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File indexDir = new File(createTempDir(), "spellingIdx");
+ File indexDir = createTempDir();
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(AbstractLuceneSpellChecker.FIELD, "title");
@@ -244,7 +244,6 @@ public class IndexBasedSpellCheckerTest
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
File indexDir = createTempDir();
- indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(AbstractLuceneSpellChecker.FIELD, "title");
spellchecker.add(AbstractLuceneSpellChecker.SPELLCHECKER_ARG_NAME, spellchecker);
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java Sun Mar 30 17:37:31 2014
@@ -116,7 +116,6 @@ public class BlockDirectoryTest extends
public void tearDown() throws Exception {
super.tearDown();
directory.close();
- FileUtils.deleteDirectory(file);
}
@Test
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java Sun Mar 30 17:37:31 2014
@@ -17,7 +17,6 @@ package org.apache.solr.store.hdfs;
* limitations under the License.
*/
-import java.io.File;
import java.io.IOException;
import java.net.URI;
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java Sun Mar 30 17:37:31 2014
@@ -57,28 +57,9 @@ public class SolrIndexSplitterTest exten
super.setUp();
clearIndex();
assertU(commit());
- File dataDir = createTempDir();
- indexDir1 = new File(dataDir, this.getClass().getName()
- + "_testSplit1");
- indexDir2 = new File(dataDir, this.getClass().getName()
- + "_testSplit2");
- indexDir3 = new File(dataDir, this.getClass().getName()
- + "_testSplit3");
-
- if (indexDir1.exists()) {
- FileUtils.deleteDirectory(indexDir1);
- }
- assertTrue("Failed to mkdirs indexDir1 for split index", indexDir1.mkdirs());
-
- if (indexDir2.exists()) {
- FileUtils.deleteDirectory(indexDir2);
- }
- assertTrue("Failed to mkdirs indexDir2 for split index", indexDir2.mkdirs());
-
- if (indexDir3.exists()) {
- FileUtils.deleteDirectory(indexDir3);
- }
- assertTrue("Failed to mkdirs indexDir3 for split index", indexDir3.mkdirs());
+ indexDir1 = createTempDir("_testSplit1");
+ indexDir2 = createTempDir("_testSplit2");
+ indexDir3 = createTempDir("_testSplit3");
}
@Test
@@ -272,10 +253,6 @@ public class SolrIndexSplitterTest exten
@Test
public void testSplitByRouteKey() throws Exception {
File indexDir = createTempDir();
- if (indexDir.exists()) {
- FileUtils.deleteDirectory(indexDir);
- }
- indexDir.mkdirs();
CompositeIdRouter r1 = new CompositeIdRouter();
String splitKey = "sea-line!";
Modified: lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/solr5914/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java Sun Mar 30 17:37:31 2014
@@ -17,12 +17,12 @@
package org.apache.solr.update.processor;
+import java.io.File;
+import java.util.Date;
+
import org.apache.commons.io.FileUtils;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.schema.IndexSchema;
-import org.apache.solr.schema.TestManagedSchema;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -30,9 +30,6 @@ import org.joda.time.format.ISODateTimeF
import org.junit.After;
import org.junit.Before;
-import java.io.File;
-import java.util.Date;
-
/**
* Tests for the field mutating update processors
* that parse Dates, Longs, Doubles, and Booleans.
@@ -49,8 +46,7 @@ public class AddSchemaFieldsUpdateProces
@Before
private void initManagedSchemaCore() throws Exception {
- final String tmpSolrHomePath = createTempDir().getAbsolutePath();
- tmpSolrHome = new File(tmpSolrHomePath).getAbsoluteFile();
+ tmpSolrHome = createTempDir();
tmpConfDir = new File(tmpSolrHome, confDir);
File testHomeConfDir = new File(TEST_HOME(), confDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, SOLRCONFIG_XML), tmpConfDir);
@@ -61,12 +57,6 @@ public class AddSchemaFieldsUpdateProces
initCore(SOLRCONFIG_XML, SCHEMA_XML, tmpSolrHome.getPath());
}
- @After
- private void deleteCoreAndTempSolrHomeDirectory() throws Exception {
- deleteCore();
- FileUtils.deleteDirectory(tmpSolrHome);
- }
-
public void testSingleField() throws Exception {
IndexSchema schema = h.getCore().getLatestSchema();
final String fieldName = "newfield1";
@@ -220,4 +210,9 @@ public class AddSchemaFieldsUpdateProces
,"//arr[@name='" + fieldName3 + "']/str[.='" + field3String2 + "']"
,"//arr[@name='" + fieldName4 + "']/date[.='" + field4Value1String + "']");
}
+
+ @After
+ private void deleteCoreAndTempSolrHomeDirectory() throws Exception {
+ deleteCore();
+ }
}
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=1583163&r1=1583162&r2=1583163&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 Sun Mar 30 17:37:31 2014
@@ -99,15 +99,9 @@ public class TestCoreAdmin extends Abstr
SolrServer server = getSolrAdmin();
- File tmp = createTempDir();
-
- log.info("Creating cores underneath {}", tmp);
-
- File dataDir = new File(tmp, this.getTestName()
- + System.currentTimeMillis() + "-" + "data");
+ File dataDir = createTempDir("data");
- File newCoreInstanceDir = new File(tmp, this.getTestName()
- + System.currentTimeMillis() + "-" + "instance");
+ File newCoreInstanceDir = createTempDir("instance");
File instanceDir = new File(cores.getSolrHome());
FileUtils.copyDirectory(instanceDir, new File(newCoreInstanceDir,
Modified: lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java (original)
+++ lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java Sun Mar 30 17:37:31 2014
@@ -121,9 +121,6 @@ abstract public class SolrJettyTestBase
// Sets up the necessary config files for Jetty. At least some tests require that the solrconfig from the test
// file directory are used, but some also require that the solr.xml file be explicitly there as of SOLR-4817
public static void setupJettyTestHome(File solrHome, String collection) throws Exception {
- if (solrHome.exists()) {
- FileUtils.deleteDirectory(solrHome);
- }
copySolrHomeToTemp(solrHome, collection);
}
Modified: lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1583163&r1=1583162&r2=1583163&view=diff
==============================================================================
--- lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/branches/solr5914/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Sun Mar 30 17:37:31 2014
@@ -63,8 +63,7 @@ public abstract class AbstractZkTestCase
@BeforeClass
public static void azt_beforeClass() throws Exception {
- zkDir = createTempDir().getAbsolutePath() + File.separator
- + "zookeeper/server1/data";
+ zkDir = createTempDir("zkData").getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();