You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2013/08/06 04:04:43 UTC
svn commit: r1510838 - in /lucene/dev/trunk/solr/core/src:
test-files/solr/collection1/conf/ test/org/apache/solr/handler/
test/org/apache/solr/schema/
Author: hossman
Date: Tue Aug 6 02:04:42 2013
New Revision: 1510838
URL: http://svn.apache.org/r1510838
Log:
SOLR-4952: get TestReplicationHandler using solrconfig.snippet.randomindexconfig.xml. This also fixes NumericFieldsTest and TestBinaryField which were using the replication configs for no explicable reason, and since i needed to fix TestBinaryField anyway, i simplified it to use SolrJettyTestBase instead of it's own kludgy setup
Modified:
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml Tue Aug 6 02:04:42 2013
@@ -24,5 +24,6 @@
<dataDir>${solr.data.dir:}</dataDir>
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
+ <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="/update" class="solr.UpdateRequestHandler" />
</config>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml Tue Aug 6 02:04:42 2013
@@ -22,10 +22,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<dataDir>${solr.data.dir:}</dataDir>
- <indexConfig>
- <lockType>single</lockType>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- </indexConfig>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml Tue Aug 6 02:04:42 2013
@@ -21,10 +21,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <indexConfig>
- <lockType>single</lockType>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- </indexConfig>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml Tue Aug 6 02:04:42 2013
@@ -22,10 +22,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <indexConfig>
- <lockType>single</lockType>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- </indexConfig>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml Tue Aug 6 02:04:42 2013
@@ -22,10 +22,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <indexConfig>
- <lockType>single</lockType>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- </indexConfig>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml Tue Aug 6 02:04:42 2013
@@ -22,10 +22,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <indexConfig>
- <lockType>single</lockType>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- </indexConfig>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml Tue Aug 6 02:04:42 2013
@@ -22,10 +22,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<dataDir>${solr.data.dir:}</dataDir>
- <indexConfig>
- <lockType>single</lockType>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- </indexConfig>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml Tue Aug 6 02:04:42 2013
@@ -22,10 +22,7 @@
<dataDir>${solr.data.dir:}</dataDir>
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
- <indexConfig>
- <lockType>single</lockType>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- </indexConfig>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<updateHandler class="solr.DirectUpdateHandler2">
</updateHandler>
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=1510838&r1=1510837&r2=1510838&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 Tue Aug 6 02:04:42 2013
@@ -1572,6 +1572,8 @@ public class TestReplicationHandler exte
copyConfigFile(getSolrConfigFile(), "solrconfig.xml");
copyConfigFile(getSchemaFile(), "schema.xml");
+ copyConfigFile(CONF_DIR + "solrconfig.snippet.randomindexconfig.xml",
+ "solrconfig.snippet.randomindexconfig.xml");
}
public void tearDown() throws Exception {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java?rev=1510838&r1=1510837&r2=1510838&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java Tue Aug 6 02:04:42 2013
@@ -26,7 +26,7 @@ import org.junit.Test;
public class NumericFieldsTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig-master.xml", "schema-numeric.xml");
+ initCore("solrconfig-basic.xml", "schema-numeric.xml");
}
static String[] types = new String[]{"int", "long", "float", "double", "date"};
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=1510838&r1=1510837&r2=1510838&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 Tue Aug 6 02:04:42 2013
@@ -22,71 +22,47 @@ import java.nio.ByteBuffer;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.lucene.util.LuceneTestCase;
+import org.apache.commons.io.FileUtils;
+
+import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.beans.Field;
-import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.*;
import org.apache.solr.core.SolrResourceLoader;
-import org.junit.Rule;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TestRule;
-
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-
-public class TestBinaryField extends LuceneTestCase {
- HttpSolrServer server;
- JettySolrRunner jetty;
-
- int port = 0;
- static final String context = "/example";
-
- @Rule
- public TestRule solrTestRules =
- RuleChain.outerRule(new SystemPropertiesRestoreRule());
+import org.apache.solr.SolrJettyTestBase;
+import org.junit.BeforeClass;
- @Override
- public void setUp() throws Exception {
- super.setUp();
+public class TestBinaryField extends SolrJettyTestBase {
- File home = new File(TEMP_DIR,
- "solrtest-TestBinaryField-" + System.currentTimeMillis());
-
- File homeDir = new File(home, "example");
- File dataDir = new File(homeDir + "/collection1", "data");
- File confDir = new File(homeDir + "/collection1", "conf");
+ @BeforeClass
+ public static void beforeTest() throws Exception {
+ File homeDir = new File(TEMP_DIR,
+ "solrtest-TestBinaryField-" + System.currentTimeMillis());
+ File collDir = new File(homeDir, "collection1");
+ File dataDir = new File(collDir, "data");
+ File confDir = new File(collDir, "conf");
homeDir.mkdirs();
+ collDir.mkdirs();
dataDir.mkdirs();
confDir.mkdirs();
- SolrResourceLoader loader = new SolrResourceLoader("solr/collection1");
- File f = new File(confDir, "solrconfig.xml");
- String fname = "solr/collection1/conf/solrconfig-slave1.xml";
- FileOutputStream out = new FileOutputStream(f);
- IOUtils.copy(loader.openResource(fname), out);
- out.close();
- f = new File(confDir, "schema.xml");
- fname = "solr/collection1/conf/schema-binaryfield.xml";
- out = new FileOutputStream(f);
- IOUtils.copy(loader.openResource(fname), out);
- out.close();
- System.setProperty("solr.data.dir", dataDir.getAbsolutePath());
- System.setProperty("solr.test.sys.prop1", "propone");
- System.setProperty("solr.test.sys.prop2", "proptwo");
- System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong()));
-
- jetty = new JettySolrRunner(homeDir.getAbsolutePath(), context, 0);
- jetty.start();
- port = jetty.getLocalPort();
+ String src_dir = TEST_HOME() + "/collection1/conf";
+ FileUtils.copyFile(new File(src_dir, "schema-binaryfield.xml"),
+ new File(confDir, "schema.xml"));
+ FileUtils.copyFile(new File(src_dir, "solrconfig-basic.xml"),
+ new File(confDir, "solrconfig.xml"));
+ FileUtils.copyFile(new File(src_dir, "solrconfig.snippet.randomindexconfig.xml"),
+ new File(confDir, "solrconfig.snippet.randomindexconfig.xml"));
- String url = "http://127.0.0.1:" + jetty.getLocalPort() + context;
- server = new HttpSolrServer(url);
+ createJetty(homeDir.getAbsolutePath(), null, null);
}
+
public void testSimple() throws Exception {
+ SolrServer server = getSolrServer();
byte[] buf = new byte[10];
for (int i = 0; i < 10; i++) {
buf[i] = (byte) i;
@@ -179,11 +155,4 @@ public class TestBinaryField extends Luc
byte [] data;
}
-
- @Override
- public void tearDown() throws Exception {
- jetty.stop();
- System.clearProperty("tests.shardhandler.randomSeed");
- super.tearDown();
- }
}