You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/09/13 23:46:36 UTC
svn commit: r1624784 [7/7] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/
lucene/analysis/common/src/java/org/apache/lucene/ana...
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java Sat Sep 13 21:46:29 2014
@@ -38,7 +38,7 @@ public class HdfsChaosMonkeySafeLeaderTe
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
}
@AfterClass
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java Sat Sep 13 21:46:29 2014
@@ -37,7 +37,7 @@ public class HdfsCollectionsAPIDistribut
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
System.setProperty("solr.hdfs.home", dfsCluster.getURI().toString() + "/solr");
System.setProperty("solr.hdfs.blockcache.enabled", "false");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java Sat Sep 13 21:46:29 2014
@@ -37,7 +37,7 @@ public class HdfsRecoveryZkTest extends
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
System.setProperty("solr.hdfs.blockcache.blocksperbank", "2048");
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java Sat Sep 13 21:46:29 2014
@@ -38,7 +38,7 @@ public class HdfsSyncSliceTest extends S
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
}
@AfterClass
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java Sat Sep 13 21:46:29 2014
@@ -37,7 +37,7 @@ public class HdfsUnloadDistributedZkTest
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
}
@AfterClass
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java Sat Sep 13 21:46:29 2014
@@ -59,7 +59,7 @@ public class HdfsWriteToMultipleCollecti
@BeforeClass
public static void setupClass() throws Exception {
schemaString = "schema15.xml"; // we need a string id
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
System.setProperty(SOLR_HDFS_HOME, dfsCluster.getURI().toString() + "/solr");
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java Sat Sep 13 21:46:29 2014
@@ -61,7 +61,7 @@ public class StressHdfsTest extends Basi
@BeforeClass
public static void setupClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
System.setProperty("solr.hdfs.home", dfsCluster.getURI().toString() + "/solr");
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java Sat Sep 13 21:46:29 2014
@@ -58,7 +58,7 @@ public class AlternateDirectoryTest exte
public Directory create(String path, DirContext dirContext) throws IOException {
openCalled = true;
- return dir = newFSDirectory(new File(path));
+ return dir = newFSDirectory(new File(path).toPath());
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java Sat Sep 13 21:46:29 2014
@@ -35,7 +35,7 @@ public class CoreContainerCoreInitFailur
CoreContainer cc = null;
private void init(final String dirSuffix) {
- solrHome = createTempDir(dirSuffix);
+ solrHome = createTempDir(dirSuffix).toFile();
}
@After
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java Sat Sep 13 21:46:29 2014
@@ -85,7 +85,7 @@ public class OpenCloseCoreStressTest ext
coreNames = new ArrayList<>();
cumulativeDocs = 0;
- solrHomeDirectory = createTempDir();
+ solrHomeDirectory = createTempDir().toFile();
jetty = new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), "/solr", 0, null, null, true, null, sslConfig);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java Sat Sep 13 21:46:29 2014
@@ -61,7 +61,7 @@ public class ResourceLoaderTest extends
}
public void testEscapeInstanceDir() throws Exception {
- File temp = createTempDir("testEscapeInstanceDir");
+ File temp = createTempDir("testEscapeInstanceDir").toFile();
try {
temp.mkdirs();
new File(temp, "dummy.txt").createNewFile();
@@ -77,7 +77,7 @@ public class ResourceLoaderTest extends
}
loader.close();
} finally {
- IOUtils.rm(temp);
+ IOUtils.rm(temp.toPath());
}
}
@@ -171,7 +171,7 @@ public class ResourceLoaderTest extends
}
public void testClassLoaderLibs() throws Exception {
- File tmpRoot = createTempDir("testClassLoaderLibs");
+ File tmpRoot = createTempDir("testClassLoaderLibs").toFile();
File lib = new File(tmpRoot, "lib");
lib.mkdirs();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java Sat Sep 13 21:46:29 2014
@@ -48,7 +48,7 @@ public class SolrCoreCheckLockOnStartupT
@Test
public void testSimpleLockErrorOnStartup() throws Exception {
- Directory directory = newFSDirectory(new File(initCoreDataDir, "index"), new SimpleFSLockFactory());
+ Directory directory = newFSDirectory(new File(initCoreDataDir, "index").toPath(), new SimpleFSLockFactory());
//creates a new IndexWriter without releasing the lock yet
IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(null));
@@ -74,7 +74,7 @@ public class SolrCoreCheckLockOnStartupT
File indexDir = new File(initCoreDataDir, "index");
log.info("Acquiring lock on {}", indexDir.getAbsolutePath());
- Directory directory = newFSDirectory(indexDir, new NativeFSLockFactory());
+ Directory directory = newFSDirectory(indexDir.toPath(), new NativeFSLockFactory());
//creates a new IndexWriter without releasing the lock yet
IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(null));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java Sat Sep 13 21:46:29 2014
@@ -63,7 +63,7 @@ public class SolrCoreTest extends SolrTe
core.close();
CoreDescriptor cd = new CoreDescriptor(cores, COLLECTION1, "collection1",
- CoreDescriptor.CORE_DATADIR, createTempDir("dataDir2").getAbsolutePath());
+ CoreDescriptor.CORE_DATADIR, createTempDir("dataDir2").toFile().getAbsolutePath());
cores.create(cd);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Sat Sep 13 21:46:29 2014
@@ -73,7 +73,7 @@ public class TestArbitraryIndexDir exten
public void setUp() throws Exception {
super.setUp();
- File tmpDataDir = createTempDir();
+ File tmpDataDir = createTempDir().toFile();
solrConfig = TestHarness.createConfig(getSolrHome(), "solrconfig.xml");
h = new TestHarness( tmpDataDir.getAbsolutePath(),
@@ -112,7 +112,7 @@ public class TestArbitraryIndexDir exten
}
//add a doc in the new index dir
- Directory dir = newFSDirectory(newDir);
+ Directory dir = newFSDirectory(newDir.toPath());
IndexWriter iw = new IndexWriter(
dir,
new IndexWriterConfig(new StandardAnalyzer())
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfigSets.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfigSets.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfigSets.java Sat Sep 13 21:46:29 2014
@@ -41,7 +41,7 @@ public class TestConfigSets extends Solr
public static String solrxml = "<solr><str name=\"configSetBaseDir\">${configsets:configsets}</str></solr>";
public CoreContainer setupContainer(String configSetsBaseDir) {
- File testDirectory = createTempDir();
+ File testDirectory = createTempDir().toFile();
System.setProperty("configsets", configSetsBaseDir);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Sat Sep 13 21:46:29 2014
@@ -71,7 +71,7 @@ public class TestCoreContainer extends S
private CoreContainer init(String dirName) throws Exception {
- solrHomeDirectory = createTempDir(dirName);
+ solrHomeDirectory = createTempDir(dirName).toFile();
FileUtils.copyDirectory(new File(SolrTestCaseJ4.TEST_HOME()), solrHomeDirectory);
System.out.println("Using solrconfig from " + new File(SolrTestCaseJ4.TEST_HOME()).getAbsolutePath());
@@ -148,7 +148,7 @@ public class TestCoreContainer extends S
@Test
public void testNoCores() throws IOException, ParserConfigurationException, SAXException {
//create solrHome
- File solrHomeDirectory = createTempDir();
+ File solrHomeDirectory = createTempDir().toFile();
boolean oldSolrXml = random().nextBoolean();
@@ -221,7 +221,7 @@ public class TestCoreContainer extends S
MockCoresLocator cl = new MockCoresLocator();
- solrHomeDirectory = createTempDir("_deleteBadCores");
+ solrHomeDirectory = createTempDir("_deleteBadCores").toFile();
SolrResourceLoader resourceLoader = new SolrResourceLoader(solrHomeDirectory.getAbsolutePath());
File instanceDir = new File(solrHomeDirectory, "_deleteBadCores");
System.setProperty("configsets", getFile("solr/configsets").getAbsolutePath());
@@ -267,7 +267,7 @@ public class TestCoreContainer extends S
@Test
public void testSharedLib() throws Exception {
- File tmpRoot = createTempDir("testSharedLib");
+ File tmpRoot = createTempDir("testSharedLib").toFile();
File lib = new File(tmpRoot, "lib");
lib.mkdirs();
@@ -350,7 +350,7 @@ public class TestCoreContainer extends S
@Test
public void testCustomHandlers() throws Exception {
- solrHomeDirectory = createTempDir("_customHandlers");
+ solrHomeDirectory = createTempDir("_customHandlers").toFile();
SolrResourceLoader loader = new SolrResourceLoader(solrHomeDirectory.getAbsolutePath());
ConfigSolr config = ConfigSolr.fromString(loader, CUSTOM_HANDLERS_SOLR_XML);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java Sat Sep 13 21:46:29 2014
@@ -41,7 +41,7 @@ public class TestCoreDiscovery extends S
initCore();
}
- private final File solrHomeDirectory = createTempDir();
+ private final File solrHomeDirectory = createTempDir().toFile();
private void setMeUp(String alternateCoreDir) throws Exception {
System.setProperty("solr.solr.home", solrHomeDirectory.getAbsolutePath());
@@ -195,7 +195,7 @@ public class TestCoreDiscovery extends S
@Test
public void testAlternateCoreDir() throws Exception {
- File alt = createTempDir();
+ File alt = createTempDir().toFile();
setMeUp(alt.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true, "dataDir=core1"),
@@ -213,7 +213,7 @@ public class TestCoreDiscovery extends S
}
@Test
public void testNoCoreDir() throws Exception {
- File noCoreDir = createTempDir();
+ File noCoreDir = createTempDir().toFile();
setMeUp(noCoreDir.getAbsolutePath());
addCoreWithProps(makeCorePropFile("core1", false, true),
new File(noCoreDir, "core1" + File.separator + CorePropertiesLocator.PROPERTIES_FILENAME));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestLazyCores.java Sat Sep 13 21:46:29 2014
@@ -62,7 +62,7 @@ public class TestLazyCores extends SolrT
}
private CoreContainer init() throws Exception {
- solrHomeDirectory = createTempDir();
+ solrHomeDirectory = createTempDir().toFile();
for (int idx = 1; idx < 10; ++idx) {
copyMinConf(new File(solrHomeDirectory, "collection" + idx));
@@ -585,7 +585,7 @@ public class TestLazyCores extends SolrT
private CoreContainer initGoodAndBad(List<String> goodCores,
List<String> badSchemaCores,
List<String> badConfigCores) throws Exception {
- solrHomeDirectory = createTempDir();
+ solrHomeDirectory = createTempDir().toFile();
// Don't pollute the log with exception traces when they're expected.
ignoreException(Pattern.quote("SAXParseException"));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXml.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXml.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXml.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXml.java Sat Sep 13 21:46:29 2014
@@ -48,7 +48,7 @@ public class TestSolrXml extends SolrTes
@BeforeClass
public static void setupLoader() throws Exception {
- solrHome = createTempDir();
+ solrHome = createTempDir().toFile();
loader = new SolrResourceLoader(solrHome.getAbsolutePath());
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java Sat Sep 13 21:46:29 2014
@@ -54,7 +54,7 @@ import static org.hamcrest.core.Is.is;
public class TestSolrXmlPersistence extends SolrTestCaseJ4 {
- private File solrHomeDirectory = createTempDir();
+ private File solrHomeDirectory = createTempDir().toFile();
@Rule
public TestRule solrTestRules =
@@ -62,7 +62,7 @@ public class TestSolrXmlPersistence exte
@Before
public void setupTest() {
- solrHomeDirectory = createTempDir(LuceneTestCase.getTestClass().getSimpleName());
+ solrHomeDirectory = createTempDir(LuceneTestCase.getTestClass().getSimpleName()).toFile();
}
private CoreContainer init(String solrXmlString, String... subDirs) throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistor.java Sat Sep 13 21:46:29 2014
@@ -62,7 +62,7 @@ public class TestSolrXmlPersistor exten
final String solrxml = "<solr><cores></cores></solr>";
- final File solrHomeDirectory = createTempDir();
+ final File solrHomeDirectory = createTempDir().toFile();
copyMinFullSetup(solrHomeDirectory);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java Sat Sep 13 21:46:29 2014
@@ -51,7 +51,7 @@ public class TestCSVLoader extends SolrT
// if you override setUp or tearDown, you better call
// the super classes version
super.setUp();
- File tempDir = createTempDir("TestCSVLoader");
+ File tempDir = createTempDir("TestCSVLoader").toFile();
file = new File(tempDir, "solr_tmp.csv");
filename = file.getPath();
cleanup();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Sat Sep 13 21:46:29 2014
@@ -103,12 +103,12 @@ public class TestReplicationHandler exte
// System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
// For manual testing only
// useFactory(null); // force an FS factory.
- master = new SolrInstance(createTempDir("solr-instance"), "master", null);
+ master = new SolrInstance(createTempDir("solr-instance").toFile(), "master", null);
master.setUp();
masterJetty = createJetty(master);
masterClient = createNewSolrServer(masterJetty.getLocalPort());
- slave = new SolrInstance(createTempDir("solr-instance"), "slave", masterJetty.getLocalPort());
+ slave = new SolrInstance(createTempDir("solr-instance").toFile(), "slave", masterJetty.getLocalPort());
slave.setUp();
slaveJetty = createJetty(slave);
slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
@@ -312,7 +312,7 @@ public class TestReplicationHandler exte
JettySolrRunner repeaterJetty = null;
SolrServer repeaterClient = null;
try {
- repeater = new SolrInstance(createTempDir("solr-instance"), "repeater", masterJetty.getLocalPort());
+ repeater = new SolrInstance(createTempDir("solr-instance").toFile(), "repeater", masterJetty.getLocalPort());
repeater.setUp();
repeaterJetty = createJetty(repeater);
repeaterClient = createNewSolrServer(repeaterJetty.getLocalPort());
@@ -899,7 +899,7 @@ public class TestReplicationHandler exte
slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
try {
- repeater = new SolrInstance(createTempDir("solr-instance"), "repeater", null);
+ repeater = new SolrInstance(createTempDir("solr-instance").toFile(), "repeater", null);
repeater.setUp();
repeater.copyConfigFile(CONF_DIR + "solrconfig-repeater.xml",
"solrconfig.xml");
@@ -1438,7 +1438,7 @@ public class TestReplicationHandler exte
}
public void tearDown() throws Exception {
- IOUtils.rm(homeDir);
+ IOUtils.rm(homeDir.toPath());
}
public void copyConfigFile(String srcFile, String destFile)
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java Sat Sep 13 21:46:29 2014
@@ -43,6 +43,7 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.nio.file.Path;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -96,7 +97,7 @@ public class TestReplicationHandlerBacku
addNumberToKeepInRequest = false;
backupKeepParamName = ReplicationHandler.NUMBER_BACKUPS_TO_KEEP_INIT_PARAM;
}
- master = new TestReplicationHandler.SolrInstance(createTempDir("solr-instance"), "master", null);
+ master = new TestReplicationHandler.SolrInstance(createTempDir("solr-instance").toFile(), "master", null);
master.setUp();
master.copyConfigFile(CONF_DIR + configFile, "solrconfig.xml");
@@ -193,7 +194,7 @@ public class TestReplicationHandlerBacku
}
assertEquals(1, files.length);
snapDir[i] = files[0];
- Directory dir = new SimpleFSDirectory(snapDir[i].getAbsoluteFile());
+ Directory dir = new SimpleFSDirectory(snapDir[i].getAbsoluteFile().toPath());
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = new IndexSearcher(reader);
TopDocs hits = searcher.search(new MatchAllDocsQuery(), 1);
@@ -214,7 +215,11 @@ public class TestReplicationHandlerBacku
} finally {
if(!namedBackup) {
- org.apache.lucene.util.IOUtils.rm(snapDir);
+ Path toDelete[] = new Path[snapDir.length];
+ for (int i = 0; i < snapDir.length; i++) {
+ toDelete[i] = snapDir[i].toPath();
+ }
+ org.apache.lucene.util.IOUtils.rm(toDelete);
}
}
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java Sat Sep 13 21:46:29 2014
@@ -50,7 +50,7 @@ public class CoreAdminCreateDiscoverTest
public static void beforeClass() throws Exception {
useFactory(null); // I require FS-based indexes for this test.
- solrHomeDirectory = createTempDir();
+ solrHomeDirectory = createTempDir().toFile();
setupNoCoreTest(solrHomeDirectory, null);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java Sat Sep 13 21:46:29 2014
@@ -59,7 +59,7 @@ public class CoreAdminHandlerTest extend
public void testCreateWithSysVars() throws Exception {
useFactory(null); // I require FS-based indexes for this test.
- final File workDir = createTempDir(getCoreName());
+ final File workDir = createTempDir(getCoreName()).toFile();
String coreName = "with_sys_vars";
File instDir = new File(workDir, coreName);
@@ -124,7 +124,7 @@ public class CoreAdminHandlerTest extend
@Test
public void testCoreAdminHandler() throws Exception {
- final File workDir = createTempDir();
+ final File workDir = createTempDir().toFile();
final CoreContainer cores = h.getCoreContainer();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java Sat Sep 13 21:46:29 2014
@@ -37,7 +37,7 @@ public class CoreAdminRequestStatusTest
@Test
public void testCoreAdminRequestStatus() throws Exception {
- final File workDir = createTempDir();
+ final File workDir = createTempDir().toFile();
final CoreContainer cores = h.getCoreContainer();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java Sat Sep 13 21:46:29 2014
@@ -71,7 +71,7 @@ public class CoreMergeIndexesAdminHandle
@Test
public void testMergeIndexesCoreAdminHandler() throws Exception {
- final File workDir = createTempDir();
+ final File workDir = createTempDir().toFile();
final CoreContainer cores = h.getCoreContainer();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java Sat Sep 13 21:46:29 2014
@@ -53,7 +53,7 @@ public class DistributedDebugComponentTe
private static File solrHome;
private static File createSolrHome() throws Exception {
- File workDir = createTempDir();
+ File workDir = createTempDir().toFile();
setupJettyTestHome(workDir, "collection1");
FileUtils.copyDirectory(new File(workDir, "collection1"), new File(workDir, "collection2"));
return workDir;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java Sat Sep 13 21:46:29 2014
@@ -56,7 +56,7 @@ public class TestRemoteStreaming extends
@BeforeClass
public static void beforeTest() throws Exception {
//this one has handleSelect=true which a test here needs
- solrHomeDirectory = createTempDir(LuceneTestCase.getTestClass().getSimpleName());
+ solrHomeDirectory = createTempDir(LuceneTestCase.getTestClass().getSimpleName()).toFile();
setupJettyTestHome(solrHomeDirectory, "collection1");
createJetty(solrHomeDirectory.getAbsolutePath(), null, null);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java Sat Sep 13 21:46:29 2014
@@ -70,7 +70,7 @@ public class TestManagedResourceStorage
*/
@Test
public void testFileBasedJsonStorage() throws Exception {
- File instanceDir = createTempDir("json-storage");
+ File instanceDir = createTempDir("json-storage").toFile();
SolrResourceLoader loader = new SolrResourceLoader(instanceDir.getAbsolutePath());
try {
NamedList<String> initArgs = new NamedList<>();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestRestManager.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestRestManager.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/TestRestManager.java Sat Sep 13 21:46:29 2014
@@ -229,7 +229,7 @@ public class TestRestManager extends Sol
@Test
public void testReloadFromPersistentStorage() throws Exception {
SolrResourceLoader loader = new SolrResourceLoader("./");
- File unitTestStorageDir = createTempDir("testRestManager");
+ File unitTestStorageDir = createTempDir("testRestManager").toFile();
assertTrue(unitTestStorageDir.getAbsolutePath()+" is not a directory!",
unitTestStorageDir.isDirectory());
assertTrue(unitTestStorageDir.canRead());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaDynamicFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaDynamicFieldResource.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaDynamicFieldResource.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaDynamicFieldResource.java Sat Sep 13 21:46:29 2014
@@ -40,7 +40,7 @@ public class TestManagedSchemaDynamicFie
@Before
public void before() throws Exception {
- tmpSolrHome = createTempDir();
+ tmpSolrHome = createTempDir().toFile();
tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java Sat Sep 13 21:46:29 2014
@@ -40,7 +40,7 @@ public class TestManagedSchemaFieldResou
@Before
public void before() throws Exception {
- tmpSolrHome = createTempDir();
+ tmpSolrHome = createTempDir().toFile();
tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldTypeResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldTypeResource.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldTypeResource.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldTypeResource.java Sat Sep 13 21:46:29 2014
@@ -44,7 +44,7 @@ public class TestManagedSchemaFieldTypeR
@Before
public void before() throws Exception {
- tmpSolrHome = createTempDir();
+ tmpSolrHome = createTempDir().toFile();
tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java Sat Sep 13 21:46:29 2014
@@ -44,7 +44,7 @@ public class TestManagedStopFilterFactor
@Before
public void before() throws Exception {
- tmpSolrHome = createTempDir();
+ tmpSolrHome = createTempDir().toFile();
tmpConfDir = new File(tmpSolrHome, confDir);
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java Sat Sep 13 21:46:29 2014
@@ -42,7 +42,7 @@ public class TestManagedSynonymFilterFac
*/
@Before
public void before() throws Exception {
- tmpSolrHome = createTempDir();
+ tmpSolrHome = createTempDir().toFile();
FileUtils.copyDirectory(new File(TEST_HOME()), tmpSolrHome.getAbsoluteFile());
final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java Sat Sep 13 21:46:29 2014
@@ -40,7 +40,7 @@ public class ChangedSchemaMergeTest exte
initCore();
}
- private final File solrHomeDirectory = createTempDir();
+ private final File solrHomeDirectory = createTempDir().toFile();
private File schemaFile = null;
private void addDoc(SolrCore core, String... fieldValues) throws IOException {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/ModifyConfFileTest.java Sat Sep 13 21:46:29 2014
@@ -43,7 +43,7 @@ import org.junit.rules.TestRule;
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
public class ModifyConfFileTest extends SolrTestCaseJ4 {
- private File solrHomeDirectory = createTempDir();
+ private File solrHomeDirectory = createTempDir().toFile();
@Rule
public TestRule solrTestRules = RuleChain.outerRule(new SystemPropertiesRestoreRule());
@@ -52,7 +52,7 @@ public class ModifyConfFileTest extends
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
- solrHomeDirectory = createTempDir();
+ solrHomeDirectory = createTempDir().toFile();
copySolrHomeToTemp(solrHomeDirectory, "core1", true);
FileUtils.write(new File(new File(solrHomeDirectory, "core1"), "core.properties"), "", Charsets.UTF_8.toString());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java Sat Sep 13 21:46:29 2014
@@ -35,7 +35,7 @@ public class TestBinaryField extends Sol
@BeforeClass
public static void beforeTest() throws Exception {
- File homeDir = createTempDir();
+ File homeDir = createTempDir().toFile();
File collDir = new File(homeDir, "collection1");
File dataDir = new File(collDir, "data");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationField.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationField.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationField.java Sat Sep 13 21:46:29 2014
@@ -63,7 +63,7 @@ public class TestCollationField extends
*/
public static String setupSolrHome() throws Exception {
// make a solr home underneath the test's TEMP_DIR
- File tmpFile = createTempDir("collation1");
+ File tmpFile = createTempDir("collation1").toFile();
// make data and conf dirs
new File(tmpFile, "data").mkdir();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java Sat Sep 13 21:46:29 2014
@@ -61,7 +61,7 @@ public class TestCollationFieldDocValues
*/
public static String setupSolrHome() throws Exception {
// make a solr home underneath the test's TEMP_DIR
- File tmpFile = createTempDir("collation1");
+ File tmpFile = createTempDir("collation1").toFile();
// make data and conf dirs
new File(tmpFile, "data").mkdir();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java Sat Sep 13 21:46:29 2014
@@ -47,7 +47,7 @@ public class TestManagedSchema extends A
@Before
private void initManagedSchemaCore() throws Exception {
- tmpSolrHome = createTempDir();
+ tmpSolrHome = createTempDir().toFile();
tmpConfDir = new File(tmpSolrHome, confDir);
File testHomeConfDir = new File(TEST_HOME(), confDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, "solrconfig-managed-schema.xml"), tmpConfDir);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java Sat Sep 13 21:46:29 2014
@@ -35,7 +35,7 @@ public class TestAddFieldRealTimeGet ext
@Before
private void initManagedSchemaCore() throws Exception {
- final String tmpSolrHomePath = createTempDir().getAbsolutePath();
+ final String tmpSolrHomePath = createTempDir().toFile().getAbsolutePath();
tmpSolrHome = new File(tmpSolrHomePath).getAbsoluteFile();
tmpConfDir = new File(tmpSolrHome, confDir);
File testHomeConfDir = new File(TEST_HOME(), confDir);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java Sat Sep 13 21:46:29 2014
@@ -77,7 +77,7 @@ public class TestRecoveryHdfs extends So
@BeforeClass
public static void beforeClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
System.setProperty("solr.hdfs.home", dfsCluster.getURI().toString() + "/solr");
hdfsUri = dfsCluster.getFileSystem().getUri().toString();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java Sat Sep 13 21:46:29 2014
@@ -49,7 +49,7 @@ public class TestSearcherReuse extends S
*/
@BeforeClass
private static void setupTempDirAndCoreWithManagedSchema() throws Exception {
- solrHome = createTempDir();
+ solrHome = createTempDir().toFile();
solrHome = solrHome.getAbsoluteFile();
File confDir = new File(solrHome, confPath);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java Sat Sep 13 21:46:29 2014
@@ -44,7 +44,7 @@ public class CacheHeaderTest extends Cac
@BeforeClass
public static void beforeTest() throws Exception {
- solrHomeDirectory = createTempDir();
+ solrHomeDirectory = createTempDir().toFile();
setupJettyTestHome(solrHomeDirectory, "collection1");
createJetty(solrHomeDirectory.getAbsolutePath(), null, null);
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java Sat Sep 13 21:46:29 2014
@@ -47,7 +47,7 @@ public class ResponseHeaderTest extends
@BeforeClass
public static void beforeTest() throws Exception {
- solrHomeDirectory = createTempDir();
+ solrHomeDirectory = createTempDir().toFile();
setupJettyTestHome(solrHomeDirectory, "collection1");
String top = SolrTestCaseJ4.TEST_HOME() + "/collection1/conf";
FileUtils.copyFile(new File(top, "solrconfig-headers.xml"), new File(solrHomeDirectory + "/collection1/conf", "solrconfig.xml"));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java Sat Sep 13 21:46:29 2014
@@ -71,7 +71,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 = createTempDir(LuceneTestCase.getTestClass().getSimpleName());
+ File indexDir = createTempDir(LuceneTestCase.getTestClass().getSimpleName()).toFile();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
SolrCore core = h.getCore();
String dictName = checker.init(spellchecker, core);
@@ -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 = createTempDir();
+ File indexDir = createTempDir().toFile();
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(SolrSpellChecker.FIELD_TYPE, "teststop");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Sat Sep 13 21:46:29 2014
@@ -110,7 +110,7 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File indexDir = createTempDir();
+ File indexDir = createTempDir().toFile();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(AbstractLuceneSpellChecker.FIELD, "title");
@@ -186,7 +186,7 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File indexDir = createTempDir();
+ File indexDir = createTempDir().toFile();
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(AbstractLuceneSpellChecker.FIELD, "title");
@@ -243,7 +243,7 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File indexDir = createTempDir();
+ File indexDir = createTempDir().toFile();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(AbstractLuceneSpellChecker.FIELD, "title");
spellchecker.add(AbstractLuceneSpellChecker.SPELLCHECKER_ARG_NAME, spellchecker);
@@ -282,11 +282,11 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File tmpDir = createTempDir();
+ File tmpDir = createTempDir().toFile();
File indexDir = new File(tmpDir, "spellingIdx");
//create a standalone index
File altIndexDir = new File(tmpDir, "alternateIdx" + new Date().getTime());
- Directory dir = newFSDirectory(altIndexDir);
+ Directory dir = newFSDirectory(altIndexDir.toPath());
IndexWriter iw = new IndexWriter(
dir,
new IndexWriterConfig(new WhitespaceAnalyzer())
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java Sat Sep 13 21:46:29 2014
@@ -105,8 +105,8 @@ public class BlockDirectoryTest extends
@Before
public void setUp() throws Exception {
super.setUp();
- file = createTempDir();
- FSDirectory dir = FSDirectory.open(new File(file, "base"));
+ file = createTempDir().toFile();
+ FSDirectory dir = FSDirectory.open(new File(file, "base").toPath());
mapperCache = new MapperCache();
directory = new BlockDirectory("test", dir, mapperCache, null, true, true);
random = random();
@@ -120,7 +120,7 @@ public class BlockDirectoryTest extends
@Test
public void testEOF() throws IOException {
- Directory fsDir = FSDirectory.open(new File(file, "normal"));
+ Directory fsDir = FSDirectory.open(new File(file, "normal").toPath());
String name = "test.eof";
createFile(name, fsDir, directory);
long fsLength = fsDir.fileLength(name);
@@ -152,7 +152,7 @@ public class BlockDirectoryTest extends
int i = 0;
try {
for (; i < 10; i++) {
- Directory fsDir = FSDirectory.open(new File(file, "normal"));
+ Directory fsDir = FSDirectory.open(new File(file, "normal").toPath());
String name = getName();
createFile(name, fsDir, directory);
assertInputsEquals(name, fsDir, directory);
@@ -234,7 +234,7 @@ public class BlockDirectoryTest extends
public static void rm(File file) {
try {
- IOUtils.rm(file);
+ IOUtils.rm(file.toPath());
} catch (Throwable ignored) {
// TODO: should this class care if a file couldnt be deleted?
// this just emulates previous behavior, where only SecurityException would be handled.
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java Sat Sep 13 21:46:29 2014
@@ -57,7 +57,7 @@ public class HdfsDirectoryTest extends S
@BeforeClass
public static void beforeClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
}
@AfterClass
@@ -73,7 +73,7 @@ public class HdfsDirectoryTest extends S
Configuration conf = new Configuration();
conf.set("dfs.permissions.enabled", "false");
- directory = new HdfsDirectory(new Path(dfsCluster.getURI().toString() + createTempDir().getAbsolutePath() + "/hdfs"), conf);
+ directory = new HdfsDirectory(new Path(dfsCluster.getURI().toString() + createTempDir().toFile().getAbsolutePath() + "/hdfs"), conf);
random = random();
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java Sat Sep 13 21:46:29 2014
@@ -42,7 +42,7 @@ public class HdfsLockFactoryTest extends
@BeforeClass
public static void beforeClass() throws Exception {
- dfsCluster = HdfsTestUtil.setupClass(createTempDir().getAbsolutePath());
+ dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
}
@AfterClass
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java Sat Sep 13 21:46:29 2014
@@ -56,9 +56,9 @@ public class SolrIndexSplitterTest exten
super.setUp();
clearIndex();
assertU(commit());
- indexDir1 = createTempDir("_testSplit1");
- indexDir2 = createTempDir("_testSplit2");
- indexDir3 = createTempDir("_testSplit3");
+ indexDir1 = createTempDir("_testSplit1").toFile();
+ indexDir2 = createTempDir("_testSplit2").toFile();
+ indexDir3 = createTempDir("_testSplit3").toFile();
}
@Test
@@ -241,7 +241,7 @@ public class SolrIndexSplitterTest exten
@Test
public void testSplitByRouteKey() throws Exception {
- File indexDir = createTempDir();
+ File indexDir = createTempDir().toFile();
CompositeIdRouter r1 = new CompositeIdRouter();
String splitKey = "sea-line!";
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java Sat Sep 13 21:46:29 2014
@@ -46,7 +46,7 @@ public class AddSchemaFieldsUpdateProces
@Before
private void initManagedSchemaCore() throws Exception {
- tmpSolrHome = createTempDir();
+ tmpSolrHome = createTempDir().toFile();
tmpConfDir = new File(tmpSolrHome, confDir);
File testHomeConfDir = new File(TEST_HOME(), confDir);
FileUtils.copyFileToDirectory(new File(testHomeConfDir, SOLRCONFIG_XML), tmpConfDir);
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java Sat Sep 13 21:46:29 2014
@@ -67,11 +67,11 @@ public abstract class MergeIndexesExampl
saveProp = System.getProperty("solr.directoryFactory");
System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
super.setUp();
- File dataDir1 = createTempDir();
+ File dataDir1 = createTempDir().toFile();
// setup datadirs
System.setProperty( "solr.core0.data.dir", dataDir1.getCanonicalPath() );
- dataDir2 = createTempDir();
+ dataDir2 = createTempDir().toFile();
System.setProperty( "solr.core1.data.dir", this.dataDir2.getCanonicalPath() );
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java Sat Sep 13 21:46:29 2014
@@ -57,8 +57,8 @@ public abstract class MultiCoreExampleTe
@Override public void setUp() throws Exception {
super.setUp();
- dataDir1 = createTempDir();
- dataDir2 = createTempDir();
+ dataDir1 = createTempDir().toFile();
+ dataDir2 = createTempDir().toFile();
System.setProperty( "solr.core0.data.dir", this.dataDir1.getCanonicalPath() );
System.setProperty( "solr.core1.data.dir", this.dataDir2.getCanonicalPath() );
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java Sat Sep 13 21:46:29 2014
@@ -39,7 +39,7 @@ public class SolrSchemalessExampleTest e
@BeforeClass
public static void beforeClass() throws Exception {
- File tempSolrHome = createTempDir();
+ File tempSolrHome = createTempDir().toFile();
// Schemaless renames schema.xml -> schema.xml.bak, and creates + modifies conf/managed-schema,
// which violates the test security manager's rules, which disallow writes outside the build dir,
// so we copy the example/example-schemaless/solr/ directory to a new temp dir where writes are allowed.
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java Sat Sep 13 21:46:29 2014
@@ -93,7 +93,7 @@ public class TestLBHttpSolrServer extend
httpClient = HttpClientUtil.createClient(null);
HttpClientUtil.setConnectionTimeout(httpClient, 1000);
for (int i = 0; i < solr.length; i++) {
- solr[i] = new SolrInstance("solr/collection1" + i, createTempDir("instance-" + i), 0);
+ solr[i] = new SolrInstance("solr/collection1" + i, createTempDir("instance-" + i).toFile(), 0);
solr[i].setUp();
solr[i].startJetty();
addDocs(solr[i]);
@@ -306,7 +306,7 @@ public class TestLBHttpSolrServer extend
public void tearDown() throws Exception {
if (jetty != null) jetty.stop();
- IOUtils.rm(homeDir);
+ IOUtils.rm(homeDir.toPath());
}
public void startJetty() throws Exception {
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java Sat Sep 13 21:46:29 2014
@@ -46,7 +46,7 @@ public abstract class AbstractEmbeddedSo
System.out.println("Solr home: " + SOLR_HOME.getAbsolutePath());
//The index is always stored within a temporary directory
- tempDir = createTempDir();
+ tempDir = createTempDir().toFile();
File dataDir = new File(tempDir,"data1");
File dataDir2 = new File(tempDir,"data2");
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Sat Sep 13 21:46:29 2014
@@ -59,7 +59,7 @@ public class JettyWebappTest extends Sol
System.setProperty("solr.solr.home", ExternalPaths.EXAMPLE_HOME);
System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
- File dataDir = createTempDir();
+ File dataDir = createTempDir().toFile();
dataDir.mkdirs();
System.setProperty("solr.data.dir", dataDir.getCanonicalPath());
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java Sat Sep 13 21:46:29 2014
@@ -37,7 +37,7 @@ public class SolrPingTest extends SolrJe
@BeforeClass
public static void beforeClass() throws Exception {
- File testHome = createTempDir();
+ File testHome = createTempDir().toFile();
FileUtils.copyDirectory(getFile("solrj/solr"), testHome);
initCore("solrconfig.xml", "schema.xml", testHome.getAbsolutePath(), "collection1");
}
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java Sat Sep 13 21:46:29 2014
@@ -76,7 +76,7 @@ public class TestCoreAdmin extends Abstr
public void testConfigSet() throws Exception {
SolrServer server = getSolrAdmin();
- File testDir = createTempDir(LuceneTestCase.getTestClass().getSimpleName());
+ File testDir = createTempDir(LuceneTestCase.getTestClass().getSimpleName()).toFile();
File newCoreInstanceDir = new File(testDir, "newcore");
@@ -99,9 +99,9 @@ public class TestCoreAdmin extends Abstr
SolrServer server = getSolrAdmin();
- File dataDir = createTempDir("data");
+ File dataDir = createTempDir("data").toFile();
- File newCoreInstanceDir = createTempDir("instance");
+ File newCoreInstanceDir = createTempDir("instance").toFile();
File instanceDir = new File(cores.getSolrHome());
FileUtils.copyDirectory(instanceDir, new File(newCoreInstanceDir,
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java Sat Sep 13 21:46:29 2014
@@ -49,7 +49,7 @@ public class ContentStreamTest extends S
{
InputStream is = new SolrResourceLoader(null, null).openResource( "solrj/README" );
assertNotNull( is );
- File file = new File(createTempDir(), "README");
+ File file = new File(createTempDir().toFile(), "README");
FileOutputStream os = new FileOutputStream(file);
IOUtils.copy(is, os);
os.close();
@@ -78,7 +78,7 @@ public class ContentStreamTest extends S
{
InputStream is = new SolrResourceLoader(null, null).openResource( "solrj/README" );
assertNotNull( is );
- File file = new File(createTempDir(), "README");
+ File file = new File(createTempDir().toFile(), "README");
FileOutputStream os = new FileOutputStream(file);
IOUtils.copy(is, os);
os.close();
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Sat Sep 13 21:46:29 2014
@@ -276,7 +276,7 @@ public abstract class BaseDistributedSea
super.setUp();
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
- testDir = createTempDir();
+ testDir = createTempDir().toFile();
}
@Override
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java Sat Sep 13 21:46:29 2014
@@ -61,7 +61,7 @@ abstract public class SolrJettyTestBase
// this sets the property for jetty starting SolrDispatchFilter
if (System.getProperty("solr.data.dir") == null && System.getProperty("solr.hdfs.home") == null) {
- jetty.setDataDir(createTempDir().getCanonicalPath());
+ jetty.setDataDir(createTempDir().toFile().getCanonicalPath());
}
jetty.start();
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Sat Sep 13 21:46:29 2014
@@ -91,6 +91,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.net.URL;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -153,7 +154,7 @@ public abstract class SolrTestCaseJ4 ext
@BeforeClass
@SuppressWarnings("unused")
private static void beforeClass() {
- initCoreDataDir = createTempDir("init-core-data");
+ initCoreDataDir = createTempDir("init-core-data").toFile();
System.err.println("Creating dataDir: " + initCoreDataDir.getAbsolutePath());
@@ -1038,12 +1039,12 @@ public abstract class SolrTestCaseJ4 ext
}
/**
- * @see IOUtils#rm(File...)
+ * @see IOUtils#rm(Path...)
*/
@Deprecated()
public static boolean recurseDelete(File f) {
try {
- IOUtils.rm(f);
+ IOUtils.rm(f.toPath());
return true;
} catch (IOException e) {
System.err.println(e.toString());
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Sat Sep 13 21:46:29 2014
@@ -272,7 +272,7 @@ public abstract class AbstractFullDistri
try {
- File controlJettyDir = createTempDir();
+ File controlJettyDir = createTempDir().toFile();
setupJettySolrHome(controlJettyDir);
controlJetty = createJetty(controlJettyDir, useJettyDataDir ? getDataDir(testDir
@@ -384,7 +384,7 @@ public abstract class AbstractFullDistri
if (sb.length() > 0) sb.append(',');
int cnt = this.jettyIntCntr.incrementAndGet();
- File jettyDir = createTempDir();
+ File jettyDir = createTempDir().toFile();
jettyDir.mkdirs();
setupJettySolrHome(jettyDir);
@@ -449,7 +449,7 @@ public abstract class AbstractFullDistri
int cnt = this.jettyIntCntr.incrementAndGet();
- File jettyDir = createTempDir("jetty");
+ File jettyDir = createTempDir("jetty").toFile();
jettyDir.mkdirs();
org.apache.commons.io.FileUtils.copyDirectory(new File(getSolrHome()), jettyDir);
JettySolrRunner j = createJetty(jettyDir, testDir + "/jetty" + cnt, shard, "solrconfig.xml", null);
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java Sat Sep 13 21:46:29 2014
@@ -63,7 +63,7 @@ public abstract class AbstractZkTestCase
@BeforeClass
public static void azt_beforeClass() throws Exception {
- zkDir = createTempDir("zkData").getAbsolutePath();
+ zkDir = createTempDir("zkData").toFile().getAbsolutePath();
zkServer = new ZkTestServer(zkDir);
zkServer.run();
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java?rev=1624784&r1=1624783&r2=1624784&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java Sat Sep 13 21:46:29 2014
@@ -19,6 +19,7 @@ package org.apache.solr.core;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -28,13 +29,13 @@ import org.apache.lucene.store.TrackingD
import org.apache.lucene.util.LuceneTestCase;
/**
- * Opens a directory with {@link LuceneTestCase#newFSDirectory(File)}
+ * Opens a directory with {@link LuceneTestCase#newFSDirectory(Path)}
*/
public class MockFSDirectoryFactory extends StandardDirectoryFactory {
@Override
public Directory create(String path, DirContext dirContext) throws IOException {
- Directory dir = LuceneTestCase.newFSDirectory(new File(path));
+ Directory dir = LuceneTestCase.newFSDirectory(new File(path).toPath());
// we can't currently do this check because of how
// Solr has to reboot a new Directory sometimes when replicating
// or rolling back - the old directory is closed and the following