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/14 01:20:31 UTC
svn commit: r1513691 - in /lucene/dev/trunk/solr/core/src:
test-files/solr/collection1/conf/ test/org/apache/solr/
test/org/apache/solr/core/
Author: hossman
Date: Tue Aug 13 23:20:31 2013
New Revision: 1513691
URL: http://svn.apache.org/r1513691
Log:
SOLR-4952: solrconfig.snippet.randomindexconfig.xml used in more configs, including eliminating TestPluginEnable and folding it into TestConfig
Removed:
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestPluginEnable.java
Modified:
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfig.java
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml?rev=1513691&r1=1513690&r2=1513691&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml Tue Aug 13 23:20:31 2013
@@ -45,4 +45,10 @@
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
+ <!-- see TestConfig.testDisableRequetsHandler -->
+ <requestHandler name="disabled" class="solr.StandardRequestHandler" enable="false"/>
+ <requestHandler name="enabled" class="solr.StandardRequestHandler" enable="true"/>
+
+
+
</config>
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml?rev=1513691&r1=1513690&r2=1513691&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml Tue Aug 13 23:20:31 2013
@@ -32,10 +32,7 @@
<dataDir>${solr.data.dir:}</dataDir>
- <indexConfig>
- <lockType>${solr.lock.type:native}</lockType>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
- </indexConfig>
+ <xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- an update processor the explicitly excludes distrib to test
clean errors when people attempt atomic updates w/o it
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml?rev=1513691&r1=1513690&r2=1513691&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer.xml Tue Aug 13 23:20:31 2013
@@ -26,7 +26,21 @@
<requestHandler name="standard" class="solr.StandardRequestHandler"></requestHandler>
<indexConfig>
- <useCompoundFile>${useCompoundFile:false}</useCompoundFile>
+ <!-- we don't use solrconfig.snippet.randomindexconfig.xml here
+ because we explicitly test that a mergedSegmentWarmer works,
+ but we can still test some of the other randomized indexConfig
+ settings
+ -->
<mergedSegmentWarmer class="org.apache.lucene.index.SimpleMergedSegmentWarmer"/>
+ <mergePolicy class="org.apache.solr.util.RandomMergePolicy" />
+
+ <useCompoundFile>${useCompoundFile}</useCompoundFile>
+ <maxBufferedDocs>${solr.tests.maxBufferedDocs}</maxBufferedDocs>
+ <maxIndexingThreads>${solr.tests.maxIndexingThreads}</maxIndexingThreads>
+ <ramBufferSizeMB>${solr.tests.ramBufferSizeMB}</ramBufferSizeMB>
+ <mergeScheduler class="${solr.tests.mergeScheduler}" />
+ <writeLockTimeout>1000</writeLockTimeout>
+ <commitLockTimeout>10000</commitLockTimeout>
+ <lockType>single</lockType>
</indexConfig>
</config>
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfig.java?rev=1513691&r1=1513690&r2=1513691&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestConfig.java Tue Aug 13 23:20:31 2013
@@ -70,6 +70,11 @@ public class TestConfig extends SolrTest
assertNull("should not have been able to find " + f, data);
}
}
+ @Test
+ public void testDisableRequetsHandler() throws Exception {
+ assertNull(h.getCore().getRequestHandler("disabled"));
+ assertNotNull(h.getCore().getRequestHandler("enabled"));
+ }
@Test
public void testJavaProperty() {