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 2012/03/23 16:46:29 UTC
svn commit: r1304456 - in /lucene/dev/branches/branch_3x/solr: ./ core/
solrj/src/test-files/solrj/solr/shared/conf/
solrj/src/test/org/apache/solr/client/solrj/embedded/
Author: rmuir
Date: Fri Mar 23 15:46:29 2012
New Revision: 1304456
URL: http://svn.apache.org/viewvc?rev=1304456&view=rev
Log:
SOLR-3112: Fix tests not to write to src/test-files
Added:
lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java
- copied, changed from r1304441, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTest.java
Modified:
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/core/ (props changed)
lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml
lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1304456&r1=1304455&r2=1304456&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Mar 23 15:46:29 2012
@@ -321,6 +321,8 @@ Build
----------------------
* SOLR-2487: Add build target to package war without slf4j jars (janhoy)
+* SOLR-3112: Fix tests not to write to src/test-files (Luca Cavanna via Robert Muir)
+
================== 3.5.0 ==================
Versions of Major Components
---------------------
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml?rev=1304456&r1=1304455&r2=1304456&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/shared/conf/solrconfig.xml Fri Mar 23 15:46:29 2012
@@ -22,7 +22,7 @@
-->
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
- <dataDir>${solr.solr.home}/data/${l10n}-${version}</dataDir>
+ <dataDir>${tempDir}/data/${l10n:}-${version:}</dataDir>
<updateHandler class="solr.DirectUpdateHandler2" />
Copied: lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java (from r1304441, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java?p2=lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java&p1=lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTest.java&r1=1304441&r2=1304456&rev=1304456&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java Fri Mar 23 15:46:29 2012
@@ -1,5 +1,22 @@
package org.apache.solr.client.solrj.embedded;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrServer;
@@ -12,9 +29,9 @@ import org.slf4j.LoggerFactory;
import java.io.File;
-public abstract class AbstractEmbeddedSolrServerTest extends LuceneTestCase {
+public abstract class AbstractEmbeddedSolrServerTestCase extends LuceneTestCase {
- protected static Logger log = LoggerFactory.getLogger(AbstractEmbeddedSolrServerTest.class);
+ protected static Logger log = LoggerFactory.getLogger(AbstractEmbeddedSolrServerTestCase.class);
protected static final File SOLR_HOME = SolrTestCaseJ4.getFile("solrj/solr/shared");
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java?rev=1304456&r1=1304455&r2=1304456&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java Fri Mar 23 15:46:29 2012
@@ -17,95 +17,44 @@ package org.apache.solr.client.solrj.emb
* limitations under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.Assert;
-
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.SystemPropertiesRestoreRule;
-import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.util.FileUtils;
-import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.util.AbstractSolrTestCase;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestEmbeddedSolrServer extends LuceneTestCase {
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestEmbeddedSolrServer extends AbstractEmbeddedSolrServerTestCase {
@Rule
public TestRule solrTestRules =
RuleChain.outerRule(new SystemPropertiesRestoreRule());
protected static Logger log = LoggerFactory.getLogger(TestEmbeddedSolrServer.class);
-
- protected CoreContainer cores = null;
- private File home;
-
- public String getSolrHome() {
- return "solrj/solr/shared";
- }
-
- public String getOrigSolrXml() {
- return "solr.xml";
- }
-
- public String getSolrXml() {
- return "test-solr.xml";
- }
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- System.setProperty("solr.solr.home", getSolrHome());
-
- home = SolrTestCaseJ4.getFile(getSolrHome());
- System.setProperty("solr.solr.home", home.getAbsolutePath());
- log.info("pwd: " + (new File(".")).getAbsolutePath());
- File origSolrXml = new File(home, getOrigSolrXml());
- File solrXml = new File(home, getSolrXml());
- FileUtils.copyFile(origSolrXml, solrXml);
- cores = new CoreContainer(home.getAbsolutePath(), solrXml);
+ protected EmbeddedSolrServer getSolrCore1() {
+ return new EmbeddedSolrServer(cores, "core1");
}
@Override
- @After
- public void tearDown() throws Exception {
- if (cores != null) {
- cores.shutdown();
- }
- File dataDir = new File(home,"data");
- if (!AbstractSolrTestCase.recurseDelete(dataDir)) {
- log.warn("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
- }
- super.tearDown();
- }
-
- protected EmbeddedSolrServer getSolrCore0() {
- return new EmbeddedSolrServer(cores, "core0");
+ protected File getSolrXml() throws Exception {
+ return new File(SOLR_HOME, "solr.xml");
}
- protected EmbeddedSolrServer getSolrCore1() {
- return new EmbeddedSolrServer(cores, "core1");
- }
-
public void testGetCoreContainer() {
- Assert.assertEquals(cores, getSolrCore0().getCoreContainer());
- Assert.assertEquals(cores, getSolrCore1().getCoreContainer());
+ Assert.assertEquals(cores, ((EmbeddedSolrServer)getSolrCore0()).getCoreContainer());
+ Assert.assertEquals(cores, ((EmbeddedSolrServer)getSolrCore1()).getCoreContainer());
}
public void testShutdown() {
- EmbeddedSolrServer solrServer = getSolrCore0();
+ EmbeddedSolrServer solrServer = (EmbeddedSolrServer)getSolrCore0();
Assert.assertEquals(2, cores.getCores().size());
List<SolrCore> solrCores = new ArrayList<SolrCore>();
@@ -121,7 +70,6 @@ public class TestEmbeddedSolrServer exte
for (SolrCore solrCore : solrCores) {
Assert.assertEquals(true, solrCore.isClosed());
}
-
}
}
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=1304456&r1=1304455&r2=1304456&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Fri Mar 23 15:46:29 2012
@@ -17,17 +17,6 @@
package org.apache.solr.client.solrj.embedded;
-import java.io.File;
-import java.io.FileInputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.SystemPropertiesRestoreRule;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
@@ -40,9 +29,6 @@ import org.apache.solr.client.solrj.resp
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.util.FileUtils;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.util.AbstractSolrTestCase;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
@@ -52,77 +38,50 @@ import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.io.FileInputStream;
+
/**
* @version $Id$
* @since solr 1.3
*/
-public class TestSolrProperties extends LuceneTestCase {
+public class TestSolrProperties extends AbstractEmbeddedSolrServerTestCase {
protected static Logger log = LoggerFactory.getLogger(TestSolrProperties.class);
- protected CoreContainer cores = null;
- private File home;
- private File solrXml;
-
+
+ private static final String SOLR_XML = "solr.xml";
+ private static final String SOLR_PERSIST_XML = "solr-persist.xml";
+
@Rule
public TestRule solrTestRules =
RuleChain.outerRule(new SystemPropertiesRestoreRule());
private static final XPathFactory xpathFactory = XPathFactory.newInstance();
- public String getSolrHome() {
- return "solrj/solr/shared";
- }
-
- public String getOrigSolrXml() {
- return "solr.xml";
- }
-
- public String getSolrXml() {
- return "test-solr.xml";
- }
-
@Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- System.setProperty("solr.solr.home", getSolrHome());
-
- home = SolrTestCaseJ4.getFile(getSolrHome());
- System.setProperty("solr.solr.home", home.getAbsolutePath());
-
- log.info("pwd: " + (new File(".")).getAbsolutePath());
- File origSolrXml = new File(home, getOrigSolrXml());
- solrXml = new File(home, getSolrXml());
+ protected File getSolrXml() throws Exception {
+ //This test writes on the directory where the solr.xml is located. Better to copy the solr.xml to
+ //the temporary directory where we store the index
+ File origSolrXml = new File(SOLR_HOME, SOLR_XML);
+ File solrXml = new File(tempDir, SOLR_XML);
FileUtils.copyFile(origSolrXml, solrXml);
- cores = new CoreContainer(home.getAbsolutePath(), solrXml);
+ return solrXml;
}
@Override
- @After
- public void tearDown() throws Exception {
- if (cores != null)
- cores.shutdown();
- File dataDir = new File(home,"data");
- String skip = System.getProperty("solr.test.leavedatadir");
- if (null != skip && 0 != skip.trim().length()) {
- log.info("NOTE: per solr.test.leavedatadir, dataDir will not be removed: " + dataDir.getAbsolutePath());
- } else {
- if (!AbstractSolrTestCase.recurseDelete(dataDir)) {
- log.warn("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
- }
- }
- File persistedFile = new File(home,"solr-persist.xml");
- assertTrue("Failed to delete "+persistedFile, persistedFile.delete());
- assertTrue("Failed to delete "+solrXml, solrXml.delete());
- super.tearDown();
- }
-
- protected SolrServer getSolrCore0() {
- return new EmbeddedSolrServer(cores, "core0");
- }
-
+ protected void deleteAdditionalFiles() {
+ super.deleteAdditionalFiles();
- protected SolrServer getSolrCore1() {
- return new EmbeddedSolrServer(cores, "core1");
+ //Cleans the solr.xml persisted while testing and the solr.xml copied to the temporary directory
+ File persistedFile = new File(tempDir, SOLR_PERSIST_XML);
+ assertTrue("Failed to delete "+persistedFile, persistedFile.delete());
+ File solrXml = new File(tempDir, SOLR_XML);
+ assertTrue("Failed to delete "+ solrXml, solrXml.delete());
}
protected SolrServer getSolrAdmin() {
@@ -133,10 +92,6 @@ public class TestSolrProperties extends
return new EmbeddedSolrServer(cores, "renamed_core");
}
- protected SolrServer getSolrCore(String name) {
- return new EmbeddedSolrServer(cores, name);
- }
-
@Test
public void testProperties() throws Exception {
UpdateRequest up = new UpdateRequest();
@@ -208,11 +163,11 @@ public class TestSolrProperties extends
long after = mcr.getStartTime(name).getTime();
assertTrue("should have more recent time: " + after + "," + before, after > before);
- mcr = CoreAdminRequest.persist("solr-persist.xml", coreadmin);
+ mcr = CoreAdminRequest.persist(SOLR_PERSIST_XML, coreadmin);
// System.out.println(IOUtils.toString(new FileInputStream(new File(solrXml.getParent(), "solr-persist.xml"))));
DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- FileInputStream fis = new FileInputStream(new File(solrXml.getParent(), "solr-persist.xml"));
+ FileInputStream fis = new FileInputStream(new File(tempDir, SOLR_PERSIST_XML));
try {
Document document = builder.parse(fis);
assertTrue(exists("/solr/cores[@defaultCoreName='core0']", document));
@@ -221,9 +176,9 @@ public class TestSolrProperties extends
}
CoreAdminRequest.renameCore(name, "renamed_core", coreadmin);
- mcr = CoreAdminRequest.persist("solr-persist.xml", getRenamedSolrAdmin());
+ mcr = CoreAdminRequest.persist(SOLR_PERSIST_XML, getRenamedSolrAdmin());
- fis = new FileInputStream(new File(solrXml.getParent(), "solr-persist.xml"));
+ fis = new FileInputStream(new File(tempDir, SOLR_PERSIST_XML));
try {
Document document = builder.parse(fis);
assertTrue(exists("/solr/cores/core[@name='renamed_core']", document));