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 2010/08/02 20:24:32 UTC
svn commit: r981650 - in /lucene/dev/trunk/solr:
contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/
src/test/org/apache/solr/ src/test/org/apache/solr/client/solrj/
src/test/org/apache/solr/client/solrj/embedded/ src/test/org/a...
Author: rmuir
Date: Mon Aug 2 18:24:32 2010
New Revision: 981650
URL: http://svn.apache.org/viewvc?rev=981650&view=rev
Log:
SOLR-2011: change all uses of java.io.tmpdir -> TEMP_DIR
Modified:
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/trunk/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Mon Aug 2 18:24:32 2010
@@ -18,6 +18,7 @@ package org.apache.solr.handler.dataimpo
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.request.DirectXmlRequest;
@@ -107,12 +108,11 @@ public class TestContentStreamDataSource
public void setUp() throws Exception {
- String home = System.getProperty("java.io.tmpdir")
- + File.separator
- + getClass().getName() + "-" + System.currentTimeMillis();
+ File home = new File(SolrTestCaseJ4.TEMP_DIR,
+ getClass().getName() + "-" + System.currentTimeMillis());
- homeDir = new File(home + "inst");
+ homeDir = new File(home, "inst");
dataDir = new File(homeDir, "data");
confDir = new File(homeDir, "conf");
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/BaseDistributedSearchTestCase.java Mon Aug 2 18:24:32 2010
@@ -116,9 +116,8 @@ public abstract class BaseDistributedSea
super.setUp();
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
- testDir = new File(System.getProperty("java.io.tmpdir")
- + System.getProperty("file.separator")
- + getClass().getName() + "-" + System.currentTimeMillis());
+ testDir = new File(TEMP_DIR,
+ getClass().getName() + "-" + System.currentTimeMillis());
testDir.mkdirs();
}
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/TestSolrCoreProperties.java Mon Aug 2 18:24:32 2010
@@ -101,14 +101,12 @@ public class TestSolrCoreProperties exte
public void setUpMe() throws Exception {
- String home = System.getProperty("java.io.tmpdir")
- + File.separator
- + getClass().getName() + "-" + System.currentTimeMillis();
+ homeDir = new File(TEMP_DIR,
+ getClass().getName() + "-" + System.currentTimeMillis());
- homeDir = new File(home);
- dataDir = new File(home, "data");
- confDir = new File(home, "conf");
+ dataDir = new File(homeDir, "data");
+ confDir = new File(homeDir, "conf");
homeDir.mkdirs();
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java Mon Aug 2 18:24:32 2010
@@ -21,6 +21,7 @@ import junit.framework.TestCase;
import junit.framework.Assert;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.io.FileUtils;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.impl.LBHttpSolrServer;
@@ -188,9 +189,8 @@ public class TestLBHttpSolrServer extend
}
public void setUp() throws Exception {
- String home = System.getProperty("java.io.tmpdir")
- + File.separator
- + getClass().getName() + "-" + System.currentTimeMillis();
+ File home = new File(SolrTestCaseJ4.TEMP_DIR,
+ getClass().getName() + "-" + System.currentTimeMillis());
homeDir = new File(home, name);
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Mon Aug 2 18:24:32 2010
@@ -24,6 +24,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.commons.io.IOUtils;
+import org.apache.solr.SolrTestCaseJ4;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.bio.SocketConnector;
@@ -46,9 +47,8 @@ public class JettyWebappTest extends Tes
{
System.setProperty("solr.solr.home", "../../../example/solr");
- File dataDir = new File(System.getProperty("java.io.tmpdir")
- + System.getProperty("file.separator")
- + getClass().getName() + "-" + System.currentTimeMillis());
+ File dataDir = new File(SolrTestCaseJ4.TEMP_DIR,
+ getClass().getName() + "-" + System.currentTimeMillis());
dataDir.mkdirs();
System.setProperty("solr.data.dir", dataDir.getCanonicalPath());
String path = "../../webapp/web";
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Mon Aug 2 18:24:32 2010
@@ -48,9 +48,8 @@ public class TestArbitraryIndexDir exten
public void setUp() throws Exception {
super.setUp();
- dataDir = new File(System.getProperty("java.io.tmpdir")
- + System.getProperty("file.separator")
- + getClass().getName() + "-" + System.currentTimeMillis() + System.getProperty("file.separator") + "solr"
+ dataDir = new File(TEMP_DIR,
+ getClass().getName() + "-" + System.currentTimeMillis() + System.getProperty("file.separator") + "solr"
+ System.getProperty("file.separator") + "data");
dataDir.mkdirs();
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java Mon Aug 2 18:24:32 2010
@@ -652,18 +652,17 @@ public class TestReplicationHandler exte
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
- String home = System.getProperty("java.io.tmpdir")
- + File.separator
- + getClass().getName() + "-" + System.currentTimeMillis();
+ File home = new File(TEMP_DIR,
+ getClass().getName() + "-" + System.currentTimeMillis());
if (null == masterPort) {
- homeDir = new File(home + "master");
- dataDir = new File(home + "master", "data");
- confDir = new File(home + "master", "conf");
+ homeDir = new File(home, "master");
+ dataDir = new File(homeDir, "data");
+ confDir = new File(homeDir, "conf");
} else {
- homeDir = new File(home + "slave");
- dataDir = new File(home + "slave", "data");
- confDir = new File(home + "slave", "conf");
+ homeDir = new File(home, "slave");
+ dataDir = new File(homeDir, "data");
+ confDir = new File(homeDir, "conf");
}
homeDir.mkdirs();
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java Mon Aug 2 18:24:32 2010
@@ -70,8 +70,7 @@ public class FileBasedSpellCheckerTest e
spellchecker.add(AbstractLuceneSpellChecker.LOCATION, spelling.getAbsolutePath());
spellchecker.add(IndexBasedSpellChecker.FIELD, "teststop");
spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
- File tmpDir = new File(System.getProperty("java.io.tmpdir"));
- File indexDir = new File(tmpDir, "spellingIdx" + new Date().getTime());
+ File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
indexDir.mkdirs();
spellchecker.add(FileBasedSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
SolrCore core = h.getCore();
@@ -107,8 +106,7 @@ public class FileBasedSpellCheckerTest e
spellchecker.add(AbstractLuceneSpellChecker.LOCATION, spelling.getAbsolutePath());
spellchecker.add(IndexBasedSpellChecker.FIELD, "teststop");
spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
- File tmpDir = new File(System.getProperty("java.io.tmpdir"));
- File indexDir = new File(tmpDir, "spellingIdx" + new Date().getTime());
+ File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
indexDir.mkdirs();
spellchecker.add(FileBasedSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(FileBasedSpellChecker.FIELD_TYPE, "teststop");
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=981650&r1=981649&r2=981650&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Mon Aug 2 18:24:32 2010
@@ -82,8 +82,7 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File tmpDir = new File(System.getProperty("java.io.tmpdir"));
- File indexDir = new File(tmpDir, "spellingIdx" + new Date().getTime());
+ File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(IndexBasedSpellChecker.FIELD, "title");
@@ -157,8 +156,7 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File tmpDir = new File(System.getProperty("java.io.tmpdir"));
- File indexDir = new File(tmpDir, "spellingIdx" + new Date().getTime());
+ File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(IndexBasedSpellChecker.FIELD, "title");
@@ -213,8 +211,7 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File tmpDir = new File(System.getProperty("java.io.tmpdir"));
- File indexDir = new File(tmpDir, "spellingIdx" + new Date().getTime());
+ File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
spellchecker.add(IndexBasedSpellChecker.FIELD, "title");
@@ -254,10 +251,9 @@ public class IndexBasedSpellCheckerTest
NamedList spellchecker = new NamedList();
spellchecker.add("classname", IndexBasedSpellChecker.class.getName());
- File tmpDir = new File(System.getProperty("java.io.tmpdir"));
- File indexDir = new File(tmpDir, "spellingIdx" + new Date().getTime());
+ File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
//create a standalone index
- File altIndexDir = new File(tmpDir, "alternateIdx" + new Date().getTime());
+ File altIndexDir = new File(TEMP_DIR, "alternateIdx" + new Date().getTime());
IndexWriter iw = new IndexWriter(FSDirectory.open(altIndexDir), new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
for (int i = 0; i < ALT_DOCS.length; i++) {
Document doc = new Document();