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/10/13 19:05:41 UTC

svn commit: r1022191 - in /lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport: TestDocBuilder2.java TestFileListEntityProcessor.java TestXPathEntityProcessor.java

Author: rmuir
Date: Wed Oct 13 17:05:39 2010
New Revision: 1022191

URL: http://svn.apache.org/viewvc?rev=1022191&view=rev
Log:
use unique temp directories

Modified:
    lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
    lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
    lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=1022191&r1=1022190&r2=1022191&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java Wed Oct 13 17:05:39 2010
@@ -215,8 +215,8 @@ public class TestDocBuilder2 extends Abs
 
   @Test
   public void testFileListEntityProcessor_lastIndexTime() throws Exception  {
-    long time = System.currentTimeMillis();
-    File tmpdir = new File("." + time);
+    File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+    tmpdir.delete();
     tmpdir.mkdir();
     tmpdir.deleteOnExit();
 

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java?rev=1022191&r1=1022190&r2=1022191&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java Wed Oct 13 17:05:39 2010
@@ -35,8 +35,8 @@ public class TestFileListEntityProcessor
   @Test
   @SuppressWarnings("unchecked")
   public void testSimple() throws IOException {
-    long time = System.currentTimeMillis();
-    File tmpdir = new File("." + time);
+    File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+    tmpdir.delete();
     tmpdir.mkdir();
     tmpdir.deleteOnExit();
     createFile(tmpdir, "a.xml", "a.xml".getBytes(), false);
@@ -61,8 +61,8 @@ public class TestFileListEntityProcessor
   
   @Test
   public void testBiggerSmallerFiles() throws IOException {
-    long time = System.currentTimeMillis();
-    File tmpdir = new File("." + time);
+    File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+    tmpdir.delete();
     tmpdir.mkdir();
     tmpdir.deleteOnExit();
     long minLength = Long.MAX_VALUE;
@@ -131,8 +131,8 @@ public class TestFileListEntityProcessor
 
   @Test
   public void testNTOT() throws IOException {
-    long time = System.currentTimeMillis();
-    File tmpdir = new File("." + time);
+    File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+    tmpdir.delete();
     tmpdir.mkdir();
     tmpdir.deleteOnExit();
     createFile(tmpdir, "a.xml", "a.xml".getBytes(), true);
@@ -167,8 +167,8 @@ public class TestFileListEntityProcessor
 
   @Test
   public void testRECURSION() throws IOException {
-    long time = System.currentTimeMillis();
-    File tmpdir = new File("." + time);
+    File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+    tmpdir.delete();
     tmpdir.mkdir();
     tmpdir.deleteOnExit();
     File childdir = new File(tmpdir + "/child" );

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java?rev=1022191&r1=1022190&r2=1022191&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java Wed Oct 13 17:05:39 2010
@@ -42,12 +42,11 @@ public class TestXPathEntityProcessor ex
   
   @Test
   public void withFieldsAndXpath() throws Exception {
-    long time = System.currentTimeMillis();
-    File tmpdir = new File("." + time);
+    File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+    tmpdir.delete();
     tmpdir.mkdir();
     tmpdir.deleteOnExit();
-    TestFileListEntityProcessor.createFile(tmpdir, "x.xsl", xsl.getBytes(),
-            false);
+    createFile(tmpdir, "x.xsl", xsl.getBytes(), false);
     Map entityAttrs = createMap("name", "e", "url", "cd.xml",
             XPathEntityProcessor.FOR_EACH, "/catalog/cd");
     List fields = new ArrayList();
@@ -208,8 +207,8 @@ public class TestXPathEntityProcessor ex
   
   @Test
   public void withDefaultSolrAndXsl() throws Exception {
-    long time = System.currentTimeMillis();
-    File tmpdir = new File("." + time);
+    File tmpdir = File.createTempFile("test", "tmp", TEMP_DIR);
+    tmpdir.delete();
     tmpdir.mkdir();
     tmpdir.deleteOnExit();
     TestFileListEntityProcessor.createFile(tmpdir, "x.xsl", xsl.getBytes(),