svn commit: r1388492 - in /lucene/dev/trunk/solr: core/src/test/org/apache/solr/core/TestCoreContainer.java test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

[si...@apache.org]

Author: siren
Date: Fri Sep 21 13:43:28 2012
New Revision: 1388492

URL: http://svn.apache.org/viewvc?rev=1388492&view=rev
Log:
do not write to test-files dir, use dirs that are less likely to collide for jettys

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

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=1388492&r1=1388491&r2=1388492&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 Fri Sep 21 13:43:28 2012
@@ -27,7 +27,6 @@ import javax.xml.parsers.ParserConfigura
 import javax.xml.xpath.XPathExpressionException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.util.IOUtils;
 import org.apache.solr.SolrTestCaseJ4;
 import org.junit.BeforeClass;
@@ -43,19 +42,22 @@ public class TestCoreContainer extends S
 
 
   public void testShareSchema() throws IOException, ParserConfigurationException, SAXException {
-    final File workDir = new File(TEMP_DIR, this.getClass().getName());
+    
+    final File solrHomeDirectory = new File(TEMP_DIR, this.getClass().getName()
+        + "_shareSchema");
 
-    if (workDir.exists()) {
-      FileUtils.deleteDirectory(workDir);
+    if (solrHomeDirectory.exists()) {
+      FileUtils.deleteDirectory(solrHomeDirectory);
     }
-    assertTrue("Failed to mkdirs workDir", workDir.mkdirs());
+    assertTrue("Failed to mkdirs workDir", solrHomeDirectory.mkdirs());
+    
+    FileUtils.copyDirectory(new File(SolrTestCaseJ4.TEST_HOME()), solrHomeDirectory);
     
-    String solrHome = SolrResourceLoader.locateSolrHome();
-    File fconf = new File(solrHome, "solr.xml");
+    File fconf = new File(solrHomeDirectory, "solr.xml");
 
-    final CoreContainer cores = new CoreContainer(solrHome);
+    final CoreContainer cores = new CoreContainer(solrHomeDirectory.getAbsolutePath());
     System.setProperty("shareSchema", "true");
-    cores.load(solrHome, fconf);
+    cores.load(solrHomeDirectory.getAbsolutePath(), fconf);
     try {
       cores.setPersistent(false);
       assertTrue(cores.isShareSchema());
@@ -72,6 +74,7 @@ public class TestCoreContainer extends S
       core2.close();
     } finally {
       cores.shutdown();
+      System.clearProperty("shareSchema");
     }
   }
 
@@ -230,8 +233,9 @@ public class TestCoreContainer extends S
       //assert cero cores
       assertEquals("There should not be cores", 0, cores.getCores().size());
       
+      FileUtils.copyDirectory(new File(SolrTestCaseJ4.TEST_HOME(), "collection1"), solrHomeDirectory);
       //add a new core
-      CoreDescriptor coreDescriptor = new CoreDescriptor(cores, "core1", SolrTestCaseJ4.TEST_HOME() + "/collection1");
+      CoreDescriptor coreDescriptor = new CoreDescriptor(cores, "core1", solrHomeDirectory.getAbsolutePath());
       SolrCore newCore = cores.create(coreDescriptor);
       cores.register(newCore, false);
       

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=1388492&r1=1388491&r2=1388492&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 Fri Sep 21 13:43:28 2012
@@ -257,7 +257,12 @@ public abstract class AbstractFullDistri
     System.setProperty("collection", "control_collection");
     String numShards = System.getProperty(ZkStateReader.NUM_SHARDS_PROP);
     System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
-    controlJetty = createJetty(new File(getSolrHome()), testDir + "/control/data",
+    
+    File controlJettyDir = new File(TEMP_DIR,
+            getClass().getName() + "-controljetty-" + System.currentTimeMillis());
+    org.apache.commons.io.FileUtils.copyDirectory(new File(getSolrHome()), controlJettyDir);
+
+    controlJetty = createJetty(controlJettyDir, testDir + "/control/data",
         "control_shard");
     System.clearProperty("collection");
     if(numShards != null) {
@@ -290,7 +295,7 @@ public abstract class AbstractFullDistri
       if (sb.length() > 0) sb.append(',');
       int cnt = this.jettyIntCntr.incrementAndGet();
       File jettyDir = new File(TEMP_DIR,
-          "solrtest-" + "jetty" + cnt + "-" + System.currentTimeMillis());
+          getClass().getName() + "-jetty" + cnt + "-" + System.currentTimeMillis());
       jettyDir.mkdirs();
       org.apache.commons.io.FileUtils.copyDirectory(new File(getSolrHome()), jettyDir);
       JettySolrRunner j = createJetty(jettyDir, testDir + "/jetty"