Skip to content

Commit c7630fe

Browse files
authored
Default to MockDirectoryFactory in test configs (#2598)
This was already the effective default value, by virtue of it being set in 'randomization.gradle'. But setting the value there instead of in the config files themselves meant that the value wasn't being properly set for IDE test runners. This commit fixes this by removing the 'randomization.gradle' setting and instead setting MockDirectoryFactory as the default (via ${} expansion syntax) in each individual test solrconfig file.
1 parent 8ab0278 commit c7630fe

File tree

92 files changed

+90
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+90
-95
lines changed

gradle/testing/randomization.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr") }) {
126126
plugins.withType(JavaPlugin) {
127127
ext {
128128
testOptions += [
129-
[propName: 'solr.directoryFactory', value: "org.apache.solr.core.MockDirectoryFactory", description: "Solr directory factory."],
130129
[propName: 'tests.src.home', value: null, description: "See SOLR-14023."],
131130
[propName: 'solr.tests.use.numeric.points', value: null, description: "Point implementation to use (true=numerics, false=trie)."],
132131
]

solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<config>
2121

22-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
22+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
2323

2424
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
2525

solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<config>
2121

22-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
22+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
2323

2424
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
2525

solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<config>
2222
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
23-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
23+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
2424
<schemaFactory class="ClassicIndexSchemaFactory"/>
2525
<indexConfig>
2626
<useCompoundFile>${unset.sys.property}</useCompoundFile>

solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<config>
2121
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
2222
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
23-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
23+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
2424
<schemaFactory class="ClassicIndexSchemaFactory"/>
2525
<queryParser name="foo" class="FooQParserPlugin"/>
2626
<!-- override the default "lucene" qparser -->

solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<config>
2525
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
2626
<requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
27-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
27+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
2828

2929
<schemaFactory class="ManagedIndexSchemaFactory">
3030
<bool name="mutable">true</bool>

solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<!-- The DirectoryFactory to use for indexes.
3939
solr.StandardDirectoryFactory, the default, is filesystem based.
4040
solr.RAMDirectoryFactory is memory based and not persistent. -->
41-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}">
41+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}">
4242
<double name="maxWriteMBPerSecDefault">1000000</double>
4343
<double name="maxWriteMBPerSecFlush">2000000</double>
4444
<double name="maxWriteMBPerSecMerge">3000000</double>

solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
2424
<dataDir>${solr.data.dir:}</dataDir>
2525
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
26-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
26+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
2727
<schemaFactory class="ClassicIndexSchemaFactory"/>
2828
<requestHandler name="/select" class="solr.SearchHandler" />
2929
</config>

solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
2222
<dataDir>${solr.data.dir:}</dataDir>
2323
<xi:include href="solrconfig.snippet.randomindexconfig.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
24-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
24+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
2525
<schemaFactory class="ClassicIndexSchemaFactory"/>
2626
<requestHandler name="/select" class="solr.SearchHandler" />
2727

solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
2525
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="solrconfig.snippet.randomindexconfig.xml"/>
2626
<requestHandler name="/select" class="solr.SearchHandler"></requestHandler>
27-
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
27+
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.MockDirectoryFactory}"/>
2828
<schemaFactory class="ClassicIndexSchemaFactory"/>
2929

3030
<updateHandler class="solr.DirectUpdateHandler2">

0 commit comments

Comments
 (0)