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/27 18:50:26 UTC
svn commit: r1582427 [1/2] - in /lucene/dev/branches/branch_4x: ./ solr/
solr/contrib/ solr/contrib/analysis-extras/src/test/org/apache/solr/schema/
solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/
solr/contrib/map-reduce/src...
Author: markrmiller
Date: Thu Mar 27 17:50:24 2014
New Revision: 1582427
URL: http://svn.apache.org/r1582427
Log:
SOLR-5914: Solr tests should use dataDir for tmp files.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
lucene/dev/branches/branch_4x/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/dev/branches/branch_4x/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
Modified: lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java Thu Mar 27 17:50:24 2014
@@ -64,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 = File.createTempFile("test", "tmp", dataDir);
tmpFile.delete();
tmpFile.mkdir();
Modified: lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java Thu Mar 27 17:50:24 2014
@@ -64,7 +64,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 = File.createTempFile("test", "tmp", dataDir);
tmpFile.delete();
tmpFile.mkdir();
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java Thu Mar 27 17:50:24 2014
@@ -54,7 +54,7 @@ public abstract class AbstractSqlEntityP
@Before
public void beforeSqlEntitiyProcessorTestCase() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
fileLocation = tmpdir.getPath();
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Thu Mar 27 17:50:24 2014
@@ -151,7 +151,7 @@ public class TestContentStreamDataSource
public void setUp() throws Exception {
- File home = new File(TEMP_DIR,
+ File home = new File(dataDir,
getClass().getName() + "-" + System.currentTimeMillis());
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java Thu Mar 27 17:50:24 2014
@@ -240,7 +240,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);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java Thu Mar 27 17:50:24 2014
@@ -37,7 +37,7 @@ public class TestFileListEntityProcessor
@Test
@SuppressWarnings("unchecked")
public void testSimple() throws IOException {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
@@ -63,7 +63,7 @@ public class TestFileListEntityProcessor
@Test
public void testBiggerSmallerFiles() throws IOException {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
@@ -133,7 +133,7 @@ public class TestFileListEntityProcessor
@Test
public void testNTOT() throws IOException {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
@@ -169,7 +169,7 @@ public class TestFileListEntityProcessor
@Test
public void testRECURSION() throws IOException {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNonWritablePersistFile.java Thu Mar 27 17:50:24 2014
@@ -52,8 +52,7 @@ public class TestNonWritablePersistFile
@BeforeClass
public static void createTempSolrHomeAndCore() throws Exception {
- createTempDir();
- tmpSolrHome = TEMP_DIR + File.separator + TestNonWritablePersistFile.class.getSimpleName() + System.currentTimeMillis();
+ tmpSolrHome = dataDir + File.separator + TestNonWritablePersistFile.class.getSimpleName() + System.currentTimeMillis();
FileUtils.copyDirectory(getFile("dih/solr"), new File(tmpSolrHome).getAbsoluteFile());
initCore("dataimport-solrconfig.xml", "dataimport-schema.xml",
new File(tmpSolrHome).getAbsolutePath());
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java Thu Mar 27 17:50:24 2014
@@ -46,7 +46,7 @@ public class TestSimplePropertiesWriter
@Before
public void spwBefore() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
fileLocation = tmpdir.getPath();
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java Thu Mar 27 17:50:24 2014
@@ -317,7 +317,7 @@ public class TestSolrEntityProcessorEndT
public void setUp() throws Exception {
- File home = new File(TEMP_DIR, getClass().getName() + "-"
+ File home = new File(dataDir, getClass().getName() + "-"
+ System.currentTimeMillis());
homeDir = new File(home + "inst");
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java Thu Mar 27 17:50:24 2014
@@ -42,7 +42,7 @@ public class TestXPathEntityProcessor ex
@Test
public void withFieldsAndXpath() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
@@ -333,7 +333,7 @@ public class TestXPathEntityProcessor ex
@Test
public void withDefaultSolrAndXsl() throws Exception {
- File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+ File tmpdir = File.createTempFile("test", "tmp", dataDir);
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java Thu Mar 27 17:50:24 2014
@@ -50,7 +50,6 @@ public class TestZKPropertiesWriter exte
@BeforeClass
public static void dihZk_beforeClass() throws Exception {
- createTempDir();
zkDir = dataDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";
zkServer = new ZkTestServer(zkDir);
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MRUnitBase.java Thu Mar 27 17:50:24 2014
@@ -46,7 +46,7 @@ public abstract class MRUnitBase extends
protected void setupHadoopConfig(Configuration config) throws IOException {
- String tempDir = TEMP_DIR + "/test-morphlines-" + System.currentTimeMillis();
+ String tempDir = dataDir + "/test-morphlines-" + System.currentTimeMillis();
new File(tempDir).mkdirs();
FileUtils.copyFile(new File(RESOURCES_DIR + "/custom-mimetypes.xml"), new File(tempDir + "/custom-mimetypes.xml"));
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MapReduceIndexerToolArgumentParserTest.java Thu Mar 27 17:50:24 2014
@@ -55,7 +55,7 @@ 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 final File solrHomeDirectory = new File(dataDir, MorphlineGoLiveMiniMRTest.class.getName());
@BeforeClass
public static void beforeClass() {
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java Thu Mar 27 17:50:24 2014
@@ -79,7 +79,7 @@ public class MorphlineBasicMiniMRTest ex
private static String tempDir;
- private static final File solrHomeDirectory = new File(TEMP_DIR, MorphlineBasicMiniMRTest.class.getName());
+ private static final File solrHomeDirectory = new File(dataDir, MorphlineBasicMiniMRTest.class.getName());
protected MapReduceIndexerTool createTool() {
return new MapReduceIndexerTool();
@@ -122,7 +122,7 @@ public class MorphlineBasicMiniMRTest ex
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(MINIMR_CONF_DIR, solrHomeDirectory);
- tempDir = TEMP_DIR + "/test-morphlines-" + System.currentTimeMillis();
+ tempDir = dataDir + "/test-morphlines-" + System.currentTimeMillis();
new File(tempDir).mkdirs();
FileUtils.copyFile(new File(RESOURCES_DIR + "/custom-mimetypes.xml"), new File(tempDir + "/custom-mimetypes.xml"));
@@ -140,7 +140,6 @@ public class MorphlineBasicMiniMRTest ex
// sb.append(",").append(i.getCanonicalHostName());
// }
- createTempDir();
new File(dataDir, "nm-local-dirs").mkdirs();
System.setProperty("solr.hdfs.blockcache.enabled", "false");
Modified: lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java Thu Mar 27 17:50:24 2014
@@ -108,7 +108,7 @@ 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 final File solrHomeDirectory = new File(dataDir, MorphlineGoLiveMiniMRTest.class.getName());
@Override
public String getSolrHome() {
@@ -141,7 +141,7 @@ public class MorphlineGoLiveMiniMRTest e
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(MINIMR_INSTANCE_DIR, solrHomeDirectory);
- tempDir = TEMP_DIR + "/test-morphlines-" + System.currentTimeMillis();
+ tempDir = dataDir + "/test-morphlines-" + System.currentTimeMillis();
new File(tempDir).mkdirs();
FileUtils.copyFile(new File(RESOURCES_DIR + "/custom-mimetypes.xml"), new File(tempDir + "/custom-mimetypes.xml"));
@@ -164,7 +164,6 @@ public class MorphlineGoLiveMiniMRTest e
conf.set(YarnConfiguration.DEFAULT_NM_LOG_DIRS, dataDir + File.separator + "nm-logs");
- createTempDir();
new File(dataDir + File.separator + "nm-local-dirs").mkdirs();
System.setProperty("test.build.dir", dataDir + File.separator + "hdfs" + File.separator + "test-build-dir");
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java Thu Mar 27 17:50:24 2014
@@ -118,7 +118,7 @@ public class AbstractSolrMorphlineTestBa
testServer = new SolrServerDocumentLoader(solrServer, batchSize);
deleteAllDocuments();
- tempDir = new File(TEMP_DIR + "/test-morphlines-" + System.currentTimeMillis()).getAbsolutePath();
+ tempDir = new File(dataDir + "/test-morphlines-" + System.currentTimeMillis()).getAbsolutePath();
new File(tempDir).mkdirs();
}
Modified: lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java Thu Mar 27 17:50:24 2014
@@ -47,7 +47,7 @@ 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 final File solrHomeDirectory = new File(dataDir, AbstractSolrMorphlineZkTestBase.class.getName());
protected static final String RESOURCES_DIR = getFile("morphlines-core.marker").getParent();
private static final File SOLR_INSTANCE_DIR = new File(RESOURCES_DIR + "/solr");
@@ -71,7 +71,6 @@ public abstract class AbstractSolrMorphl
public static void setupClass() throws Exception {
AbstractZkTestCase.SOLRHOME = solrHomeDirectory;
FileUtils.copyDirectory(SOLR_INSTANCE_DIR, solrHomeDirectory);
- createTempDir();
}
@Override
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java Thu Mar 27 17:50:24 2014
@@ -42,8 +42,7 @@ public class AnalysisAfterCoreReloadTest
@BeforeClass
public static void beforeClass() throws Exception {
- createTempDir();
- tmpSolrHome = TEMP_DIR + File.separator + AnalysisAfterCoreReloadTest.class.getSimpleName() + System.currentTimeMillis();
+ tmpSolrHome = dataDir + File.separator + AnalysisAfterCoreReloadTest.class.getSimpleName() + System.currentTimeMillis();
FileUtils.copyDirectory(new File(TEST_HOME()), new File(tmpSolrHome).getAbsoluteFile());
initCore("solrconfig.xml", "schema.xml", new File(tmpSolrHome).getAbsolutePath());
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java Thu Mar 27 17:50:24 2014
@@ -34,8 +34,7 @@ public class SolrTestCaseJ4Test extends
// 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 = dataDir + File.separator + SolrTestCaseJ4Test.class.getSimpleName() + System.currentTimeMillis();
File subHome = new File(new File(tmpSolrHome, "core0"), "conf");
assertTrue("Failed to make subdirectory ", subHome.mkdirs());
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java Thu Mar 27 17:50:24 2014
@@ -45,7 +45,7 @@ public class TestSolrCoreProperties exte
@BeforeClass
public static void beforeTest() throws Exception {
- File homeDir = new File(TEMP_DIR,
+ File homeDir = new File(dataDir,
"solrtest-TestSolrCoreProperties-" + System.currentTimeMillis());
File collDir = new File(homeDir, "collection1");
File dataDir = new File(collDir, "data");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java Thu Mar 27 17:50:24 2014
@@ -415,7 +415,7 @@ 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 = new File(dataDir, BasicDistributedZk2Test.class.getName() + "-backupdir-" + System.currentTimeMillis());
params.set("location", location.getAbsolutePath());
QueryRequest request = new QueryRequest(params);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java Thu Mar 27 17:50:24 2014
@@ -68,7 +68,7 @@ public class ClusterStateUpdateTest exte
private File dataDir4;
- private static final File solrHomeDirectory = new File(TEMP_DIR, "ZkControllerTest");
+ private static volatile File solrHomeDirectory = new File(dataDir, "ZkControllerTest");
@BeforeClass
public static void beforeClass() throws IOException {
@@ -94,7 +94,6 @@ public class ClusterStateUpdateTest exte
@Override
public void setUp() throws Exception {
super.setUp();
- createTempDir();
System.setProperty("zkClientTimeout", "3000");
zkDir = dataDir.getAbsolutePath() + File.separator
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java Thu Mar 27 17:50:24 2014
@@ -36,7 +36,6 @@ public class ConnectionManagerTest exten
@Ignore
public void testConnectionManager() throws Exception {
- createTempDir();
// setup a SolrZkClient to do some getBaseUrlForNodeName testing
String zkDir = dataDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";
@@ -72,7 +71,6 @@ public class ConnectionManagerTest exten
public void testLikelyExpired() throws Exception {
- createTempDir();
// setup a SolrZkClient to do some getBaseUrlForNodeName testing
String zkDir = dataDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java Thu Mar 27 17:50:24 2014
@@ -73,7 +73,7 @@ public class LeaderElectionIntegrationTe
@Override
public void setUp() throws Exception {
super.setUp();
- createTempDir();
+
ignoreException("No UpdateLog found - cannot sync");
ignoreException("No UpdateLog found - cannot recover");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java Thu Mar 27 17:50:24 2014
@@ -55,7 +55,7 @@ public class LeaderElectionTest extends
@BeforeClass
public static void beforeClass() {
- createTempDir();
+
}
@AfterClass
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SliceStateUpdateTest.java Thu Mar 27 17:50:24 2014
@@ -74,7 +74,7 @@ public class SliceStateUpdateTest extend
@Override
public void setUp() throws Exception {
super.setUp();
- createTempDir();
+
System.setProperty("zkClientTimeout", "3000");
zkDir = dataDir.getAbsolutePath() + File.separator
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java Thu Mar 27 17:50:24 2014
@@ -16,8 +16,11 @@ package org.apache.solr.cloud;
* the License.
*/
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-import com.google.common.base.Charsets;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
@@ -32,11 +35,8 @@ import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.charset.Charset;
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
+import com.google.common.base.Charsets;
public class SolrXmlInZkTest extends SolrTestCaseJ4 {
@@ -61,8 +61,7 @@ public class SolrXmlInZkTest extends Sol
}
private void setUpZkAndDiskXml(boolean toZk, boolean leaveOnLocal) throws Exception {
-
- createTempDir();
+ recurseDelete(dataDir);
File solrHome = new File(dataDir, "home");
copyMinConf(new File(solrHome, "myCollect"));
if (leaveOnLocal) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java Thu Mar 27 17:50:24 2014
@@ -44,8 +44,7 @@ public class TestMultiCoreConfBootstrap
public void setUp() throws Exception {
super.setUp();
- createTempDir();
- dataDir2 = new File(TEMP_DIR, getSimpleClassName() + "-core1-"
+ dataDir2 = new File(dataDir, getSimpleClassName() + "-core1-"
+ System.currentTimeMillis());
dataDir2.mkdirs();
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java Thu Mar 27 17:50:24 2014
@@ -43,7 +43,7 @@ public class TestZkChroot extends SolrTe
@Before
public void setUp() throws Exception {
super.setUp();
- createTempDir();
+
zkDir = dataDir.getAbsolutePath() + File.separator
+ "zookeeper/server1/data";
zkServer = new ZkTestServer(zkDir);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java Thu Mar 27 17:50:24 2014
@@ -74,7 +74,6 @@ public class ZkCLITest extends SolrTestC
public void setUp() throws Exception {
super.setUp();
log.info("####SETUP_START " + getTestName());
- createTempDir();
boolean useNewSolrXml = random().nextBoolean();
@@ -231,7 +230,7 @@ public class ZkCLITest extends SolrTestC
assertEquals(confsetname, collectionProps.getStr("configName"));
// test down config
- File confDir = new File(TEMP_DIR,
+ File confDir = new File(dataDir,
"solrtest-confdropspot-" + this.getClass().getName() + "-" + System.currentTimeMillis());
assertFalse(confDir.exists());
@@ -281,7 +280,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,
+ File file = new File(dataDir,
"solrtest-getfile-" + this.getClass().getName() + "-" + System.currentTimeMillis());
String[] args = new String[] {"-zkhost", zkServer.getZkAddress(), "-cmd",
"getfile", getNode, file.getAbsolutePath()};
@@ -295,7 +294,7 @@ public class ZkCLITest extends SolrTestC
public void testGetFileNotExists() throws Exception {
String getNode = "/getFileNotExistsNode";
- File file = new File(TEMP_DIR,
+ File file = new File(dataDir,
"solrtest-getfilenotexists-" + this.getClass().getName() + "-" + System.currentTimeMillis());
String[] args = new String[] {"-zkhost", zkServer.getZkAddress(), "-cmd",
"getfile", getNode, file.getAbsolutePath()};
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Thu Mar 27 17:50:24 2014
@@ -50,7 +50,7 @@ public class ZkControllerTest extends So
@BeforeClass
public static void beforeClass() throws Exception {
- createTempDir();
+
}
@AfterClass
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java Thu Mar 27 17:50:24 2014
@@ -38,7 +38,7 @@ public class HdfsBasicDistributedZk2Test
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsBasicDistributedZk2Test.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java Thu Mar 27 17:50:24 2014
@@ -38,7 +38,7 @@ public class HdfsBasicDistributedZkTest
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsBasicDistributedZk2Test.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java Thu Mar 27 17:50:24 2014
@@ -39,7 +39,7 @@ public class HdfsChaosMonkeySafeLeaderTe
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsBasicDistributedZk2Test.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java Thu Mar 27 17:50:24 2014
@@ -38,7 +38,7 @@ public class HdfsCollectionsAPIDistribut
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsCollectionsAPIDistributedZkTest.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java Thu Mar 27 17:50:24 2014
@@ -38,7 +38,7 @@ public class HdfsRecoveryZkTest extends
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsBasicDistributedZk2Test.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
System.setProperty("solr.hdfs.blockcache.blocksperbank", "2048");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java Thu Mar 27 17:50:24 2014
@@ -40,7 +40,7 @@ public class HdfsSyncSliceTest extends S
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsBasicDistributedZk2Test.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java Thu Mar 27 17:50:24 2014
@@ -38,7 +38,7 @@ public class HdfsUnloadDistributedZkTest
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsUnloadDistributedZkTest.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java Thu Mar 27 17:50:24 2014
@@ -60,7 +60,7 @@ public class HdfsWriteToMultipleCollecti
@BeforeClass
public static void setupClass() throws Exception {
schemaString = "schema15.xml"; // we need a string id
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsBasicDistributedZk2Test.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
System.setProperty(SOLR_HDFS_HOME, dfsCluster.getURI().toString() + "/solr");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java Thu Mar 27 17:50:24 2014
@@ -63,7 +63,7 @@ public class StressHdfsTest extends Basi
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(new File(TEMP_DIR,
+ dfsCluster = HdfsTestUtil.setupClass(new File(dataDir,
HdfsBasicDistributedZk2Test.class.getName() + "_"
+ System.currentTimeMillis()).getAbsolutePath());
System.setProperty("solr.hdfs.home", dfsCluster.getURI().toString() + "/solr");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java Thu Mar 27 17:50:24 2014
@@ -37,7 +37,7 @@ public class CoreContainerCoreInitFailur
private void init(final String dirSuffix) {
// would be nice to do this in an @Before method,
// but junit doesn't let @Before methods have test names
- solrHome = new File(TEMP_DIR, this.getClass().getName() + "_" + dirSuffix);
+ solrHome = new File(dataDir, this.getClass().getName() + "_" + dirSuffix);
assertTrue("Failed to mkdirs solrhome [" + solrHome + "]", solrHome.mkdirs());
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java Thu Mar 27 17:50:24 2014
@@ -86,7 +86,7 @@ public class OpenCloseCoreStressTest ext
coreNames = new ArrayList<>();
cumulativeDocs = 0;
- solrHomeDirectory = new File(TEMP_DIR, "OpenCloseCoreStressTest_");
+ solrHomeDirectory = new File(dataDir, "OpenCloseCoreStressTest_");
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);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java Thu Mar 27 17:50:24 2014
@@ -40,9 +40,6 @@ public class SolrCoreCheckLockOnStartupT
System.setProperty("solr.directoryFactory", "org.apache.solr.core.SimpleFSDirectoryFactory");
- //explicitly creates the temp dataDir so we know where the index will be located
- createTempDir();
-
IndexWriterConfig indexWriterConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, null);
Directory directory = newFSDirectory(new File(dataDir, "index"));
//creates a new index on the known location
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Thu Mar 27 17:50:24 2014
@@ -73,7 +73,7 @@ public class TestArbitraryIndexDir exten
public void setUp() throws Exception {
super.setUp();
- dataDir = new File(TEMP_DIR,
+ dataDir = new File(dataDir,
getClass().getName() + "-" + System.currentTimeMillis() + System.getProperty("file.separator") + "solr"
+ System.getProperty("file.separator") + "data");
dataDir.mkdirs();
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfigSets.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfigSets.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestConfigSets.java Thu Mar 27 17:50:24 2014
@@ -42,7 +42,7 @@ public class TestConfigSets extends Solr
public CoreContainer setupContainer(String testName, String configSetsBaseDir) {
- File testDirectory = new File(TEMP_DIR, testName);
+ File testDirectory = new File(dataDir, testName);
testDirectory.mkdirs();
System.setProperty("configsets", configSetsBaseDir);
@@ -95,7 +95,7 @@ public class TestConfigSets extends Solr
@Test
public void testConfigSetOnCoreReload() throws IOException {
- File testDirectory = new File(TEMP_DIR, "core-reload");
+ File testDirectory = new File(dataDir, "core-reload");
testDirectory.mkdirs();
File configSetsDir = new File(testDirectory, "configsets");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Thu Mar 27 17:50:24 2014
@@ -69,7 +69,7 @@ public class TestCoreContainer extends S
private CoreContainer init(String dirName) throws Exception {
- solrHomeDirectory = new File(TEMP_DIR, this.getClass().getName() + dirName);
+ solrHomeDirectory = new File(dataDir, this.getClass().getName() + dirName);
if (solrHomeDirectory.exists()) {
FileUtils.deleteDirectory(solrHomeDirectory);
@@ -153,7 +153,7 @@ public class TestCoreContainer extends S
@Test
public void testNoCores() throws IOException, ParserConfigurationException, SAXException {
//create solrHome
- File solrHomeDirectory = new File(TEMP_DIR, this.getClass().getName()
+ File solrHomeDirectory = new File(dataDir, this.getClass().getName()
+ "_noCores");
boolean oldSolrXml = random().nextBoolean();
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java Thu Mar 27 17:50:24 2014
@@ -38,7 +38,7 @@ public class TestCoreDiscovery extends S
initCore();
}
- private final File solrHomeDirectory = new File(TEMP_DIR, "org.apache.solr.core.TestCoreDiscovery" + File.separator + "solrHome");
+ private final File solrHomeDirectory = new File(dataDir, "org.apache.solr.core.TestCoreDiscovery" + File.separator + "solrHome");
private void setMeUp(String alternateCoreDir) throws Exception {
if (solrHomeDirectory.exists()) {
@@ -198,7 +198,7 @@ public class TestCoreDiscovery extends S
@Test
public void testAlternateCoreDir() throws Exception {
- File alt = new File(TEMP_DIR, "alternateCoreDir");
+ File alt = new File(dataDir, "alternateCoreDir");
if (alt.exists()) FileUtils.deleteDirectory(alt);
alt.mkdirs();
setMeUp(alt.getAbsolutePath());
@@ -218,7 +218,7 @@ public class TestCoreDiscovery extends S
}
@Test
public void testNoCoreDir() throws Exception {
- File noCoreDir = new File(TEMP_DIR, "noCoreDir");
+ File noCoreDir = new File(dataDir, "noCoreDir");
if (noCoreDir.exists()) FileUtils.deleteDirectory(noCoreDir);
noCoreDir.mkdirs();
setMeUp(noCoreDir.getAbsolutePath());
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestLazyCores.java Thu Mar 27 17:50:24 2014
@@ -52,7 +52,7 @@ public class TestLazyCores extends SolrT
initCore("solrconfig-minimal.xml", "schema-tiny.xml");
}
- private final File solrHomeDirectory = new File(TEMP_DIR, TestLazyCores.getSimpleClassName());
+ private final File solrHomeDirectory = new File(dataDir, TestLazyCores.getSimpleClassName());
private CoreContainer init() throws Exception {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java Thu Mar 27 17:50:24 2014
@@ -17,23 +17,6 @@ package org.apache.solr.core;
* limitations under the License.
*/
-import org.apache.commons.io.FileUtils;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
-import org.apache.solr.core.SolrXMLSerializer.SolrCoreXMLDef;
-import org.apache.solr.core.SolrXMLSerializer.SolrXMLDef;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -46,8 +29,26 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.TestUtil;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.core.SolrXMLSerializer.SolrCoreXMLDef;
+import org.apache.solr.core.SolrXMLSerializer.SolrXMLDef;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+
-public class TestSolrXMLSerializer extends LuceneTestCase {
+public class TestSolrXMLSerializer extends SolrTestCaseJ4 {
private static final XPathFactory xpathFactory = XPathFactory.newInstance();
private static final String defaultCoreNameKey = "defaultCoreName";
private static final String defaultCoreNameVal = "collection1";
@@ -81,7 +82,7 @@ public class TestSolrXMLSerializer exten
assertResults(((StringWriter) w).getBuffer().toString().getBytes("UTF-8"));
// again with default file
- File tmpFile = TestUtil.createTempFile("solr.xml", null, TEMP_DIR);
+ File tmpFile = TestUtil.createTempFile("solr.xml", null, dataDir);
serializer.persistFile(tmpFile, solrXMLDef);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXml.java Thu Mar 27 17:50:24 2014
@@ -33,7 +33,7 @@ public class TestSolrXml extends SolrTes
@Rule
public TestRule solrTestRules = RuleChain.outerRule(new SystemPropertiesRestoreRule());
- private final File solrHome = new File(TEMP_DIR, TestSolrXml.getClassName() + File.separator + "solrHome");
+ private final File solrHome = new File(dataDir, TestSolrXml.getClassName() + File.separator + "solrHome");
@Test
public void testAllInfoPresent() throws IOException {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java Thu Mar 27 17:50:24 2014
@@ -52,7 +52,7 @@ import static org.hamcrest.core.Is.is;
public class TestSolrXmlPersistence extends SolrTestCaseJ4 {
- private File solrHomeDirectory = new File(TEMP_DIR, this.getClass().getName());
+ private File solrHomeDirectory = new File(dataDir, this.getClass().getName());
@Rule
public TestRule solrTestRules =
@@ -61,7 +61,6 @@ public class TestSolrXmlPersistence exte
private CoreContainer init(String solrXmlString, String... subDirs) throws Exception {
- createTempDir();
solrHomeDirectory = dataDir;
for (String s : subDirs) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java Thu Mar 27 17:50:24 2014
@@ -62,7 +62,7 @@ public class TestSolrXmlPersistor exten
final String solrxml = "<solr><cores></cores></solr>";
- final File solrHomeDirectory = new File(TEMP_DIR, "ZkControllerTest");
+ final File solrHomeDirectory = new File(dataDir, "ZkControllerTest");
try {
if (solrHomeDirectory.exists()) {
FileUtils.deleteDirectory(solrHomeDirectory);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java Thu Mar 27 17:50:24 2014
@@ -54,7 +54,7 @@ public class PingRequestHandlerTest exte
// sometimes randomly use an absolute File path instead
if (random().nextBoolean()) {
- healthcheckFile = new File(TEMP_DIR, fileName);
+ healthcheckFile = new File(dataDir, fileName);
fileNameParam = healthcheckFile.getAbsolutePath();
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Thu Mar 27 17:50:24 2014
@@ -1594,7 +1594,7 @@ public class TestReplicationHandler exte
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
- File home = new File(TEMP_DIR,
+ File home = new File(dataDir,
getClass().getName() + "-" +
System.currentTimeMillis());
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java Thu Mar 27 17:50:24 2014
@@ -49,7 +49,7 @@ public class CoreAdminCreateDiscoverTest
public static void beforeClass() throws Exception {
useFactory(null); // I require FS-based indexes for this test.
- solrHomeDirectory = new File(TEMP_DIR, "solrHome/" + CoreAdminCreateDiscoverTest.getClassName());
+ solrHomeDirectory = new File(dataDir, "solrHome/" + CoreAdminCreateDiscoverTest.getClassName());
if (solrHomeDirectory.exists()) {
FileUtils.deleteDirectory(solrHomeDirectory);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java Thu Mar 27 17:50:24 2014
@@ -58,7 +58,7 @@ public class CoreAdminHandlerTest extend
public void testCreateWithSysVars() throws Exception {
useFactory(null); // I require FS-based indexes for this test.
- final File workDir = new File(TEMP_DIR, getCoreName());
+ final File workDir = new File(dataDir, getCoreName());
if (workDir.exists()) {
FileUtils.deleteDirectory(workDir);
@@ -133,7 +133,7 @@ public class CoreAdminHandlerTest extend
@Test
public void testCoreAdminHandler() throws Exception {
- final File workDir = new File(TEMP_DIR, this.getClass().getName());
+ final File workDir = new File(dataDir, this.getClass().getName());
if (workDir.exists()) {
FileUtils.deleteDirectory(workDir);
@@ -224,7 +224,7 @@ public class CoreAdminHandlerTest extend
@Test
public void testDeleteInstanceDir() throws Exception {
- File solrHomeDirectory = new File(TEMP_DIR, getClass().getName() + "-corex-"
+ File solrHomeDirectory = new File(dataDir, getClass().getName() + "-corex-"
+ System.currentTimeMillis());
solrHomeDirectory.mkdirs();
copySolrHomeToTemp(solrHomeDirectory, "corex", true);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java Thu Mar 27 17:50:24 2014
@@ -37,7 +37,7 @@ public class CoreAdminRequestStatusTest
@Test
public void testCoreAdminRequestStatus() throws Exception {
- final File workDir = new File(TEMP_DIR, this.getClass().getName());
+ final File workDir = new File(dataDir, this.getClass().getName());
if (workDir.exists()) {
FileUtils.deleteDirectory(workDir);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java Thu Mar 27 17:50:24 2014
@@ -72,7 +72,7 @@ public class CoreMergeIndexesAdminHandle
@Test
public void testMergeIndexesCoreAdminHandler() throws Exception {
- final File workDir = new File(TEMP_DIR, this.getClass().getName());
+ final File workDir = new File(dataDir, this.getClass().getName());
if (workDir.exists()) {
FileUtils.deleteDirectory(workDir);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java Thu Mar 27 17:50:24 2014
@@ -48,7 +48,7 @@ public class DistributedDebugComponentTe
}
private static File createSolrHome() throws Exception {
- File workDir = new File(TEMP_DIR, DistributedDebugComponentTest.class.getName());
+ File workDir = new File(dataDir, DistributedDebugComponentTest.class.getName());
setupJettyTestHome(workDir, "collection1");
FileUtils.copyDirectory(new File(workDir, "collection1"), new File(workDir, "collection2"));
return workDir;
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java Thu Mar 27 17:50:24 2014
@@ -23,6 +23,7 @@ import java.util.List;
import junit.framework.Assert;
+import org.apache.solr.SolrTestCaseJ4.SuppressTempDirCleanUp;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.SolrServer;
@@ -40,6 +41,7 @@ import org.junit.BeforeClass;
* @see org.apache.solr.handler.component.SpellCheckComponent
*/
@Slow
+@SuppressTempDirCleanUp(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTestCase {
public DistributedSpellCheckComponentTest()
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Thu Mar 27 17:50:24 2014
@@ -57,7 +57,6 @@ public class QueryElevationComponentTest
private void init(String config, String schema) throws Exception {
//write out elevate-data.xml to the Data dir first by copying it from conf, which we know exists, this way we can test both conf and data configurations
- createTempDir();
File parent = new File(TEST_HOME() + "/collection1", "conf");
File elevateFile = new File(parent, "elevate.xml");
File elevateDataFile = new File(dataDir, "elevate-data.xml");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java Thu Mar 27 17:50:24 2014
@@ -40,8 +40,7 @@ public class TestManagedSchemaFieldResou
@Before
public void before() throws Exception {
- createTempDir();
- tmpSolrHome = new File( TEMP_DIR + File.separator + TestManagedSchemaFieldResource.class.getSimpleName()
+ tmpSolrHome = new File( dataDir + File.separator + TestManagedSchemaFieldResource.class.getSimpleName()
+ System.currentTimeMillis());
tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java Thu Mar 27 17:50:24 2014
@@ -40,7 +40,7 @@ public class ChangedSchemaMergeTest exte
initCore();
}
- private final File solrHomeDirectory = new File(TEMP_DIR, getSimpleClassName());
+ private final File solrHomeDirectory = new File(dataDir, getSimpleClassName());
private File schemaFile = null;
private void addDoc(SolrCore core, String... fieldValues) throws IOException {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java Thu Mar 27 17:50:24 2014
@@ -35,7 +35,7 @@ public class TestBinaryField extends Sol
@BeforeClass
public static void beforeTest() throws Exception {
- File homeDir = new File(TEMP_DIR,
+ File homeDir = new File(dataDir,
"solrtest-TestBinaryField-" + System.currentTimeMillis());
File collDir = new File(homeDir, "collection1");
File dataDir = new File(collDir, "data");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java?rev=1582427&r1=1582426&r2=1582427&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java Thu Mar 27 17:50:24 2014
@@ -46,9 +46,8 @@ public class TestManagedSchema extends A
@Before
private void initManagedSchemaCore() throws Exception {
- createTempDir();
final String tmpSolrHomePath
- = TEMP_DIR + File.separator + TestManagedSchema.class.getSimpleName() + System.currentTimeMillis();
+ = dataDir + File.separator + TestManagedSchema.class.getSimpleName() + System.currentTimeMillis();
tmpSolrHome = new File(tmpSolrHomePath).getAbsoluteFile();
tmpConfDir = new File(tmpSolrHome, confDir);
File testHomeConfDir = new File(TEST_HOME(), confDir);