diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradle index a7af5faf1bea..bc11f3b71108 100644 --- a/gradle/testing/randomization.gradle +++ b/gradle/testing/randomization.gradle @@ -90,7 +90,7 @@ allprojects { // asserts, debug output. [propName: 'tests.asserts', value: "true", description: "Enables or disables assertions mode."], [propName: 'tests.infostream', value: false, description: "Enables or disables infostream logs."], - [propName: 'tests.leaveTemporary', value: false, description: "Leave temporary directories after tests complete."], + [propName: 'tests.leavetmpdir.enabled', value: false, description: "Leave temporary directories after tests complete."], [propName: 'tests.useSecurityManager', value: {-> rootProject.ext.runtimeJavaVersion <= JavaVersion.VERSION_23 ? 'true' : 'false'}, @@ -130,7 +130,7 @@ configure(allprojects.findAll {project -> project.path.startsWith(":solr")}) { project.ext { testOptions += [ [propName: 'tests.src.home', value: null, description: "See SOLR-14023."], - [propName: 'solr.tests.use.numeric.points', value: null, description: "Point implementation to use (true=numerics, false=trie)."], + [propName: 'tests.solr.use.numeric.points', value: null, description: "Point implementation to use (true=numerics, false=trie)."], [propName: 'tests.ssl', value: null, description: "Control SSL: true=force on, false=force off, unset=randomize (all respect @SuppressSSL)."], [propName: 'tests.selenium', value: false, description: "Enables or disables @SeleniumTest tests (browser-based, need a local Chrome)."], ] @@ -161,22 +161,8 @@ allprojects { Commandline.quoteArgument("-P" + opt.propName + "=" + testOptionsResolved[opt.propName]) }.join(" ") - // leaving temporary folder option has multiple aliases... - if ([ - "tests.leaveTemporary", - "tests.leavetemporary", - "tests.leavetmpdir", - "solr.test.leavetmpdir", - ].find {prop -> - def v = Boolean.parseBoolean(propertyOrDefault(prop, "false")) - if (v) { - logger - .lifecycle("Update your code to use the official 'tests.leaveTemporary' option (you used '${prop}').") - } - return v - }) { - testOptionsResolved['tests.leaveTemporary'] = "true" - } + + testOptionsResolved['tests.leavetmpdir.enabled'] = "true" // Append resolved test properties to the test task. tasks.withType(Test) { diff --git a/solr/benchmark/src/resources/configs/minimal/conf/solrconfig.xml b/solr/benchmark/src/resources/configs/minimal/conf/solrconfig.xml index 346b0448318c..b02bbc58a7fe 100644 --- a/solr/benchmark/src/resources/configs/minimal/conf/solrconfig.xml +++ b/solr/benchmark/src/resources/configs/minimal/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -44,4 +44,3 @@ - diff --git a/solr/benchmark/src/resources/solr.xml b/solr/benchmark/src/resources/solr.xml index 9292940b2221..8118c9c7f452 100644 --- a/solr/benchmark/src/resources/solr.xml +++ b/solr/benchmark/src/resources/solr.xml @@ -25,7 +25,7 @@ ${configSetBaseDir:configsets} ${coreRootDirectory:.} ${solr.security.allow.paths:} - ${solr.tests.security.allow.urls:} + ${tests.solr.security.allow.urls:} ${socketTimeout:15000} diff --git a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml index 3be62af129d2..01993264fe1a 100644 --- a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml +++ b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml @@ -21,7 +21,7 @@ --> - + diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml index af4edbddcaf6..be0859c764e7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml @@ -19,7 +19,7 @@ - + ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml index bfaf24a0cfae..88c94aafd04c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml @@ -19,7 +19,7 @@ - + ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-enums.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-enums.xml index af6893408ef2..c761d803d943 100644 --- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-enums.xml +++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-enums.xml @@ -21,7 +21,7 @@ - + id @@ -30,5 +30,5 @@ but you can always add new values to the end. --> - + diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-no-autocommit-tag.xml b/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-no-autocommit-tag.xml index 1040db646713..9411f953b7a7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-no-autocommit-tag.xml +++ b/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-no-autocommit-tag.xml @@ -25,7 +25,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -49,4 +49,3 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml index 70edc2d47234..0f75ad17a17e 100644 --- a/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${unset.sys.property} diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml index 8c2829421b9c..1637b7d01087 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml @@ -40,7 +40,7 @@ Test for HighlighterMaxOffsetTest which requires the use of ReversedWildcardFilt - + @@ -47,8 +47,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml index 703b4d93b7c3..1de2358b9ea6 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml @@ -27,10 +27,10 @@ - - - - + + + + @@ -70,7 +70,7 @@ - + - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml index 2b1f719c6dc3..022ba9365ee1 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml @@ -29,8 +29,8 @@ - - + + @@ -39,7 +39,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-deprecations.xml b/solr/core/src/test-files/solr/collection1/conf/schema-deprecations.xml index a44cb99f67f4..917498d79593 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-deprecations.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-deprecations.xml @@ -19,7 +19,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml index ec3499365fe0..8a9667226e37 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml @@ -17,11 +17,11 @@ --> - - - - - + + + + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml index 90caa68a3c8a..83877d960169 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml @@ -17,29 +17,29 @@ --> - - + + - - + + - - + + - - + + - - + + - - + + - - diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml index 74f377c6640f..1039b1265ffb 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml @@ -38,14 +38,14 @@ These are provided more for backward compatability, allowing one to create a schema that matches an existing lucene index. --> - - - - + + + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml index 67e6789f6101..b6c28fef64e7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml @@ -17,11 +17,11 @@ --> - - - - - + + + + + @@ -33,38 +33,38 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml index 0fccb86224fb..cdb8eadacd24 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml @@ -30,11 +30,11 @@ 1.6: useDocValuesAsStored defaults to true. 1.7: docValues defaults to true, uninvertible defaults to false. --> - - - - - + + + + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml index 7571a840de35..a40e223ae81c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml @@ -19,11 +19,11 @@ - - - - - + + + + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml index 71d0bcc7420b..a70e824d7524 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMulti.xml @@ -18,14 +18,14 @@ - - - - + + + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml b/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml index 3a201fc3ea67..050544336665 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml @@ -20,13 +20,13 @@ - + - - + + - + id @@ -44,6 +44,6 @@ but you can always add new values to the end. --> - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml index c427320706ec..a8477c8f8bf2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml @@ -17,19 +17,19 @@ --> - + - - + + - id diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml b/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml index 54fc2cc98f95..b2796bdfa898 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-folding.xml @@ -217,12 +217,12 @@ - - - - + + + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml index 67906be1cdbd..ac99669ce677 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml @@ -40,15 +40,15 @@ to create a schema that matches an existing lucene index. --> - - - - + + + + - - - - + + + + - - + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-inplace-required-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-inplace-required-field.xml index 5fd1c11e257f..06173f4c3d55 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-inplace-required-field.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-inplace-required-field.xml @@ -25,8 +25,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-inplace-updates.xml b/solr/core/src/test-files/solr/collection1/conf/schema-inplace-updates.xml index 5972c3334815..a50347bd506c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-inplace-updates.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-inplace-updates.xml @@ -62,8 +62,8 @@ - - - + + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml b/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml index 70a0c51070b3..1767829cc818 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-minhash.xml b/solr/core/src/test-files/solr/collection1/conf/schema-minhash.xml index fc1a9c6d2a78..96a047f97e9c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-minhash.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-minhash.xml @@ -40,15 +40,15 @@ to create a schema that matches an existing lucene index. --> - - - - + + + + - - - - + + + + - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml b/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml index f6cfe7f8b940..48af9d20617e 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml @@ -19,8 +19,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml index 6a7987fa38d9..fc67417f7d84 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-non-stored-docvalues.xml @@ -18,14 +18,14 @@ - - - - + + + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml b/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml index 3a487dfea026..5707cfea16ca 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml @@ -28,37 +28,37 @@ - - - - - - - - - - - - - - - diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-phrases-identification.xml b/solr/core/src/test-files/solr/collection1/conf/schema-phrases-identification.xml index 522c37617b4b..3ab3fea33ef0 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-phrases-identification.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-phrases-identification.xml @@ -91,7 +91,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-protected-term.xml b/solr/core/src/test-files/solr/collection1/conf/schema-protected-term.xml index d401e51ffb2b..760e35b5dce9 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-protected-term.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-protected-term.xml @@ -24,7 +24,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-pseudo-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-pseudo-fields.xml index a5d87f03c861..4c4ea7ce850e 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-pseudo-fields.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-pseudo-fields.xml @@ -37,8 +37,8 @@ id - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml index 0ac0c0463ab3..91d126ba3a1f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml @@ -27,10 +27,10 @@ - - - - + + + + @@ -53,7 +53,7 @@ - + - - - - + + + + - - - - + + + + @@ -97,8 +97,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml index 76e7d8ee9b94..5bcc40747dae 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml @@ -22,7 +22,7 @@ --> - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-root.xml b/solr/core/src/test-files/solr/collection1/conf/schema-root.xml index 592c16161d2f..9c12076921e2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-root.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-root.xml @@ -28,7 +28,7 @@ - + id diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sorting-text.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sorting-text.xml index fdc675e2d074..663974a9ae76 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-sorting-text.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-sorting-text.xml @@ -145,5 +145,5 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml index 5674b1dd7b2f..ed9179010469 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-sortingresponse.xml @@ -18,14 +18,14 @@ - - - - + + + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml index 8f63a7541c3b..56acdb7e276f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml @@ -214,49 +214,49 @@ NOTE: Tests expect every field in this schema to be sortable. - - - - - + + + + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + + - diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml b/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml index 7ec98bde0f79..ead54150b62d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml @@ -18,14 +18,14 @@ - - - + + + - + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml index 9c72df4d803e..0607c3a4b7fc 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml @@ -40,17 +40,17 @@ --> - - - - + + - - - - + + + + @@ -127,8 +127,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml index 8d2634fbe325..88caebeb38c6 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml @@ -56,24 +56,24 @@ field first in an ascending sort and last in a descending sort. --> - - - - + + + + - - - - - - @@ -97,7 +97,7 @@ Consult the TrieDateField javadocs for more information. --> - + - - - - + + + + - - - - + + + + @@ -110,9 +110,9 @@ - - - + + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema.xml b/solr/core/src/test-files/solr/collection1/conf/schema.xml index e20f31d4bf3b..b4115573db63 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema.xml @@ -33,16 +33,16 @@ behavior of the fieldType. --> - - - - + + + + - - - - + + + + @@ -112,9 +112,9 @@ - - - + + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema11.xml b/solr/core/src/test-files/solr/collection1/conf/schema11.xml index 434711d301ee..976e4a1fc9c2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema11.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema11.xml @@ -60,10 +60,10 @@ - - - - + + + + @@ -92,7 +92,7 @@ Consult the TrieDateField javadocs for more information. --> - + - - - - - - + + + + + + - - - - - + + + + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema12.xml b/solr/core/src/test-files/solr/collection1/conf/schema12.xml index 3cd370786acf..4cce64a322f2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema12.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema12.xml @@ -33,15 +33,15 @@ behavior of the fieldType. --> - - - - - - - - - + + + + + + + + + @@ -109,8 +109,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema15.xml b/solr/core/src/test-files/solr/collection1/conf/schema15.xml index 87fdad981d67..b51f16a4965e 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema15.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema15.xml @@ -31,15 +31,15 @@ 1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...) 1.6: useDocValuesAsStored defaults to true. --> - - - - - - - - - + + + + + + + + + @@ -101,8 +101,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml index c5fe34b92bbc..ecdedad46463 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema_latest.xml @@ -370,11 +370,11 @@ These fields support doc values, but they require the field to be single-valued and either be required or have a default value. --> - - - - - + + + + + - - - - + + + + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml index eb6e5907b1ab..899035a574b2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml @@ -33,15 +33,15 @@ behavior of the fieldType. --> - - - - + + + + - - - - + + + + @@ -97,8 +97,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml index 502146d9591f..36f453fec7e9 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml index d95c8a740c34..c20603fb22c7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml @@ -24,7 +24,7 @@ ${tests.luceneMatchVersion:LATEST} - + true diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml index df769ec03f43..fcc8788a28a4 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml @@ -38,7 +38,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml index d28e6a6d052a..aef9f5082dc7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml @@ -23,7 +23,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-bpreorderingmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-bpreorderingmergepolicyfactory.xml index c9144c24fbfd..aa91d1fd5f43 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-bpreorderingmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-bpreorderingmergepolicyfactory.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + @@ -36,7 +36,7 @@ 1 0.0 - ${solr.tests.lockType:single} + ${tests.solr.lockType:single} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml index 96e0b6d754ce..3c6f4936304c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml index 89013486aaae..d8fb82ffa7d9 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-classification.xml @@ -24,7 +24,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml index de5721946bf1..90d8e577f30a 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml @@ -38,7 +38,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml index 0ca0e186db66..3f491d50f5ba 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml @@ -29,7 +29,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-concurrentmergescheduler.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-concurrentmergescheduler.xml index 5ea753f41f2a..e5ec0fc5208a 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-concurrentmergescheduler.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-concurrentmergescheduler.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-contenthashversion.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-contenthashversion.xml index 1308c63a9727..616694d6663d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-contenthashversion.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-contenthashversion.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-coreproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-coreproperties.xml index 13bada25dd7a..46e61f4d2198 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-coreproperties.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-coreproperties.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-dedup-overwrites.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-dedup-overwrites.xml index 74b19f46a3fa..c9009929239f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-dedup-overwrites.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-dedup-overwrites.xml @@ -56,7 +56,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -78,4 +78,3 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml index 981b02f2b312..0946f0d3a17c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml @@ -22,7 +22,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> @@ -50,10 +50,10 @@ - ${solr.test.queryResultWindowSize:50} + ${tests.solr.queryResultWindowSize:50} 500 - ${solr.test.useFilterForSortedQuery} + ${tests.solr.useFilterForSortedQuery} @@ -73,4 +73,3 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml index 7cabbd19c6fa..65b53f58df26 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml index 2bd4d26b150c..c126edaec598 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + @@ -30,13 +30,13 @@ to configure an explicit deletion policy, but we still wnat to randomize as much as possible. --> - + ${useCompoundFile:false} - ${solr.tests.maxBufferedDocs} - ${solr.tests.ramBufferSizeMB} + ${tests.solr.maxBufferedDocs} + ${tests.solr.ramBufferSizeMB} - + single diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml index 8a57b7fb8e1b..6d047c77040e 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + @@ -27,13 +27,13 @@ to configure an explicit deletion policy, but we still wnat to randomize as much as possible. --> - + ${useCompoundFile:false} - ${solr.tests.maxBufferedDocs} - ${solr.tests.ramBufferSizeMB} + ${tests.solr.maxBufferedDocs} + ${tests.solr.ramBufferSizeMB} - + single @@ -45,4 +45,3 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml index aa008353763d..1dc1c92cf257 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-distrib-update-processor-chains.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml index 18d16a36d175..e75ad2425c3d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml @@ -26,7 +26,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml index 72393f82f981..fbed20c87e53 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml @@ -26,7 +26,7 @@ ${useCompoundFile:false} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml index 7e71e3c76aeb..bfb175c51288 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml @@ -28,7 +28,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-expressions-vs.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-expressions-vs.xml index e16bed5438fe..6cd79e51baa3 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-expressions-vs.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-expressions-vs.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LUCENE_CURRENT} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml index c9df64266933..e406280fd751 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml index 236a0997b5a0..7835ea23195f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower-auth.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml index f009ac9e59cd..bcfb79c55484 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower1.xml index 9ae3600b2005..1957e3f54dd9 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-follower1.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml index 5262a8ca6506..851c78349c4d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml @@ -25,7 +25,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml index 44173b84cbac..29d2b9f4df93 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml @@ -26,7 +26,7 @@ ${useCompoundFile:false} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml index 695cd36e2a4c..a0462a1a8009 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml index 7688b3e0a7e3..a04258b6b018 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml @@ -25,7 +25,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml index 75be3374cabc..c16b0a64b791 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml @@ -26,7 +26,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}"/> diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml index ec5c9406fee4..5ab9e6a390d5 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexmetrics.xml @@ -22,17 +22,17 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} - ${solr.tests.metrics.merge:false} - ${solr.tests.metrics.mergeDetails:false} + ${tests.solr.metrics.merge:false} + ${tests.solr.metrics.mergeDetails:false} - ${solr.tests.metrics.majorMergeDocs:524288} + ${tests.solr.metrics.majorMergeDocs:524288} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader-throttled.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader-throttled.xml index edfa045e1846..784cedb626e6 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader-throttled.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader-throttled.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml index ea2e8e332daf..63b27340a58b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml index 40e93b8e5c57..2800bb360ec0 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1-keepOneBackup.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml index e4afd9b9f8f7..ad4e2f38dbd4 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader1.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml index 933337f0a8c4..ee4fca17f136 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader2.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml index b46fb393cf3b..c0106956bfc7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-leader3.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml index 528ea8795684..64bac9f31a82 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml @@ -19,14 +19,14 @@ ${tests.luceneMatchVersion:LATEST} - + -1 -1 - + 11 456 diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml index 9c1312638500..c2634294eda5 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-lucene-codec.xml @@ -29,7 +29,7 @@ ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml index e3f4612e7e15..bc6dc437353d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml @@ -22,6 +22,6 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml index d29f7faa2828..31d8ddf68f35 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml @@ -23,7 +23,7 @@ - ${managed.schema.mutable} + ${tests.solr.schema.managed.mutable} ${managed.schema.resourceName:managed-schema.xml} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-matched-queries.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-matched-queries.xml index 95cca5d940f0..a441ecb3aa09 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-matched-queries.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-matched-queries.xml @@ -22,7 +22,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergeonflushmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergeonflushmergepolicyfactory.xml index a798d7155d9c..635dcf9c4a04 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergeonflushmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergeonflushmergepolicyfactory.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + @@ -31,7 +31,7 @@ in org.apache.solr.util.RandomForceMergePolicyFactory - ${solr.tests.lockType:single} + ${tests.solr.lockType:single} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml index 76684eaebe8f..258e0e9b0a4f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml index d02b9b018276..b8416344f9e3 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml index f9276ba9298c..caa1993f433c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml index 92cc381d60cd..1a775b6029e7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml @@ -38,7 +38,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml index aedb68305ab2..af70d9458908 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml @@ -33,7 +33,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -62,4 +62,3 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml index f4ffe8a8502d..f7f1837974bc 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml @@ -24,7 +24,7 @@ - + ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml index 6e5545be7c41..06c4bb8a06a9 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml index 1799508b1150..ae98b6cc613c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml @@ -22,7 +22,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml index 4c5c76a42472..2f6109b50fd0 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parallel-commit.xml @@ -24,7 +24,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml index 1b41d2b949a3..c40cf01e197d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml @@ -23,7 +23,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml index 0416d3e796e5..eeaf6aaae7a7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml @@ -24,7 +24,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml index 65f1e9f3a4ab..4d650ebde89b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml @@ -22,7 +22,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml index e3afeae98e55..92073ea57311 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml @@ -38,7 +38,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml index 4c8d441b2d30..286b63de6a67 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-pluggable-circuitbreaker.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml index 0dd520baca9d..4407e09bd6c8 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml @@ -24,7 +24,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml index e6e94a2aa67f..5380575be64b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml @@ -23,7 +23,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml index f8bc376ad29e..df4a3034d6b2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml @@ -23,7 +23,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml index b426ac82f930..d63df94e7be0 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml index f3bb105bd25d..679ff49d350b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml @@ -31,7 +31,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml index d1334c519663..659b046c1144 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml @@ -23,7 +23,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml index ebceb1485790..ce9ebb801e01 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml @@ -30,7 +30,7 @@ - + @@ -48,4 +48,3 @@ ${tests.solr.useColdSearcher:false} - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml index 5d1e7242e70c..ddea84c27623 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + @@ -28,7 +28,7 @@ org.apache.solr.util.RandomForceMergePolicyFactory ${mergePolicySort:timestamp_i_dvo desc} - ${solr.tests.lockType:single} + ${tests.solr.lockType:single} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml index ee27bec61444..8ecd24847ee9 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml @@ -23,7 +23,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml index 53cd9fa6c2d8..f8e2247d07e7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml @@ -22,7 +22,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml index 1b3815ff2d5b..72ccaf43ca6e 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml @@ -20,14 +20,14 @@ ${tests.luceneMatchVersion:LATEST} - + ${useCompoundFile:false} - ${solr.tests.maxBufferedDocs} - ${solr.tests.ramBufferSizeMB} - + ${tests.solr.maxBufferedDocs} + ${tests.solr.ramBufferSizeMB} + 1000 10000 - ${solr.tests.lockType:single} + ${tests.solr.lockType:single} false @@ -57,7 +57,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml index fe557440bc18..f1aa9d0d1ac7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml @@ -21,7 +21,7 @@ - + ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml index d9efb26fa811..24a7840170e1 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml @@ -26,7 +26,7 @@ ${useCompoundFile:false} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml index de0b35692709..e8bac547ab87 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tagger.xml @@ -26,7 +26,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml index f26744ad1771..8029c32c7f6f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml @@ -25,7 +25,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-properties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-properties.xml index 7fea20f90b39..5063077fef98 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-properties.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-properties.xml @@ -26,12 +26,12 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + - prefix-${solr.test.sys.prop2}-suffix + prefix-${tests.solr.sys.prop2}-suffix diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml index f9f8427707b4..aa8b35067571 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml @@ -22,7 +22,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml index 8f66b4a55498..4315f40e6305 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml index 8c29b8411ca4..3857fdd9b616 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} - + @@ -46,11 +46,11 @@ ${solr.autoCommit.maxSize:} - + ${solr.ulog.dir:} - ${solr.ulog.maxNumLogsToKeep:10} - ${solr.ulog.numRecordsToKeep:100} - ${solr.ulog.tlogDfsReplication:2} + ${tests.solr.ulog.maxNumLogsToKeep:10} + ${tests.solr.ulog.numRecordsToKeep:100} + ${tests.solr.ulog.tlogDfsReplication:2} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml index 9c4601e3d709..3093af92b385 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}" /> ${tests.luceneMatchVersion:LATEST} @@ -50,4 +50,3 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml index b4e4846426d5..5d4f3dc22d23 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-transformers.xml @@ -23,7 +23,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml index d9f96b3bcca8..b320939450b5 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml @@ -27,7 +27,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml index 3c6056a3fc12..d3becc1eb4b3 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml @@ -22,7 +22,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + @@ -36,9 +36,9 @@ ${useCompoundFile} - ${solr.tests.maxBufferedDocs} - ${solr.tests.ramBufferSizeMB} - + ${tests.solr.maxBufferedDocs} + ${tests.solr.ramBufferSizeMB} + 1000 10000 single diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml index 59879ce6ca34..6e350d9bac36 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml @@ -26,7 +26,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -49,4 +49,3 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml index 48f6676645f4..4f68a6c400ab 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-xinclude.xml @@ -21,7 +21,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml index de5c714aa235..adc6dec29ed2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml @@ -26,16 +26,16 @@ A solrconfig.xml snippet containing indexConfig settings for randomized testing. the RandomMergePolicy in all tests - but some tests expect very specific Merge behavior, so those tests can set it as needed. --> - + ${useCompoundFile:false} - ${solr.tests.maxBufferedDocs} - ${solr.tests.ramBufferSizeMB} - ${solr.tests.maxCommitMergeWaitTime:-1} - ${solr.tests.ramPerThreadHardLimitMB} + ${tests.solr.maxBufferedDocs} + ${tests.solr.ramBufferSizeMB} + ${tests.solr.maxCommitMergeWaitTime:-1} + ${tests.solr.ramPerThreadHardLimitMB} - + 1000 10000 @@ -44,8 +44,8 @@ A solrconfig.xml snippet containing indexConfig settings for randomized testing. use the single process lockType for speed - but tests that explicitly need to vary the lockType canset it as needed. --> - ${solr.tests.lockType:single} + ${tests.solr.lockType:single} - ${solr.tests.infostream:false} + ${tests.solr.infostream:false} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml index d7865f2a73aa..d50c4715e2d2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml @@ -38,7 +38,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml index a971665edee0..dba044696584 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml index 991d2a50f612..ab0f2034504c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml index 94f934dbcbef..2109470da6ce 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml @@ -19,7 +19,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml index 0c6b57c4e77c..6b03a1b167d5 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml @@ -28,7 +28,7 @@ - + diff --git a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml index 115fea2368b7..bdcba3146486 100644 --- a/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml @@ -22,7 +22,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> diff --git a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml index c286b018cef4..04a74d3e191c 100644 --- a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml @@ -19,7 +19,7 @@ - + ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml index 954baf7cfee7..9d0b3d85acb4 100644 --- a/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cache-control/conf/schema.xml @@ -15,8 +15,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cache-control/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cache-control/conf/solrconfig.xml index 6fb9ca42086e..99f8f0f2d938 100644 --- a/solr/core/src/test-files/solr/configsets/cache-control/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cache-control/conf/solrconfig.xml @@ -22,7 +22,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/schema.xml index b539459ad5e9..3df8a3a6b680 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/solrconfig.xml index 2b1586ae2535..bb2fa6b59268 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-aggregate-node-metrics/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml index 5c26be38b8a3..931cf214e9ba 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/schema.xml @@ -32,15 +32,15 @@ 1.6: useDocValuesAsStored defaults to true. 1.7: docValues defaults to true, uninvertible defaults to false. --> - - - - + + + + - - - - + + + + @@ -96,8 +96,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/solrconfig.xml index 0cdb6acb33e3..9a9b0fbf7ca3 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-dynamic/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -47,4 +47,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml index b539459ad5e9..3df8a3a6b680 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/managed-schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml index 18b06a2e8f04..2dd20ea97435 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-managed-autocommit/conf/solrconfig.xml @@ -24,10 +24,10 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> - ${managed.schema.mutable} + ${tests.solr.schema.managed.mutable} managed-schema.xml diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/schema.xml index 5807a7c91cd2..60b19d5b0786 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/solrconfig.xml index fc4db3b0f35d..7bf2a6a1525c 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-managed-upgrade/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> managed-schema diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml index d457870208a5..9786c6fc014f 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/managed-schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml index fd91ee6178a6..463e274f3ffa 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-managed/conf/solrconfig.xml @@ -24,10 +24,10 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> - ${managed.schema.mutable} + ${tests.solr.schema.managed.mutable} managed-schema.xml diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/schema.xml index c50f70b11e11..5565ce41ef6a 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/solrconfig.xml index 38c4491c154f..c9da34df380f 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -46,8 +46,8 @@ - ${solr.test.maxFields:1234} - ${solr.test.fieldLimit.warnOnly:false} + ${tests.solr.maxFields:1234} + ${tests.solr.fieldLimit.warnOnly:false} @@ -58,4 +58,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/schema.xml index ef449bef519b..fc53e65ef102 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/schema.xml @@ -26,6 +26,6 @@ id - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/solrconfig.xml index 8da7d2847e9b..1c76742e3612 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-inplace-updates/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -45,4 +45,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/schema.xml index b539459ad5e9..3df8a3a6b680 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/solrconfig.xml index 4cec0dcb752d..54faab7f4958 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-userproperties/conf/solrconfig.xml @@ -22,7 +22,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -47,4 +47,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml index 3c25f27405ad..f2841eeca3da 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml index baef69fde907..bfb6fe4033f8 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -48,4 +48,3 @@ : - diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/schema.xml index b539459ad5e9..3df8a3a6b680 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/solrconfig.xml index 380da3ef4fa0..60c500d52948 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-minimal_override-shardHandler/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -53,4 +53,3 @@ : - diff --git a/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/schema.xml b/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/schema.xml index 53ca02dbde2a..1de51c0da3d1 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/solrconfig.xml index 059e58f447c2..0b563dc569de 100644 --- a/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cloud-subdirs/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -45,4 +45,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/conf-using-mypkg-version-1/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/conf-using-mypkg-version-1/conf/solrconfig.xml index 1c999fdc8a6b..0eb221fb68f2 100644 --- a/solr/core/src/test-files/solr/configsets/conf-using-mypkg-version-1/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/conf-using-mypkg-version-1/conf/solrconfig.xml @@ -21,7 +21,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml b/solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml index a1afcbd5a824..ca1b4e9f20b9 100644 --- a/solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/conf2/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/conf2/conf/solrconfig.xml index 0b3ec4d24ce1..d640624a5459 100644 --- a/solr/core/src/test-files/solr/configsets/conf2/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/conf2/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -65,4 +65,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/conf3/conf/schema.xml b/solr/core/src/test-files/solr/configsets/conf3/conf/schema.xml index a1afcbd5a824..ca1b4e9f20b9 100644 --- a/solr/core/src/test-files/solr/configsets/conf3/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/conf3/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/core/src/test-files/solr/configsets/conf3/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/conf3/conf/solrconfig.xml index e69d16ff17f0..183165750add 100644 --- a/solr/core/src/test-files/solr/configsets/conf3/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/conf3/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -65,4 +65,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml index 2f1ee7dec00b..c8eb281083e9 100644 --- a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml @@ -17,7 +17,7 @@ --> - + diff --git a/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml index bfd5648f9e4a..03954ee1caf8 100644 --- a/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/configset-2/conf/solrconfig.xml @@ -26,7 +26,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -46,4 +46,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/dedup/conf/schema.xml b/solr/core/src/test-files/solr/configsets/dedup/conf/schema.xml index 2da9becb8445..d4624974f674 100644 --- a/solr/core/src/test-files/solr/configsets/dedup/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/dedup/conf/schema.xml @@ -18,7 +18,7 @@ - + diff --git a/solr/core/src/test-files/solr/configsets/dedup/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/dedup/conf/solrconfig.xml index 5639a479a055..0224e65c14bc 100644 --- a/solr/core/src/test-files/solr/configsets/dedup/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/dedup/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -50,4 +50,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/schema.xml b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/schema.xml index 37692c15943e..ef9d14bd57db 100644 --- a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/schema.xml @@ -73,12 +73,12 @@ - + - - - - + + + + diff --git a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/solrconfig.xml index f190e0d9a7cf..96bb23f04518 100644 --- a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionA/conf/solrconfig.xml @@ -33,7 +33,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/schema.xml b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/schema.xml index 37692c15943e..ef9d14bd57db 100644 --- a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/schema.xml @@ -73,12 +73,12 @@ - + - - - - + + + + diff --git a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/solrconfig.xml index f190e0d9a7cf..96bb23f04518 100644 --- a/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/different-stopwords/collectionB/conf/solrconfig.xml @@ -33,7 +33,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml b/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml index 7dd56672a611..8b865d3e56c6 100644 --- a/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/doc-expiry/conf/schema.xml @@ -32,15 +32,15 @@ 1.6: useDocValuesAsStored defaults to true. 1.7: docValues defaults to true, uninvertible defaults to false. --> - - - - + + + + - - - - + + + + @@ -96,8 +96,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/configsets/doc-expiry/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/doc-expiry/conf/solrconfig.xml index 2599744b696b..8a420aec2985 100644 --- a/solr/core/src/test-files/solr/configsets/doc-expiry/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/doc-expiry/conf/solrconfig.xml @@ -35,11 +35,11 @@ Instead use Solr defaults for almost everything --> - ${solr.tests.lockType:single} + ${tests.solr.lockType:single} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/schema.xml b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/schema.xml index e90907245417..5763031748dc 100644 --- a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/schema.xml +++ b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/schema.xml @@ -19,8 +19,8 @@ - - + + diff --git a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml index 79e7578d186c..dafd185f7e9d 100644 --- a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml @@ -22,7 +22,7 @@ ${tests.luceneMatchVersion:LATEST} - + ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -44,4 +44,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/schema-package/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/schema-package/conf/solrconfig.xml index 853ba6562416..7cf93d0b6c37 100644 --- a/solr/core/src/test-files/solr/configsets/schema-package/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/schema-package/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -48,4 +48,3 @@ : - diff --git a/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/solrconfig.xml b/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/solrconfig.xml index 827b5bd72537..3f9cf15a38f5 100644 --- a/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/upload/legacy-managed-schema/solrconfig.xml @@ -33,7 +33,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/configsets/upload/regular/solrconfig.xml b/solr/core/src/test-files/solr/configsets/upload/regular/solrconfig.xml index 82d0cc95f923..3f9cf15a38f5 100644 --- a/solr/core/src/test-files/solr/configsets/upload/regular/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/upload/regular/solrconfig.xml @@ -33,7 +33,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -58,4 +58,3 @@ - diff --git a/solr/core/src/test-files/solr/configsets/upload/with-script-processor/solrconfig.xml b/solr/core/src/test-files/solr/configsets/upload/with-script-processor/solrconfig.xml index 2f5baf20ee3a..ed32286d8204 100644 --- a/solr/core/src/test-files/solr/configsets/upload/with-script-processor/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/upload/with-script-processor/solrconfig.xml @@ -33,7 +33,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/core/src/test-files/solr/solr-shardhandler-loadBalancerRequests.xml b/solr/core/src/test-files/solr/solr-shardhandler-loadBalancerRequests.xml index 473a8b3c2744..cd97c1610342 100644 --- a/solr/core/src/test-files/solr/solr-shardhandler-loadBalancerRequests.xml +++ b/solr/core/src/test-files/solr/solr-shardhandler-loadBalancerRequests.xml @@ -16,8 +16,8 @@ limitations under the License. --> - - ${solr.tests.loadBalancerRequestsMinimumAbsolute:0} - ${solr.tests.loadBalancerRequestsMaximumFraction:1.0} + + ${tests.solr.loadBalancerRequestsMinimumAbsolute:0} + ${tests.solr.loadBalancerRequestsMaximumFraction:1.0} diff --git a/solr/core/src/test-files/solr/solr.xml b/solr/core/src/test-files/solr/solr.xml index d2210695e772..76373d677463 100644 --- a/solr/core/src/test-files/solr/solr.xml +++ b/solr/core/src/test-files/solr/solr.xml @@ -27,7 +27,7 @@ ${configSetBaseDir:configsets} ${coreRootDirectory:.} ${solr.security.allow.paths:} - ${solr.tests.security.allow.urls:} + ${tests.solr.security.allow.urls:} ${solr.hideStackTrace:true} 4 diff --git a/solr/core/src/test/org/apache/solr/CursorPagingTest.java b/solr/core/src/test/org/apache/solr/CursorPagingTest.java index 44f56298a6fd..ec057bb6a914 100644 --- a/solr/core/src/test/org/apache/solr/CursorPagingTest.java +++ b/solr/core/src/test/org/apache/solr/CursorPagingTest.java @@ -73,7 +73,7 @@ public static void beforeTests() throws Exception { if (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP)) System.setProperty(NUMERIC_DOCVALUES_SYSPROP, "true"); System.setProperty( - "solr.test.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); + "tests.solr.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); initCore(TEST_SOLRCONFIG_NAME, TEST_SCHEMAXML_NAME); } diff --git a/solr/core/src/test/org/apache/solr/TestCursorMarkWithoutUniqueKey.java b/solr/core/src/test/org/apache/solr/TestCursorMarkWithoutUniqueKey.java index 7b6ff73c58ba..d875f953591f 100644 --- a/solr/core/src/test/org/apache/solr/TestCursorMarkWithoutUniqueKey.java +++ b/solr/core/src/test/org/apache/solr/TestCursorMarkWithoutUniqueKey.java @@ -32,9 +32,9 @@ public class TestCursorMarkWithoutUniqueKey extends SolrTestCaseJ4 { @Before public void beforeSetupCore() throws Exception { System.setProperty( - "solr.test.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); + "tests.solr.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); System.setProperty( - "solr.test.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); + "tests.solr.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); initCore(TEST_SOLRCONFIG_NAME, TEST_SCHEMAXML_NAME); SchemaField uniqueKeyField = h.getCore().getLatestSchema().getUniqueKeyField(); assertNull( diff --git a/solr/core/src/test/org/apache/solr/TestJoin.java b/solr/core/src/test/org/apache/solr/TestJoin.java index 14f776610ba4..1324f4adc322 100644 --- a/solr/core/src/test/org/apache/solr/TestJoin.java +++ b/solr/core/src/test/org/apache/solr/TestJoin.java @@ -45,8 +45,8 @@ public static void beforeTests() throws Exception { System.setProperty("solr.filterCache.async", "true"); // all points change at the same time point fields need docvalues - if (System.getProperty("solr.tests.IntegerFieldType").contains("Point")) { - System.setProperty("solr.tests.numeric.dv", "true"); + if (System.getProperty("tests.solr.IntegerFieldType").contains("Point")) { + System.setProperty("tests.solr.numeric.dv.enabled", "true"); } initCore("solrconfig.xml", "schema12.xml"); diff --git a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java index 2e2157878ae8..fe32ccc138f8 100644 --- a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java +++ b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java @@ -65,7 +65,7 @@ public static void beforeClass() { "FIXME: This test does not work with whitespace in CWD (https://issues.apache.org/jira/browse/SOLR-8877)", Path.of(".").toAbsolutePath().toString().contains(" ")); // to be true - System.setProperty("solr.directoryFactory", "solr.NRTCachingDirectoryFactory"); + System.setProperty("tests.solr.directory.factory", "solr.NRTCachingDirectoryFactory"); } /** diff --git a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerSchemaAPI.java b/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerSchemaAPI.java index 98b76fd57a26..75f0d855d1b1 100644 --- a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerSchemaAPI.java +++ b/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerSchemaAPI.java @@ -48,8 +48,9 @@ public class TestEmbeddedSolrServerSchemaAPI extends SolrTestCaseJ4 { @BeforeClass public static void initClass() throws Exception { - assertNull("no system props clash please", System.getProperty("managed.schema.mutable")); - System.setProperty("managed.schema.mutable", "" + random().nextBoolean()); + assertNull( + "no system props clash please", System.getProperty("tests.solr.schema.managed.mutable")); + System.setProperty("tests.solr.schema.managed.mutable", "" + random().nextBoolean()); Path tmpHome = createTempDir("tmp-home"); Path coreDir = tmpHome.resolve(DEFAULT_TEST_CORENAME); copyMinConf(coreDir, null, "solrconfig-managed-schema.xml"); @@ -75,7 +76,7 @@ public void thereIsNoFieldYet() { @Test public void testSchemaAddFieldAndVerifyExistence() throws Exception { - assumeTrue("it needs to amend schema", Boolean.getBoolean("managed.schema.mutable")); + assumeTrue("it needs to amend schema", Boolean.getBoolean("tests.solr.schema.managed.mutable")); SchemaResponse.UpdateResponse addFieldResponse = new SchemaRequest.AddField(fieldAttributes).process(server); @@ -95,7 +96,8 @@ public void testSchemaAddFieldAndVerifyExistence() throws Exception { @Test public void testSchemaAddFieldAndFailOnImmutable() { - assumeFalse("it needs a readonly schema", Boolean.getBoolean("managed.schema.mutable")); + assumeFalse( + "it needs a readonly schema", Boolean.getBoolean("tests.solr.schema.managed.mutable")); SchemaRequest.AddField addFieldUpdateSchemaRequest = new SchemaRequest.AddField(fieldAttributes); diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java index 962dbfe24462..9a36d1edb6a2 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java @@ -37,7 +37,7 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase private static final int FAIL_TOLERANCE = 100; private static final Integer RUN_LENGTH = - Integer.parseInt(System.getProperty("solr.tests.cloud.cm.runlength", "-1")); + Integer.parseInt(System.getProperty("tests.solr.cloud.cm.runlength", "-1")); private final boolean onlyLeaderIndexes = random().nextBoolean(); @@ -99,12 +99,12 @@ public void distribTearDown() throws Exception { public ChaosMonkeyNothingIsSafeTest() { super(); - sliceCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.slicecount", "-1")); + sliceCount = Integer.parseInt(System.getProperty("tests.solr.cloud.cm.slicecount", "-1")); if (sliceCount == -1) { sliceCount = random().nextInt(TEST_NIGHTLY ? 5 : 3) + 1; } - int numShards = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "-1")); + int numShards = Integer.parseInt(System.getProperty("tests.solr.cloud.cm.shardcount", "-1")); if (numShards == -1) { // we make sure that there's at least one shard with more than one replica // so that the ChaosMonkey has something to kill diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java index b2616a80afbe..7edc836e4005 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeWithPullReplicasTest.java @@ -49,7 +49,7 @@ public class ChaosMonkeyNothingIsSafeWithPullReplicasTest extends AbstractFullDi private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Integer RUN_LENGTH = - Integer.parseInt(System.getProperty("solr.tests.cloud.cm.runlength", "-1")); + Integer.parseInt(System.getProperty("tests.solr.cloud.cm.runlength", "-1")); private final int numPullReplicas; private final int numRealtimeOrTlogReplicas; @@ -116,7 +116,7 @@ public ChaosMonkeyNothingIsSafeWithPullReplicasTest() { super(); numPullReplicas = random().nextInt(TEST_NIGHTLY ? 2 : 1) + 1; numRealtimeOrTlogReplicas = random().nextInt(TEST_NIGHTLY ? 4 : 3) + 1; - sliceCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.slicecount", "-1")); + sliceCount = Integer.parseInt(System.getProperty("tests.solr.cloud.cm.slicecount", "-1")); if (sliceCount == -1) { sliceCount = random().nextInt(TEST_NIGHTLY ? 3 : 2) + 1; } diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java index c521159d3169..6bea92dde06b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java @@ -37,7 +37,7 @@ public class ChaosMonkeySafeLeaderTest extends AbstractFullDistribZkTestBase { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Integer RUN_LENGTH = - Integer.parseInt(System.getProperty("solr.tests.cloud.cm.runlength", "-1")); + Integer.parseInt(System.getProperty("tests.solr.cloud.cm.runlength", "-1")); @BeforeClass public static void beforeSuperClass() { @@ -79,12 +79,12 @@ public void distribSetUp() throws Exception { public ChaosMonkeySafeLeaderTest() { super(); - sliceCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.slicecount", "-1")); + sliceCount = Integer.parseInt(System.getProperty("tests.solr.cloud.cm.slicecount", "-1")); if (sliceCount == -1) { sliceCount = random().nextInt(TEST_NIGHTLY ? 5 : 3) + 1; } - int numShards = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.shardcount", "-1")); + int numShards = Integer.parseInt(System.getProperty("tests.solr.cloud.cm.shardcount", "-1")); if (numShards == -1) { // we make sure that there's at least one shard with more than one replica // so that the ChaosMonkey has something to kill diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java index 38c6920cf527..93a0aad2a17a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderWithPullReplicasTest.java @@ -45,7 +45,7 @@ public class ChaosMonkeySafeLeaderWithPullReplicasTest extends AbstractFullDistr private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Integer RUN_LENGTH = - Integer.parseInt(System.getProperty("solr.tests.cloud.cm.runlength", "-1")); + Integer.parseInt(System.getProperty("tests.solr.cloud.cm.runlength", "-1")); private final int numPullReplicas; private final int numRealtimeOrTlogReplicas; @@ -103,7 +103,7 @@ public ChaosMonkeySafeLeaderWithPullReplicasTest() { super(); numPullReplicas = random().nextInt(TEST_NIGHTLY ? 3 : 2) + 1; numRealtimeOrTlogReplicas = random().nextInt(TEST_NIGHTLY ? 3 : 2) + 1; - sliceCount = Integer.parseInt(System.getProperty("solr.tests.cloud.cm.slicecount", "-1")); + sliceCount = Integer.parseInt(System.getProperty("tests.solr.cloud.cm.slicecount", "-1")); if (sliceCount == -1) { sliceCount = random().nextInt(TEST_NIGHTLY ? 3 : 2) + 1; } diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java index f7f2317bc0d6..fb5f6f2cd675 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java @@ -65,7 +65,7 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase { public DistribCursorPagingTest() { System.setProperty( - "solr.test.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); + "tests.solr.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); configString = CursorPagingTest.TEST_SOLRCONFIG_NAME; schemaString = CursorPagingTest.TEST_SCHEMAXML_NAME; } diff --git a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java index 2a08aaf4759e..400aa8cfb45f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DocValuesNotIndexedTest.java @@ -63,7 +63,7 @@ public class DocValuesNotIndexedTest extends SolrCloudTestCase { @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(2) .addConfig( "conf1", TEST_PATH().resolve("configsets").resolve("cloud-managed").resolve("conf")) diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailureAfterFreshStartTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailureAfterFreshStartTest.java index b84aae4b77fd..994ec7de924f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailureAfterFreshStartTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailureAfterFreshStartTest.java @@ -77,8 +77,8 @@ protected String getCloudSolrConfig() { public void distribSetUp() throws Exception { // tlog gets deleted after node restarts if we use CachingDirectoryFactory. // make sure that tlog stays intact after we restart a node - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); System.setProperty("tests.zk.violationReportAction", LimitViolationAction.IGNORE.toString()); super.distribSetUp(); } diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java index d00190cfe531..57ce3425e8d6 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderVoteWaitTimeoutTest.java @@ -56,8 +56,8 @@ public class LeaderVoteWaitTimeoutTest extends SolrCloudTestCase { @BeforeClass public static void setupCluster() { - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); System.setProperty("leaderVoteWait", "2000"); System.setProperty("distribUpdateSoTimeout", "5000"); System.setProperty("distribUpdateConnTimeout", "5000"); diff --git a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java index c217ebb2487c..deb32bcfdd35 100644 --- a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java @@ -85,8 +85,8 @@ public void distribSetUp() throws Exception { System.setProperty("distribUpdateSoTimeout", "3000"); // tlog gets deleted after node restarts if we use CachingDirectoryFactory. // make sure that tlog stays intact after we restart a node - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); System.setProperty("tests.zk.violationReportAction", LimitViolationAction.IGNORE.toString()); super.distribSetUp(); } diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java index b35a937726b4..b1128f286599 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java @@ -49,8 +49,9 @@ protected boolean useTlogReplicas() { @BeforeClass public static void beforeTests() { - System.setProperty("solr.tests.maxBufferedDocs", String.valueOf(MAX_BUFFERED_DOCS)); - System.setProperty("solr.ulog.numRecordsToKeep", String.valueOf(ULOG_NUM_RECORDS_TO_KEEP)); + System.setProperty("tests.solr.maxBufferedDocs", String.valueOf(MAX_BUFFERED_DOCS)); + System.setProperty( + "tests.solr.ulog.numRecordsToKeep", String.valueOf(ULOG_NUM_RECORDS_TO_KEEP)); // avoid creating too many files, see SOLR-7421 System.setProperty("useCompoundFile", "true"); } diff --git a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java index fbc789ed2f58..f9b4f6e50617 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RouteFieldTest.java @@ -52,7 +52,7 @@ public class RouteFieldTest extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(1).addConfig("conf", configset("cloud-managed")).configure(); } diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java index 39f9661bd401..fb7878a5b679 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudConsistency.java @@ -55,8 +55,8 @@ public class TestCloudConsistency extends SolrCloudTestCase { @Before public void setupCluster() throws Exception { - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); System.setProperty("leaderVoteWait", "60000"); configureCluster(4).addConfig("conf", configset("cloud-minimal")).configure(); diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java index 54ce0670656f..e3a4ddf4d1c7 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery.java @@ -53,8 +53,8 @@ public class TestCloudRecovery extends SolrCloudTestCase { @BeforeClass public static void setupCluster() { System.setProperty("metricsEnabled", "true"); - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); } @Before diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java index b1962539f186..aab51317733e 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudRecovery2.java @@ -31,8 +31,8 @@ public class TestCloudRecovery2 extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); configureCluster(2) .addConfig( diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java index f2f80ed019e1..262dc1b71e57 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java @@ -118,7 +118,7 @@ public class TestConfigSetsAPI extends SolrCloudTestCase { @BeforeClass public static void setUpClass() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(1).withSecurityJson(getSecurityJson()).configure(); } diff --git a/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java b/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java index fa2f9264deeb..8076a2db0699 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestOnReconnectListenerSupport.java @@ -36,7 +36,7 @@ public class TestOnReconnectListenerSupport extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { - System.setProperty("managed.schema.mutable", "false"); + System.setProperty("tests.solr.schema.managed.mutable", "false"); configureCluster(1).addConfig("conf1", configset("cloud-managed")).configure(); } diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java index 30649e254e83..b8dedb8ffdd8 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestPrepRecovery.java @@ -31,8 +31,8 @@ public class TestPrepRecovery extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); // the default is 180s and our waitForState times out in 90s, // so we lower this so that we can still test timeouts System.setProperty("leaderConflictResolveWait", "5000"); diff --git a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java index d3e4c120b13f..81b826d88025 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestPullReplica.java @@ -750,7 +750,7 @@ public void testSkipLeaderRecoveryProperty() throws Exception { CollectionAdminRequest.createCollection(collectionName, "conf", 1, 0, 1, 0) .setCreateNodeSet(tlogLeaderyJetty.getNodeName()) // NOTE: we restart the leader, so we need a non-ephemeral index - .setProperties(Map.of("solr.directoryFactory", "solr.StandardDirectoryFactory")) + .setProperties(Map.of("tests.solr.directory.factory", "solr.StandardDirectoryFactory")) .process(cluster.getSolrClient()); // Add 2 PULL replicas on the follower jetty diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java index 3ea8a91919a8..5c4ffd45ebb9 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestSegmentSorting.java @@ -48,7 +48,7 @@ public static void setupCluster() throws Exception { compoundMergePolicySort = random().nextBoolean(); if (compoundMergePolicySort) { System.setProperty("mergePolicySort", "timestamp_i_dvo desc, id desc"); - System.setProperty("solr.tests.id.docValues", "true"); + System.setProperty("tests.solr.id.docValues", "true"); } configureCluster(NUM_SERVERS) .addConfig(configName, TEST_HOME().resolve("collection1").resolve("conf")) diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java b/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java index 3219d0e05e81..b475fb85dfcc 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestSkipOverseerOperations.java @@ -43,8 +43,8 @@ public class TestSkipOverseerOperations extends SolrCloudTestCase { @Before public void setupCluster() throws Exception { - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); configureCluster(3) .addConfig( diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java index b181eaa7cb36..6a364c55e7d8 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplayVsRecovery.java @@ -69,8 +69,8 @@ public class TestTlogReplayVsRecovery extends SolrCloudTestCase { public void setupCluster() throws Exception { TestInjection.skipIndexWriterCommitOnClose = TEST_VALUE_FOR_SKIP_COMMIT_ON_CLOSE; - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); - System.setProperty("solr.ulog.numRecordsToKeep", "1000"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.ulog.numRecordsToKeep", "1000"); System.setProperty("leaderVoteWait", "60000"); configureCluster(2).addConfig("conf", configset("cloud-minimal")).configure(); diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java index 77947d017dfe..b2ecbe9af6bc 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/SplitByPrefixTest.java @@ -50,7 +50,8 @@ public class SplitByPrefixTest extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); // needed by cloud-managed config set + System.setProperty( + "tests.solr.schema.managed.mutable", "true"); // needed by cloud-managed config set // clould-managed has the copyField from ID to id_prefix // cloud-minimal does not and thus histogram should be driven from the "id" field directly diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java index 747d7a9a8cb2..e90eff033461 100644 --- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java +++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestCollectionsAPIViaSolrCloudCluster.java @@ -54,7 +54,7 @@ public class TestCollectionsAPIViaSolrCloudCluster extends SolrCloudTestCase { private static final String configName = "solrCloudCollectionConfig"; private static final Map collectionProperties // ensure indexes survive core shutdown - = Map.of("solr.directoryFactory", "solr.StandardDirectoryFactory"); + = Map.of("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); @Override public void setUp() throws Exception { diff --git a/solr/core/src/test/org/apache/solr/core/ByteBuffersDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/ByteBuffersDirectoryFactoryTest.java index 1c72b2fa48c1..e118dd4b515c 100644 --- a/solr/core/src/test/org/apache/solr/core/ByteBuffersDirectoryFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/core/ByteBuffersDirectoryFactoryTest.java @@ -68,7 +68,7 @@ public void testOpenSucceedForEmptyDir() throws IOException { } public void testIndexRetrieve() throws Exception { - System.setProperty("solr.directoryFactory", "solr.ByteBuffersDirectoryFactory"); + System.setProperty("tests.solr.directory.factory", "solr.ByteBuffersDirectoryFactory"); initCore("solrconfig-minimal.xml", "schema-minimal.xml"); DirectoryFactory factory = h.getCore().getDirectoryFactory(); assertTrue( diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java index 736fcf295067..18b68e006dee 100644 --- a/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java +++ b/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java @@ -42,7 +42,8 @@ public class SolrCoreCheckLockOnStartupTest extends SolrTestCaseJ4 { public void setUp() throws Exception { super.setUp(); - System.setProperty("solr.directoryFactory", "org.apache.solr.core.NIOFSDirectoryFactory"); + System.setProperty( + "tests.solr.directory.factory", "org.apache.solr.core.NIOFSDirectoryFactory"); // test tests native and simple in the same jvm in the same exact directory: // the file will remain after the native test (it cannot safely be deleted without the risk of // deleting another guys lock) it's ok, these aren't "compatible" anyway: really this test @@ -60,13 +61,13 @@ public void testSimpleLockErrorOnStartup() throws Exception { IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(null)); try (ErrorLogMuter ignored = ErrorLogMuter.regex("locked")) { - System.setProperty("solr.tests.lockType", DirectoryFactory.LOCK_TYPE_SIMPLE); + System.setProperty("tests.solr.lockType", DirectoryFactory.LOCK_TYPE_SIMPLE); // opening a new core on the same index initCore("solrconfig-basic.xml", "schema.xml"); if (checkForCoreInitException(LockObtainFailedException.class)) return; fail("Expected " + LockObtainFailedException.class.getSimpleName()); } finally { - System.clearProperty("solr.tests.lockType"); + System.clearProperty("tests.solr.lockType"); indexWriter.close(); directory.close(); deleteCore(); @@ -86,13 +87,13 @@ public void testNativeLockErrorOnStartup() throws Exception { IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(null)); try (ErrorLogMuter ignored = ErrorLogMuter.regex("locked")) { - System.setProperty("solr.tests.lockType", DirectoryFactory.LOCK_TYPE_NATIVE); + System.setProperty("tests.solr.lockType", DirectoryFactory.LOCK_TYPE_NATIVE); // opening a new core on the same index initCore("solrconfig-basic.xml", "schema.xml"); if (checkForCoreInitException(LockObtainFailedException.class)) return; fail("Expected " + LockObtainFailedException.class.getSimpleName()); } finally { - System.clearProperty("solr.tests.lockType"); + System.clearProperty("tests.solr.lockType"); indexWriter.close(); directory.close(); deleteCore(); diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java index a856090e54da..411f586e4eac 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java @@ -218,12 +218,12 @@ public void testSanityCheckTestSysPropsAreUsed() throws Exception { assertEquals( "ramBufferSizeMB sysprop", - Double.parseDouble(System.getProperty("solr.tests.ramBufferSizeMB")), + Double.parseDouble(System.getProperty("tests.solr.ramBufferSizeMB")), sic.ramBufferSizeMB, 0.0D); assertEquals( "ramPerThreadHardLimitMB sysprop", - Integer.parseInt(System.getProperty("solr.tests.ramPerThreadHardLimitMB")), + Integer.parseInt(System.getProperty("tests.solr.ramPerThreadHardLimitMB")), sic.ramPerThreadHardLimitMB); assertEquals( "useCompoundFile sysprop", diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigPropertySubstitution.java b/solr/core/src/test/org/apache/solr/core/TestConfigPropertySubstitution.java index e40c1d09e708..c7862b14c138 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfigPropertySubstitution.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfigPropertySubstitution.java @@ -32,8 +32,8 @@ public class TestConfigPropertySubstitution extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { // Set the test properties specifically for property substitution testing - System.setProperty("solr.test.sys.prop1", "propone"); - System.setProperty("solr.test.sys.prop2", "proptwo"); + System.setProperty("tests.solr.sys.prop1", "propone"); + System.setProperty("tests.solr.sys.prop2", "proptwo"); // Use a minimal configuration file that only contains the propTest element initCore("solrconfig-test-properties.xml", "schema.xml"); diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java index 4d456a2f8262..f0f2f8b71dd3 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java @@ -53,7 +53,7 @@ public void before() throws Exception { "{\"immutable\":\"true\"}", StandardCharsets.UTF_8); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); createJettyAndHarness(tmpSolrHome, "solrconfig-schemaless.xml", "schema-rest.xml"); } diff --git a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java index 1e13bc9b52bc..374b08876f7f 100644 --- a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java @@ -164,7 +164,7 @@ public void testLogMergePolicyFactoryConfig() throws Exception { final Class mpfClass = byteSizeMP ? LogByteSizeMergePolicyFactory.class : LogDocMergePolicyFactory.class; - System.setProperty("solr.test.log.merge.policy.factory", mpfClass.getName()); + System.setProperty("tests.solr.log.merge.policy.factory", mpfClass.getName()); implTestLogMergePolicyConfig("solrconfig-logmergepolicyfactory.xml", mpClass); } diff --git a/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java b/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java index e39c3a8e4f2a..75580b36c232 100644 --- a/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java +++ b/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java @@ -31,7 +31,7 @@ public class TestNRTOpen extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { // set these so that merges won't break the test - System.setProperty("solr.tests.maxBufferedDocs", "100000"); + System.setProperty("tests.solr.maxBufferedDocs", "100000"); systemSetPropertySolrTestsMergePolicyFactory(LogDocMergePolicyFactory.class.getName()); initCore("solrconfig-basic.xml", "schema-minimal.xml"); // add a doc diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java index 4cb5b8889b6e..998c7e9a6ffd 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java @@ -82,7 +82,7 @@ public void before() throws Exception { Path tmpSolrHome = createTempDir(); PathUtils.copyDirectory(TEST_HOME(), tmpSolrHome); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "false"); createJettyAndHarness(tmpSolrHome, "solrconfig-managed-schema.xml", "schema-rest.xml"); diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java index b531dc113f07..cc658c6e14d6 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java @@ -112,7 +112,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { public void setUp() throws Exception { super.setUp(); System.setProperty(AllowListUrlChecker.ENABLE_URL_ALLOW_LIST, "false"); - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); // For manual testing only // useFactory(null); // force an FS factory. leader = new SolrInstance(createTempDir("solr-instance"), "leader", null); diff --git a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java index 47eb83e7e9dd..0cadeb95e4fa 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java @@ -54,7 +54,7 @@ private void setupHarnesses() { @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(2) .addConfig( "conf1", TEST_PATH().resolve("configsets").resolve("cloud-managed").resolve("conf")) diff --git a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java index 4bdeb7bcae25..1f13feb24985 100644 --- a/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/handler/V2ApiIntegrationTest.java @@ -53,7 +53,7 @@ public class V2ApiIntegrationTest extends SolrCloudTestCase { @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(2) .addConfig( "conf1", TEST_PATH().resolve("configsets").resolve("cloud-managed").resolve("conf")) diff --git a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java index 4fadec44fef9..42eef0917315 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java @@ -83,7 +83,7 @@ public void testHealthCheckHandler() throws Exception { SolrClient solrClient = cluster.getJettySolrRunner(0).getSolrClient(); CollectionAdminResponse collectionAdminResponse = CollectionAdminRequest.createCollection("test", "_default", 1, 1) - .withProperty("solr.directoryFactory", "solr.StandardDirectoryFactory") + .withProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory") .process(solrClient); assertEquals(0, collectionAdminResponse.getStatus()); assertEquals(CommonParams.OK, runHealthcheckWithClient(solrClient).getNodeStatus()); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java b/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java index 54aa6394902f..87554074ef62 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/IndexSizeEstimatorTest.java @@ -67,9 +67,9 @@ public class IndexSizeEstimatorTest extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { // create predictable field names - System.setProperty("solr.tests.numeric.dv", "true"); - System.setProperty("solr.tests.numeric.points", "true"); - System.setProperty("solr.tests.numeric.points.dv", "true"); + System.setProperty("tests.solr.numeric.dv.enabled", "true"); + System.setProperty("tests.solr.numeric.points", "true"); + System.setProperty("tests.solr.numeric.points.dv", "true"); configureCluster(2).addConfig("conf", configset("cloud-dynamic")).configure(); solrClient = cluster.getSolrClient(); CollectionAdminRequest.createCollection(collection, "conf", 2, 2).process(solrClient); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/LukeHandlerCloudTest.java b/solr/core/src/test/org/apache/solr/handler/admin/LukeHandlerCloudTest.java index ed418d1621e5..2368f17dcefa 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/LukeHandlerCloudTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/LukeHandlerCloudTest.java @@ -46,7 +46,7 @@ public class LukeHandlerCloudTest extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(2) .addConfig("managed", configset("cloud-managed")) .addConfig("dynamic", configset("cloud-dynamic")) diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java index 0098bb94e65b..c7e1b6dcc70d 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java @@ -48,8 +48,8 @@ public static void beforeClass() throws Exception { // systemSetPropertySolrTestsMergePolicyFactory(NoMergePolicyFactory.class.getName()); // Also prevent flushes - System.setProperty("solr.tests.maxBufferedDocs", "1000"); - System.setProperty("solr.tests.ramBufferSizeMB", "5000"); + System.setProperty("tests.solr.maxBufferedDocs", "1000"); + System.setProperty("tests.solr.ramBufferSizeMB", "5000"); System.setProperty("solr.index.updatelog.enabled", "false"); // no _version_ in our schema // segments API shouldn't depend on _version_ or ulog diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SplitHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SplitHandlerTest.java index 011f5fe38857..84b2032f8886 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/SplitHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/SplitHandlerTest.java @@ -38,7 +38,8 @@ public class SplitHandlerTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { - System.setProperty("managed.schema.mutable", "true"); // needed by cloud-managed config set + System.setProperty( + "tests.solr.schema.managed.mutable", "true"); // needed by cloud-managed config set initCore("solrconfig.xml", "schema_latest.xml"); } diff --git a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java index 5079fb9970f0..3281b7f8bcd7 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java @@ -64,16 +64,16 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 { public static void beforeClass() { switch (random().nextInt(3)) { case 0: - System.setProperty("solr.tests.id.stored", "true"); - System.setProperty("solr.tests.id.docValues", "true"); + System.setProperty("tests.solr.id.stored", "true"); + System.setProperty("tests.solr.id.docValues", "true"); break; case 1: - System.setProperty("solr.tests.id.stored", "true"); - System.setProperty("solr.tests.id.docValues", "false"); + System.setProperty("tests.solr.id.stored", "true"); + System.setProperty("tests.solr.id.docValues", "false"); break; case 2: - System.setProperty("solr.tests.id.stored", "false"); - System.setProperty("solr.tests.id.docValues", "true"); + System.setProperty("tests.solr.id.stored", "false"); + System.setProperty("tests.solr.id.docValues", "true"); break; default: fail("Bad random number generated not between 0-2 inclusive"); diff --git a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java index 23a219eb68ec..25676d135301 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/ShardsAllowListTest.java @@ -55,7 +55,7 @@ public class ShardsAllowListTest extends MultiSolrCloudTestCase { private static final String IMPLICIT_CLUSTER_KEY = "implicitCluster"; private static final String EXPLICIT_ALLOW_LIST_PROPERTY = - "solr.tests.ShardsAllowListTest.explicitAllowList."; + "tests.solr.ShardsAllowListTest.explicitAllowList."; protected static final String COLLECTION_NAME = "ShardsAllowListTestCollection"; private static int numShards; diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java index 32470b57ce2c..99048c055fc0 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java @@ -32,16 +32,16 @@ public class TermVectorComponentTest extends SolrTestCaseJ4 { public static void beforeClass() throws Exception { switch (random().nextInt(3)) { case 0: - System.setProperty("solr.tests.id.stored", "true"); - System.setProperty("solr.tests.id.docValues", "true"); + System.setProperty("tests.solr.id.stored", "true"); + System.setProperty("tests.solr.id.docValues", "true"); break; case 1: - System.setProperty("solr.tests.id.stored", "true"); - System.setProperty("solr.tests.id.docValues", "false"); + System.setProperty("tests.solr.id.stored", "true"); + System.setProperty("tests.solr.id.docValues", "false"); break; case 2: - System.setProperty("solr.tests.id.stored", "false"); - System.setProperty("solr.tests.id.docValues", "true"); + System.setProperty("tests.solr.id.stored", "false"); + System.setProperty("tests.solr.id.docValues", "true"); break; default: fail("Bad random number generated not between 0-2 inclusive"); diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestShardHandlerFactory.java index 59325e9b55e9..98d7c4b9c2ce 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TestShardHandlerFactory.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TestShardHandlerFactory.java @@ -45,11 +45,11 @@ public class TestShardHandlerFactory extends SolrTestCaseJ4 { }; private static final String LOAD_BALANCER_REQUESTS_MIN_ABSOLUTE = - "solr.tests.loadBalancerRequestsMinimumAbsolute"; + "tests.solr.loadBalancerRequestsMinimumAbsolute"; private static final String LOAD_BALANCER_REQUESTS_MAX_FRACTION = - "solr.tests.loadBalancerRequestsMaximumFraction"; + "tests.solr.loadBalancerRequestsMaximumFraction"; private static final String SHARD_HANDLER_FACTORY_PROPERTY = - "solr.tests.defaultShardHandlerFactory"; + "tests.solr.defaultShardHandlerFactory"; private static int expectedLoadBalancerRequestsMinimumAbsolute = 0; private static float expectedLoadBalancerRequestsMaximumFraction = 1.0f; diff --git a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java index cf44fc093008..5118fd3cb9ed 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java @@ -49,7 +49,7 @@ public static void setupCluster() throws Exception { // choose a directory factory expectVersionsAfterRestart = random().nextBoolean(); System.setProperty( - "solr.directoryFactory", + "tests.solr.directory.factory", (expectVersionsAfterRestart ? StandardDirectoryFactory.class.getCanonicalName() : MockDirectoryFactory.class.getCanonicalName())); diff --git a/solr/core/src/test/org/apache/solr/handler/designer/ManagedSchemaDiffTest.java b/solr/core/src/test/org/apache/solr/handler/designer/ManagedSchemaDiffTest.java index 023f310399d7..c4cbb5e48b81 100644 --- a/solr/core/src/test/org/apache/solr/handler/designer/ManagedSchemaDiffTest.java +++ b/solr/core/src/test/org/apache/solr/handler/designer/ManagedSchemaDiffTest.java @@ -37,7 +37,7 @@ public class ManagedSchemaDiffTest extends SolrCloudTestCase { @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(1) .addConfig(DEFAULT_CONFIGSET_NAME, ExternalPaths.DEFAULT_CONFIGSET) .configure(); diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesigner.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesigner.java index d1677f75235c..cad43a869cfc 100644 --- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesigner.java +++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesigner.java @@ -79,7 +79,7 @@ public class TestSchemaDesigner extends SolrCloudTestCase implements SchemaDesig @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(1) .addConfig(DEFAULT_CONFIGSET_NAME, ExternalPaths.DEFAULT_CONFIGSET) .configure(); diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerConfigSetHelper.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerConfigSetHelper.java index 300a78c35812..a01548fe1e23 100644 --- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerConfigSetHelper.java +++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerConfigSetHelper.java @@ -55,7 +55,7 @@ public class TestSchemaDesignerConfigSetHelper extends SolrCloudTestCase @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(1) .addConfig(DEFAULT_CONFIGSET_NAME, ExternalPaths.DEFAULT_CONFIGSET) .configure(); diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerSettingsDAO.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerSettingsDAO.java index e7826e1e77a0..98000302f40d 100644 --- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerSettingsDAO.java +++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerSettingsDAO.java @@ -39,7 +39,7 @@ public class TestSchemaDesignerSettingsDAO extends SolrCloudTestCase @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(1) .addConfig(DEFAULT_CONFIGSET_NAME, ExternalPaths.DEFAULT_CONFIGSET) .configure(); diff --git a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerSolrJ.java b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerSolrJ.java index 9d3a4fe13841..4e77427a9efd 100644 --- a/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerSolrJ.java +++ b/solr/core/src/test/org/apache/solr/handler/designer/TestSchemaDesignerSolrJ.java @@ -47,7 +47,7 @@ public class TestSchemaDesignerSolrJ extends SolrCloudTestCase { @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(1) .addConfig(DEFAULT_CONFIGSET_NAME, ExternalPaths.DEFAULT_CONFIGSET) .configure(); diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterWithoutStoredIdTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterWithoutStoredIdTest.java index df0a947bd6bd..1f4adced1a6c 100644 --- a/solr/core/src/test/org/apache/solr/highlight/HighlighterWithoutStoredIdTest.java +++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterWithoutStoredIdTest.java @@ -22,7 +22,7 @@ public class HighlighterWithoutStoredIdTest extends HighlighterTest { @BeforeClass public static void beforeClassProps() { - System.setProperty("solr.tests.id.stored", "false"); - System.setProperty("solr.tests.id.docValues", "true"); + System.setProperty("tests.solr.id.stored", "false"); + System.setProperty("tests.solr.id.docValues", "true"); } } diff --git a/solr/core/src/test/org/apache/solr/highlight/TestUnifiedSolrHighlighterWithoutStoredId.java b/solr/core/src/test/org/apache/solr/highlight/TestUnifiedSolrHighlighterWithoutStoredId.java index 6aa12b75c6d4..43bdf6a1d2a8 100644 --- a/solr/core/src/test/org/apache/solr/highlight/TestUnifiedSolrHighlighterWithoutStoredId.java +++ b/solr/core/src/test/org/apache/solr/highlight/TestUnifiedSolrHighlighterWithoutStoredId.java @@ -23,7 +23,7 @@ public class TestUnifiedSolrHighlighterWithoutStoredId extends TestUnifiedSolrHi @BeforeClass public static void beforeClassProps() { - System.setProperty("solr.tests.id.stored", "false"); - System.setProperty("solr.tests.id.docValues", "true"); + System.setProperty("tests.solr.id.stored", "false"); + System.setProperty("tests.solr.id.docValues", "true"); } } diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java index b519e2c3d3a1..3b4cd273917a 100644 --- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java +++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java @@ -743,7 +743,7 @@ public QParser createParser( @SuppressWarnings("ReferenceEquality") public void testSchemaPlugins() throws Exception { String COLLECTION_NAME = "testSchemaLoadingColl"; - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); IndexSchema[] schemas = new IndexSchema[2]; // tracks schemas for a selected core diff --git a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java index df8c8cb60c67..4c87d5300179 100644 --- a/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java +++ b/solr/core/src/test/org/apache/solr/response/TestRetrieveFieldsOptimizer.java @@ -63,7 +63,7 @@ public class TestRetrieveFieldsOptimizer extends SolrTestCaseJ4 { @BeforeClass public static void initManagedSchemaCore() throws Exception { // This testing approach means no schema file or per-test temp solr-home! - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty( "managed.schema.resourceName", "schema-one-field-no-dynamic-field-unique-key.xml"); System.setProperty("solr.index.updatelog.enabled", "false"); diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java index def647fe426e..0a3c05b22960 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java @@ -61,7 +61,7 @@ public void before() throws Exception { Path tmpSolrHome = createTempDir(); PathUtils.copyDirectory(TEST_HOME(), tmpSolrHome); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "false"); createJettyAndHarness(tmpSolrHome, "solrconfig-managed-schema.xml", "schema-rest.xml"); diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java index 2a0bcc385e3e..1bae5e9532af 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java @@ -42,7 +42,7 @@ public void before() throws Exception { Path tmpSolrHome = createTempDir(); PathUtils.copyDirectory(TEST_HOME(), tmpSolrHome); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "false"); createJettyAndHarness(tmpSolrHome, "solrconfig-managed-schema.xml", "schema-rest.xml"); diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java index dc58da73485f..53db9261b06e 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java @@ -45,7 +45,7 @@ public void before() throws Exception { tmpSolrHome = createTempDir(); PathUtils.copyDirectory(TEST_HOME(), tmpSolrHome); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "false"); createJettyAndHarness(tmpSolrHome, "solrconfig-managed-schema.xml", "schema-rest.xml"); } diff --git a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java index 3812bd1fc487..11bfb4ee4dfc 100644 --- a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java @@ -65,8 +65,8 @@ public static void beforeClass() throws Exception { simfac1 = simfac2; simfac2 = tmp; } - System.setProperty("solr.test.simfac1", simfac1.getName()); - System.setProperty("solr.test.simfac2", simfac2.getName()); + System.setProperty("tests.solr.simfac1", simfac1.getName()); + System.setProperty("tests.solr.simfac2", simfac2.getName()); initCore(); } @@ -175,7 +175,7 @@ private static void assertSimilarity(SolrCore core, Class" - + " " + + " " + ""; private String withoutWhich = @@ -194,6 +194,6 @@ private static void assertSimilarity(SolrCore core, Class" - + " " + + " " + ""; } diff --git a/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java index ee432a649021..c9a94eb8afb7 100644 --- a/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java @@ -40,7 +40,7 @@ public class EnumFieldTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { System.setProperty( - "solr.tests.EnumFieldTest.indexed", Boolean.toString(random().nextBoolean())); + "tests.solr.EnumFieldTest.indexed.enabled", Boolean.toString(random().nextBoolean())); doInitCore(); } @@ -52,7 +52,7 @@ private static void doInitCore() throws Exception { public void testEnumSchema() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); IndexSchema schema = h.getCore().getLatestSchema(); @@ -66,7 +66,7 @@ public void testEnumSchema() { public void testEnumRangeSearch() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); @@ -130,7 +130,7 @@ public void testEnumRangeSearch() { public void testMultivaluedEnumRangeSearch() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); @@ -213,7 +213,7 @@ public void testMultivaluedEnumRangeSearch() { public void testBogusEnumSearch() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); @@ -241,7 +241,7 @@ public void testBogusEnumSearch() { public void testMultivaluedBogusEnumSearch() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); @@ -270,7 +270,7 @@ public void testMultivaluedBogusEnumSearch() { public void testBogusEnumIndexing() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); try (ErrorLogMuter blabla = ErrorLogMuter.regex("Unknown value for enum field: " + FIELD_NAME + ", value: blabla"); @@ -291,7 +291,7 @@ public void testBogusEnumIndexing() { public void testMultivaluedBogusEnumIndexing() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); try (ErrorLogMuter blabla = ErrorLogMuter.regex( @@ -312,7 +312,7 @@ public void testMultivaluedBogusEnumIndexing() { public void testKnownIntegerEnumIndexing() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); @@ -331,7 +331,7 @@ public void testKnownIntegerEnumIndexing() { public void testMultivaluedKnownIntegerEnumIndexing() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); @@ -354,11 +354,11 @@ public void testMultivaluedKnownIntegerEnumIndexing() { public void testEnumSort() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); assumeFalse( "Skipping testing of unindexed EnumField without docValues, which is unsupported.", - System.getProperty("solr.tests.EnumFieldTest.indexed").equals("false") - && System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.EnumFieldTest.indexed.enabled").equals("false") + && System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); assertU(adoc("id", "0", FIELD_NAME, "Not Available")); @@ -424,7 +424,7 @@ public void testEnumSort() { public void testMultivaluedEnumSort() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); assertU(adoc("id", "0", MV_FIELD_NAME, "Not Available")); // Single value @@ -507,11 +507,11 @@ public void testMultivaluedEnumSort() { public void testSetQuery() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); assumeFalse( "Skipping testing of unindexed EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.EnumFieldTest.indexed").equals("false") - && System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.EnumFieldTest.indexed.enabled").equals("false") + && System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); @@ -572,11 +572,11 @@ public void testSetQuery() { public void testMultivaluedSetQuery() { assumeFalse( "Skipping testing of EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); assumeFalse( "Skipping testing of unindexed EnumFieldType without docValues, which is unsupported.", - System.getProperty("solr.tests.EnumFieldTest.indexed").equals("false") - && System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.EnumFieldTest.indexed.enabled").equals("false") + && System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); @@ -640,7 +640,7 @@ public void testMultivaluedSetQuery() { public void testEnumFieldTypeWithoutDocValues() throws Exception { assumeTrue( "Only testing EnumFieldType without docValues.", - System.getProperty("solr.tests.numeric.dv").equals("false")); + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); try { deleteCore(); @@ -659,7 +659,8 @@ public void testEnumFieldTypeWithoutDocValues() throws Exception { @Test public void testFacetEnumSearch() throws Exception { assumeFalse( - "This requires docValues", System.getProperty("solr.tests.numeric.dv").equals("false")); + "This requires docValues", + System.getProperty("tests.solr.numeric.dv.enabled").equals("false")); clearIndex(); diff --git a/solr/core/src/test/org/apache/solr/schema/ManagedSchemaRoundRobinCloudTest.java b/solr/core/src/test/org/apache/solr/schema/ManagedSchemaRoundRobinCloudTest.java index bd75970eca20..81b874080877 100644 --- a/solr/core/src/test/org/apache/solr/schema/ManagedSchemaRoundRobinCloudTest.java +++ b/solr/core/src/test/org/apache/solr/schema/ManagedSchemaRoundRobinCloudTest.java @@ -39,7 +39,7 @@ public class ManagedSchemaRoundRobinCloudTest extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(NUM_SHARDS).addConfig(CONFIG, configset(CONFIG)).configure(); CollectionAdminRequest.createCollection(COLLECTION, CONFIG, NUM_SHARDS, 1) .process(cluster.getSolrClient()); diff --git a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java index cae956218cf6..2e1d360c6eb9 100644 --- a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java @@ -57,7 +57,7 @@ public void initManagedSchemaCore() throws Exception { // initCore will trigger an upgrade to managed schema, since the solrconfig has // - System.setProperty("managed.schema.mutable", "false"); + System.setProperty("tests.solr.schema.managed.mutable", "false"); System.setProperty("solr.index.updatelog.enabled", "false"); initCore("solrconfig-managed-schema.xml", "schema-minimal.xml", tmpSolrHome); } @@ -145,7 +145,7 @@ public void testMaxDistErrConversion() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome); String fieldName = "new_text_field"; @@ -263,7 +263,7 @@ private void setupRPTField(String distanceUnits, String format, FieldType fieldT Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome); String fieldName = "new_text_field"; diff --git a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java index b709b36bbee5..e3f6a6a0065f 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java +++ b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java @@ -54,7 +54,7 @@ public class TestBulkSchemaConcurrent extends AbstractFullDistribZkTestBase { @BeforeClass public static void initSysProperties() { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "true"); } diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java index fd98948df1d4..a2d25d0c6c10 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java @@ -43,7 +43,7 @@ public TestCloudManagedSchema() { @BeforeClass public static void initSysProperties() { - System.setProperty("managed.schema.mutable", "false"); + System.setProperty("tests.solr.schema.managed.mutable", "false"); System.setProperty("solr.index.updatelog.enabled", "true"); } diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java index 55834502229f..f3169af18cd4 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java +++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java @@ -79,7 +79,7 @@ public void initManagedSchemaCore() throws Exception { // initCore will trigger an upgrade to managed schema, since the solrconfig has // - System.setProperty("managed.schema.mutable", "false"); + System.setProperty("tests.solr.schema.managed.mutable", "false"); System.setProperty("solr.index.updatelog.enabled", "false"); initCore("solrconfig-managed-schema.xml", "schema-minimal.xml", tmpSolrHome); } @@ -207,7 +207,7 @@ public void testAddFieldPersistence() throws Exception { Files.delete( managedSchemaFile); // Delete managed-schema.xml, so it won't block parsing a new schema - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome); assertTrue(Files.exists(managedSchemaFile)); @@ -239,7 +239,7 @@ public void testAddedFieldIndexableAndQueryable() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome); assertTrue(Files.exists(managedSchemaFile)); @@ -287,7 +287,7 @@ public void testAddFieldWhenItAlreadyExists() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome); assertNotNull( @@ -323,7 +323,7 @@ public void testAddSameFieldTwice() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome); Map options = new HashMap<>(); @@ -359,7 +359,7 @@ public void testAddDynamicField() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome); assertNull( @@ -394,7 +394,7 @@ public void testAddWithSchemaCodecFactory() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema_codec.xml", tmpSolrHome); String uniqueKey = "string_f"; @@ -425,7 +425,7 @@ public void testAddWithSchemaSimilarityFactory() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-bm25.xml", tmpSolrHome); String uniqueKey = "id"; @@ -457,7 +457,7 @@ public void testPersistUniqueKey() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore( "solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field-unique-key.xml", @@ -499,7 +499,7 @@ public void testAddFieldThenReload() throws Exception { Path managedSchemaFile = tmpConfDir.resolve("managed-schema.xml"); // Delete managed-schema.xml, so it won't block parsing a new schema Files.delete(managedSchemaFile); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-one-field-no-dynamic-field.xml", tmpSolrHome); String fieldName = "new_text_field"; diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaAPI.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaAPI.java index 2168c55c3405..2851d9c9abd5 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaAPI.java +++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaAPI.java @@ -40,7 +40,7 @@ public class TestManagedSchemaAPI extends SolrCloudTestCase { @BeforeClass public static void createCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); configureCluster(2) .addConfig( "conf1", TEST_PATH().resolve("configsets").resolve("cloud-managed").resolve("conf")) diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaWithMultipleAdd.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaWithMultipleAdd.java index 235e69b08fc0..e979fd184627 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaWithMultipleAdd.java +++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaWithMultipleAdd.java @@ -42,7 +42,7 @@ public class TestManagedSchemaWithMultipleAdd extends SolrCloudTestCase { @BeforeClass public static void createClusterAndInitSysProperties() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.autoSoftCommit.maxTime", Integer.toString(AUTOSOFTCOMMIT_MAXTIME_MS)); configureCluster(1) .addConfig( diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java index 60646420b582..f3815fd6281f 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java +++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java @@ -127,7 +127,7 @@ public void initManagedSchemaCore() throws Exception { // initCore will trigger an upgrade to managed schema, since the solrconfig has // System.setProperty("solr.index.updatelog.enabled", "false"); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-non-stored-docvalues.xml", tmpSolrHome); assertQ("sanity check", req("q", "*:*"), "//*[@numFound='0']"); diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java index 0f34a9be8237..6f90e39c58db 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java +++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java @@ -36,7 +36,7 @@ public void before() throws Exception { Path tmpSolrHome = createTempDir(); PathUtils.copyDirectory(TEST_HOME(), tmpSolrHome); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "false"); createJettyAndHarness(tmpSolrHome, "solrconfig-managed-schema.xml", "schema-rest.xml"); diff --git a/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java b/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java index e1dd10795844..09b0cf53cfeb 100644 --- a/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java +++ b/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java @@ -53,7 +53,7 @@ public class CursorMarkTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { System.setProperty( - "solr.test.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); + "tests.solr.useFilterForSortedQuery", Boolean.toString(random().nextBoolean())); initCore(CursorPagingTest.TEST_SOLRCONFIG_NAME, CursorPagingTest.TEST_SCHEMAXML_NAME); } diff --git a/solr/core/src/test/org/apache/solr/search/DistributedReRankExplainTest.java b/solr/core/src/test/org/apache/solr/search/DistributedReRankExplainTest.java index bb791150d483..158d3df82da9 100644 --- a/solr/core/src/test/org/apache/solr/search/DistributedReRankExplainTest.java +++ b/solr/core/src/test/org/apache/solr/search/DistributedReRankExplainTest.java @@ -54,7 +54,7 @@ public class DistributedReRankExplainTest extends SolrCloudTestCase { @BeforeClass public static void setupCluster() throws Exception { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); String collection = COLLECTIONORALIAS; configureCluster(2) .addConfig( diff --git a/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java b/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java index ef3af492fdba..f3cc297d8a50 100644 --- a/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java +++ b/solr/core/src/test/org/apache/solr/search/LargeFieldTest.java @@ -40,7 +40,7 @@ public class LargeFieldTest extends SolrTestCaseJ4 { @BeforeClass public static void initManagedSchemaCore() throws Exception { // This testing approach means no schema file or per-test temp solr-home! - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty( "managed.schema.resourceName", "schema-one-field-no-dynamic-field-unique-key.xml"); System.setProperty("solr.index.updatelog.enabled", "false"); diff --git a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java index cde5d92de29e..d9fcb84863fa 100644 --- a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java +++ b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java @@ -46,7 +46,7 @@ public void initManagedSchemaCore() throws Exception { // initCore will trigger an upgrade to managed schema, since the solrconfig has // - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "true"); initCore(configFileName, schemaFileName, tmpSolrHome); } diff --git a/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java b/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java index 17135a8e7d19..28bbb72c7261 100644 --- a/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java +++ b/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java @@ -25,7 +25,7 @@ public class TestFieldSortValues extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { System.setProperty( - "solr.tests.payload.fieldtype", + "tests.solr.payload.fieldtype", Boolean.getBoolean(NUMERIC_POINTS_SYSPROP) ? "wrapped_point_int" : "wrapped_trie_int"); initCore("solrconfig-minimal.xml", "schema-field-sort-values.xml"); } diff --git a/solr/core/src/test/org/apache/solr/search/TestMainQueryCaching.java b/solr/core/src/test/org/apache/solr/search/TestMainQueryCaching.java index 4df4610a501e..8ff08cf118dc 100644 --- a/solr/core/src/test/org/apache/solr/search/TestMainQueryCaching.java +++ b/solr/core/src/test/org/apache/solr/search/TestMainQueryCaching.java @@ -39,9 +39,9 @@ public class TestMainQueryCaching extends SolrTestCaseJ4 { private static final int MOST_DOCS = 100; private static final int ALL_DOCS = MOST_DOCS + 1; - private static final String TEST_UFFSQ_PROPNAME = "solr.test.useFilterForSortedQuery"; + private static final String TEST_UFFSQ_PROPNAME = "tests.solr.useFilterForSortedQuery"; static String RESTORE_UFFSQ_PROP; - private static final String TEST_QRC_WINDOW_SIZE_PROPNAME = "solr.test.queryResultWindowSize"; + private static final String TEST_QRC_WINDOW_SIZE_PROPNAME = "tests.solr.queryResultWindowSize"; static String RESTORE_QRC_WINDOW_SIZE_PROP; static boolean USE_FILTER_FOR_SORTED_QUERY; diff --git a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java index 083d9aeb9998..0cbcb27d3f7b 100644 --- a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java +++ b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java @@ -35,7 +35,7 @@ public class TestOverriddenPrefixQueryForCustomFieldType extends SolrTestCaseJ4 @BeforeClass public static void beforeClass() throws Exception { System.setProperty( - "solr.tests.CustomIntFieldType", + "tests.solr.CustomIntFieldType", (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP) ? "solr.IntPointPrefixActsAsRangeQueryFieldType" : "solr.TrieIntPrefixActsAsRangeQueryFieldType")); diff --git a/solr/core/src/test/org/apache/solr/search/TestRecovery.java b/solr/core/src/test/org/apache/solr/search/TestRecovery.java index 6bdc5ed6e082..1a8a17b18f99 100644 --- a/solr/core/src/test/org/apache/solr/search/TestRecovery.java +++ b/solr/core/src/test/org/apache/solr/search/TestRecovery.java @@ -72,7 +72,8 @@ public class TestRecovery extends SolrTestCaseJ4 { // TODO: fix this test to not require FSDirectory @Before public void beforeTest() throws Exception { - System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory"); + System.setProperty( + "tests.solr.directory.factory", "org.apache.solr.core.MockFSDirectoryFactory"); initCore("solrconfig-tlog.xml", "schema15.xml"); // validate that the schema was not changed to an unexpected state diff --git a/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java b/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java index 11168e816d6f..7d685bea0536 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java +++ b/solr/core/src/test/org/apache/solr/search/TestSearcherReuse.java @@ -62,7 +62,7 @@ public static void setupTempDirAndCoreWithManagedSchema() throws Exception { // initCore will trigger an upgrade to managed schema, since the solrconfig has // - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); initCore("solrconfig-managed-schema.xml", "schema-id-and-version-fields-only.xml", solrHome); } diff --git a/solr/core/src/test/org/apache/solr/search/TestTermsQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestTermsQParserPlugin.java index 4f755573a1bf..d200eef318b2 100644 --- a/solr/core/src/test/org/apache/solr/search/TestTermsQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestTermsQParserPlugin.java @@ -256,7 +256,7 @@ public void testTermsMethodEquivalency() { // Test schema randomizes between Trie and Point. "terms" is supported for "trie" but not // "Point" - final String numericFieldType = System.getProperty("solr.tests.IntegerFieldType"); + final String numericFieldType = System.getProperty("tests.solr.IntegerFieldType"); if (numericFieldType.contains("Point")) { assertQEx("Expected 'terms' query on PointField to fail", req(params, "indent", "on"), 400); } else { diff --git a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java index 990875263391..ad5aa96650ed 100644 --- a/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java +++ b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java @@ -36,8 +36,8 @@ public class CacheHeaderTest extends CacheHeaderTestBase { public static void beforeTest() throws Exception { // System properties are required by collection1 solrconfig.xml propTest configuration // These cannot be removed as they are used for property substitution in the config - System.setProperty("solr.test.sys.prop1", "propone"); - System.setProperty("solr.test.sys.prop2", "proptwo"); + System.setProperty("tests.solr.sys.prop1", "propone"); + System.setProperty("tests.solr.sys.prop2", "proptwo"); Path solrHomeDirectory = createTempDir(); copySolrHomeToTemp(solrHomeDirectory, "collection1"); diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java index 314d245fbeb7..5bb6aa20a2cb 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java @@ -29,7 +29,8 @@ public class SuggesterTest extends SolrTestCaseJ4 { // TODO: fix this test to not require FSDirectory @BeforeClass public static void beforeClass() throws Exception { - System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory"); + System.setProperty( + "tests.solr.directory.factory", "org.apache.solr.core.MockFSDirectoryFactory"); initCore("solrconfig-spellchecker.xml", "schema-spellchecker.xml"); } diff --git a/solr/core/src/test/org/apache/solr/update/CustomTLogDirTest.java b/solr/core/src/test/org/apache/solr/update/CustomTLogDirTest.java index 5d0047b07254..ea8780b4611d 100644 --- a/solr/core/src/test/org/apache/solr/update/CustomTLogDirTest.java +++ b/solr/core/src/test/org/apache/solr/update/CustomTLogDirTest.java @@ -37,7 +37,7 @@ public class CustomTLogDirTest extends SolrTestCaseJ4 { new EmbeddedSolrServerTestRule() { @Override protected void before() { - System.setProperty("solr.directoryFactory", "solr.NRTCachingDirectoryFactory"); + System.setProperty("tests.solr.directory.factory", "solr.NRTCachingDirectoryFactory"); solrTestRule.startSolr(); } }; @@ -80,7 +80,7 @@ public void testIllegalRelative() throws Exception { Path configSet = LuceneTestCase.createTempDir(); System.setProperty("solr.index.updatelog.enabled", "true"); - System.setProperty("solr.test.sys.prop2", "proptwo"); + System.setProperty("tests.solr.sys.prop2", "proptwo"); System.setProperty("solr.ulog.dir", ulogDir.toString()); // picked up from `solrconfig.xml` SolrTestCaseJ4.copyMinConf(configSet, null, "solrconfig.xml"); @@ -140,7 +140,7 @@ private static void validateTlogPath( SolrClient client, Path instanceDir, Path ulogDir, Path resolvedTlogDir) throws Exception { Path configSet = LuceneTestCase.createTempDir(); System.setProperty("solr.index.updatelog.enabled", "true"); - System.setProperty("solr.test.sys.prop2", "proptwo"); + System.setProperty("tests.solr.sys.prop2", "proptwo"); if (ulogDir != null) { System.setProperty("solr.ulog.dir", ulogDir.toString()); // picked up from `solrconfig.xml` } diff --git a/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java b/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java index 9e302b03f998..0a6b7ce80948 100644 --- a/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java +++ b/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java @@ -41,7 +41,7 @@ public void before() throws Exception { PathUtils.copyFileToDirectory( testHomeConfDir.resolve("solrconfig.snippet.randomindexconfig.xml"), tmpConfDir); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "false"); initCore( "solrconfig-schemaless.xml", "schema-add-schema-fields-update-processor.xml", tmpSolrHome); diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java index 725f4cfcd0fb..1fdc51060983 100644 --- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java @@ -54,7 +54,8 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { - System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory"); + System.setProperty( + "tests.solr.directory.factory", "org.apache.solr.core.MockFSDirectoryFactory"); System.setProperty( "solr.index.updatelog.enabled", "false"); // schema12 doesn't support _version_ systemSetPropertySolrTestsMergePolicyFactory(TieredMergePolicyFactory.class.getName()); diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java index e207d213af0c..c0d73eeacbf8 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java @@ -319,7 +319,7 @@ public void testMaxCommitMergeWaitTime() throws Exception { assertEquals( IndexWriterConfig.DEFAULT_MAX_FULL_FLUSH_MERGE_WAIT_MILLIS, sc.indexConfig.toIndexWriterConfig(h.getCore()).getMaxFullFlushMergeWaitMillis()); - System.setProperty("solr.tests.maxCommitMergeWaitTime", "10"); + System.setProperty("tests.solr.maxCommitMergeWaitTime", "10"); sc = new SolrConfig(TEST_PATH().resolve("collection1"), "solrconfig-test-misc.xml"); assertEquals(10, sc.indexConfig.maxCommitMergeWaitMillis); assertEquals( diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java index 68d105cc7d26..f173d594ccf3 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexMetricsTest.java @@ -82,7 +82,7 @@ public void testIndexNoMetrics() throws Exception { @Test public void testIndexMetricsMajorAndMinorMerges() throws Exception { - System.setProperty("solr.tests.metrics.majorMergeDocs", "450"); + System.setProperty("tests.solr.metrics.majorMergeDocs", "450"); initCore("solrconfig-indexmetrics.xml", "schema.xml"); addDocs(); diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java index 9ae688f377ac..f8e675243974 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java @@ -53,8 +53,8 @@ public class SolrIndexSplitterTest extends SolrTestCaseJ4 { public static void beforeClass() throws Exception { // System.setProperty("solr.index.updatelog.enabled", "false"); // schema12 doesn't support // _version_ - System.setProperty("solr.directoryFactory", "solr.NRTCachingDirectoryFactory"); - System.setProperty("solr.tests.lockType", DirectoryFactory.LOCK_TYPE_SIMPLE); + System.setProperty("tests.solr.directory.factory", "solr.NRTCachingDirectoryFactory"); + System.setProperty("tests.solr.lockType", DirectoryFactory.LOCK_TYPE_SIMPLE); // route_l needs docValues to be usable as a router.field when numerics are Point-based if (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP)) { System.setProperty(NUMERIC_DOCVALUES_SYSPROP, "true"); diff --git a/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java b/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java index d4e360f9f7e2..f2f4fdfb7019 100644 --- a/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java +++ b/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java @@ -41,7 +41,8 @@ public class TestIndexingPerformance extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { - System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory"); + System.setProperty( + "tests.solr.directory.factory", "org.apache.solr.core.MockFSDirectoryFactory"); initCore("solrconfig_perf.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessorIntegrationTest.java b/solr/core/src/test/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessorIntegrationTest.java index d67dd4974626..5947a55cf77d 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessorIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessorIntegrationTest.java @@ -39,8 +39,8 @@ public static void setupCluster() throws Exception { TEST_PATH().resolve("configsets").resolve("cloud-minimal-field-limiting").resolve("conf"); configureCluster(1).addConfig(FIELD_LIMITING_CS_NAME, configPath).configure(); - System.setProperty("solr.test.fieldLimit.warnOnly", "false"); - System.setProperty("solr.test.maxFields", String.valueOf(100)); + System.setProperty("tests.solr.fieldLimit.warnOnly", "false"); + System.setProperty("tests.solr.maxFields", String.valueOf(100)); } @Before @@ -48,8 +48,8 @@ public static void setupCluster() throws Exception { public void setUp() throws Exception { super.setUp(); - System.setProperty("solr.test.fieldLimit.warnOnly", "false"); - System.setProperty("solr.test.maxFields", String.valueOf(100)); + System.setProperty("tests.solr.fieldLimit.warnOnly", "false"); + System.setProperty("tests.solr.maxFields", String.valueOf(100)); // Collection might already exist if test is being run multiple times final var collections = CollectionAdminRequest.listCollections(cluster.getSolrClient()); @@ -107,7 +107,7 @@ private void ensureNewFieldCreationTriggersExpectedFailure() throws Exception { } private void setWarnOnly(boolean warnOnly) throws Exception { - System.setProperty("solr.test.fieldLimit.warnOnly", String.valueOf(warnOnly)); + System.setProperty("tests.solr.fieldLimit.warnOnly", String.valueOf(warnOnly)); final var reloadRequest = CollectionAdminRequest.reloadCollection(COLLECTION_NAME); final var reloadResponse = reloadRequest.process(cluster.getSolrClient()); @@ -115,7 +115,7 @@ private void setWarnOnly(boolean warnOnly) throws Exception { } private void setFieldLimitTo(int value) throws Exception { - System.setProperty("solr.test.maxFields", String.valueOf(value)); + System.setProperty("tests.solr.maxFields", String.valueOf(value)); final var reloadRequest = CollectionAdminRequest.reloadCollection(COLLECTION_NAME); final var reloadResponse = reloadRequest.process(cluster.getSolrClient()); diff --git a/solr/core/src/test/org/apache/solr/util/MultipleManagedSchemasTest.java b/solr/core/src/test/org/apache/solr/util/MultipleManagedSchemasTest.java index 706cf33afbaa..694aeb36dee2 100644 --- a/solr/core/src/test/org/apache/solr/util/MultipleManagedSchemasTest.java +++ b/solr/core/src/test/org/apache/solr/util/MultipleManagedSchemasTest.java @@ -28,7 +28,7 @@ public class MultipleManagedSchemasTest extends SolrCloudTestCase { @BeforeClass public static void setUpCluster() throws Exception { - System.setProperty("managed.schema.mutable", "false"); + System.setProperty("tests.solr.schema.managed.mutable", "false"); configureCluster(1).configure(); } diff --git a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java index c98ef9f01eb8..ad8b3d5323b1 100644 --- a/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java +++ b/solr/core/src/test/org/apache/solr/util/TestCborDataFormat.java @@ -64,7 +64,7 @@ public void testRoundTrip() throws Exception { "conf", TEST_PATH().resolve("configsets").resolve("cloud-managed").resolve("conf")) .configure(); try { - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); CloudSolrClient client = cluster.getSolrClient(); CollectionAdminRequest.createCollection(testCollection, "conf", 1, 1).process(client); modifySchema(testCollection, client); diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-document-categorizer.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-document-categorizer.xml index c40f3e17f3cb..99da870a7f02 100644 --- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-document-categorizer.xml +++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-document-categorizer.xml @@ -22,7 +22,7 @@ - + @@ -82,4 +82,4 @@ category_s - \ No newline at end of file + diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml index 44ef65307526..1791d0356f7d 100644 --- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml +++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml @@ -23,5 +23,5 @@ ${useCompoundFile:false} - + diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml index 1bf101f0db16..225bcdf757d8 100644 --- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml +++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-opennlp-extract.xml @@ -22,7 +22,7 @@ - + diff --git a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml index 23516b078f66..05bb24aa57ad 100644 --- a/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml +++ b/solr/modules/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml @@ -25,14 +25,14 @@ A solrconfig.xml snippet containing indexConfig settings for randomized testing. the RandomMergePolicy in all tests - but some tests expect very specific Merge behavior, so those tests can set it as needed. --> - + ${useCompoundFile:false} - ${solr.tests.maxBufferedDocs} - ${solr.tests.ramBufferSizeMB} + ${tests.solr.maxBufferedDocs} + ${tests.solr.ramBufferSizeMB} - + 1000 10000 @@ -41,8 +41,8 @@ A solrconfig.xml snippet containing indexConfig settings for randomized testing. use the single process lockType for speed - but tests that explicitly need to vary the lockType can set it as needed. --> - ${solr.tests.lockType:single} + ${tests.solr.lockType:single} - ${solr.tests.infostream:false} + ${tests.solr.infostream:false} diff --git a/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml index 7376c7a07d19..baec3e9c9ef2 100644 --- a/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml +++ b/solr/modules/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml @@ -25,7 +25,7 @@ If replication is in use, this should match the replication configuration. --> ${solr.data.dir:} - + diff --git a/solr/modules/cuvs/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/modules/cuvs/src/test-files/solr/collection1/conf/solrconfig.xml index 38117a9e7a61..25b227d56520 100644 --- a/solr/modules/cuvs/src/test-files/solr/collection1/conf/solrconfig.xml +++ b/solr/modules/cuvs/src/test-files/solr/collection1/conf/solrconfig.xml @@ -26,7 +26,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} - + diff --git a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml index 9dea3618b084..989be60dec58 100644 --- a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml +++ b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml @@ -31,10 +31,10 @@ - - - - + + + + - - - - + + + + @@ -105,7 +105,7 @@ - + ${solr.data.dir:} - + @@ -151,15 +151,15 @@ - ${solr.test.extraction.backend:tikaserver} - ${solr.test.tikaserver.url:} - ${solr.test.tikaserver.metadata.compatibility:false} + ${tests.solr.extraction.backend:tikaserver} + ${tests.solr.tikaserver.url:} + ${tests.solr.tikaserver.metadata.compatibility:false} - ${solr.test.extraction.backend:tikaserver} - ${solr.test.tikaserver.url:} - ${solr.test.tikaserver.metadata.compatibility:false} + ${tests.solr.extraction.backend:tikaserver} + ${tests.solr.tikaserver.url:} + ${tests.solr.tikaserver.metadata.compatibility:false} x diff --git a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTikaServerTest.java b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTikaServerTest.java index f32dbb5289c8..440c5eff965d 100644 --- a/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTikaServerTest.java +++ b/solr/modules/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTikaServerTest.java @@ -36,9 +36,9 @@ public class ExtractingRequestHandlerTikaServerTest extends ExtractingRequestHan @BeforeClass public static void beforeClassTika() throws Exception { String baseUrl = tikaContainer.getBaseUrl(); - System.setProperty("solr.test.tikaserver.url", baseUrl); - System.setProperty("solr.test.extraction.backend", "tikaserver"); - System.setProperty("solr.test.tikaserver.metadata.compatibility", "true"); + System.setProperty("tests.solr.tikaserver.url", baseUrl); + System.setProperty("tests.solr.extraction.backend", "tikaserver"); + System.setProperty("tests.solr.tikaserver.metadata.compatibility", "true"); log.info("Using extraction backend 'tikaserver'. Tika server running on {}", baseUrl); initCore("solrconfig.xml", "schema.xml", getFile("extraction/solr")); } diff --git a/solr/modules/gcs-repository/src/test-files/conf/schema.xml b/solr/modules/gcs-repository/src/test-files/conf/schema.xml index a3a7cc465c27..579917b03d87 100644 --- a/solr/modules/gcs-repository/src/test-files/conf/schema.xml +++ b/solr/modules/gcs-repository/src/test-files/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/modules/gcs-repository/src/test-files/conf/solrconfig.xml b/solr/modules/gcs-repository/src/test-files/conf/solrconfig.xml index 853ba6562416..7cf93d0b6c37 100644 --- a/solr/modules/gcs-repository/src/test-files/conf/solrconfig.xml +++ b/solr/modules/gcs-repository/src/test-files/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -48,4 +48,3 @@ : - diff --git a/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml b/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml index b539459ad5e9..3df8a3a6b680 100644 --- a/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml +++ b/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml b/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml index 853ba6562416..7cf93d0b6c37 100644 --- a/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml +++ b/solr/modules/jwt-auth/src/test-files/solr/configsets/cloud-minimal/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -48,4 +48,3 @@ : - diff --git a/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml index 8edfa41cbdf9..2c685c6ea86f 100644 --- a/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml +++ b/solr/modules/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml @@ -31,7 +31,7 @@ - + ${tests.luceneMatchVersion:LATEST} diff --git a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-document-enrichment.xml b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-document-enrichment.xml index f8d0df950094..3f86aa16e994 100644 --- a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-document-enrichment.xml +++ b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-document-enrichment.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> diff --git a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-no-components.xml b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-no-components.xml index 582af45aa100..e3e9977d91d1 100644 --- a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-no-components.xml +++ b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-no-components.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> diff --git a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-query-parser-only.xml b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-query-parser-only.xml index 5da6c14c04e8..5218c6ed2539 100644 --- a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-query-parser-only.xml +++ b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-query-parser-only.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> diff --git a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-update-request-processor-only.xml b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-update-request-processor-only.xml index 1673199a1d28..698e25fbb003 100644 --- a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-update-request-processor-only.xml +++ b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models-update-request-processor-only.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> diff --git a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models.xml b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models.xml index 3910f769a697..04fb781bc94e 100644 --- a/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models.xml +++ b/solr/modules/language-models/src/test-files/solr/collection1/conf/solrconfig-language-models.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> diff --git a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java index 908754bd1c64..28bf39a33b3d 100644 --- a/solr/modules/language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java +++ b/solr/modules/language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java @@ -92,7 +92,7 @@ protected static void initFolders(boolean isPersistent) throws Exception { Files.delete(largeLanguageModelStore); } - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); } protected static void afterTest() throws Exception { diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml index 56c756f75b5b..21d27beed8b0 100644 --- a/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml +++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/schema.xml @@ -73,11 +73,11 @@ - - - - - + + + + + diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr-featurevectorcache.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr-featurevectorcache.xml index f78d5996d3db..ac8d6d7babdb 100644 --- a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr-featurevectorcache.xml +++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr-featurevectorcache.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> @@ -73,4 +73,4 @@ - \ No newline at end of file + diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml index 528922684d3c..caf7ecaea918 100644 --- a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml +++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml index b46fa3141c09..5e187f4adb09 100644 --- a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml +++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> diff --git a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml index 61d261d418b7..a16855a9cb67 100644 --- a/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml +++ b/solr/modules/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml @@ -14,7 +14,7 @@ ${tests.luceneMatchVersion:LATEST} ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.MockDirectoryFactory}" /> diff --git a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java index acd3eeb3e592..18c913718889 100644 --- a/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java +++ b/solr/modules/ltr/src/test/org/apache/solr/ltr/TestRerankBase.java @@ -171,7 +171,7 @@ protected static void setupTestInit(String solrconfig, String schema, boolean is tmpSolrHome.resolve(CONF_DIR).resolve("schema.xml")); } - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); } public static void setuptest(String solrconfig, String schema) throws Exception { diff --git a/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml index b539459ad5e9..3df8a3a6b680 100644 --- a/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml +++ b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/solrconfig.xml index 853ba6562416..7cf93d0b6c37 100644 --- a/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/solrconfig.xml +++ b/solr/modules/opentelemetry/src/test-files/solr/collection1/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -48,4 +48,3 @@ : - diff --git a/solr/modules/opentelemetry/src/test-files/solr/solr.xml b/solr/modules/opentelemetry/src/test-files/solr/solr.xml index 42f330816fdd..fa2349c9a1e9 100644 --- a/solr/modules/opentelemetry/src/test-files/solr/solr.xml +++ b/solr/modules/opentelemetry/src/test-files/solr/solr.xml @@ -26,7 +26,7 @@ ${configSetBaseDir:configsets} ${coreRootDirectory:.} ${collectionsHandler:solr.CollectionsHandler} - ${solr.tests.security.allow.urls:} + ${tests.solr.security.allow.urls:} ${socketTimeout:90000} diff --git a/solr/modules/s3-repository/src/test-files/conf/schema.xml b/solr/modules/s3-repository/src/test-files/conf/schema.xml index a3a7cc465c27..579917b03d87 100644 --- a/solr/modules/s3-repository/src/test-files/conf/schema.xml +++ b/solr/modules/s3-repository/src/test-files/conf/schema.xml @@ -17,8 +17,8 @@ --> - - + + diff --git a/solr/modules/s3-repository/src/test-files/conf/solrconfig.xml b/solr/modules/s3-repository/src/test-files/conf/solrconfig.xml index 853ba6562416..7cf93d0b6c37 100644 --- a/solr/modules/s3-repository/src/test-files/conf/solrconfig.xml +++ b/solr/modules/s3-repository/src/test-files/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -48,4 +48,3 @@ : - diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml index b1f11612b6b3..d5ff322f6611 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/schema.xml @@ -27,9 +27,9 @@ - - - + + + - + ${useCompoundFile:false} - ${solr.tests.maxBufferedDocs} - ${solr.tests.ramBufferSizeMB} - ${solr.tests.maxCommitMergeWaitTime:-1} - ${solr.tests.ramPerThreadHardLimitMB} + ${tests.solr.maxBufferedDocs} + ${tests.solr.ramBufferSizeMB} + ${tests.solr.maxCommitMergeWaitTime:-1} + ${tests.solr.ramPerThreadHardLimitMB} - + 1000 10000 @@ -44,8 +44,8 @@ A solrconfig.xml snippet containing indexConfig settings for randomized testing. use the single process lockType for speed - but tests that explicitly need to vary the lockType canset it as needed. --> - ${solr.tests.lockType:single} + ${tests.solr.lockType:single} - ${solr.tests.infostream:false} + ${tests.solr.infostream:false} diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.xml index d47530453093..665a3baab7a5 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.xml +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/solrconfig.xml @@ -33,7 +33,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml index d8c6fd2bdbb1..6aae547002a2 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/stateless-solrconfig-script-updateprocessor.xml @@ -25,7 +25,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/modules/sql/src/test-files/solr/configsets/sql/conf/schema.xml b/solr/modules/sql/src/test-files/solr/configsets/sql/conf/schema.xml index 2311e7666325..e7c575e1849d 100644 --- a/solr/modules/sql/src/test-files/solr/configsets/sql/conf/schema.xml +++ b/solr/modules/sql/src/test-files/solr/configsets/sql/conf/schema.xml @@ -45,15 +45,15 @@ 1.6: useDocValuesAsStored defaults to true. 1.7: docValues defaults to true, uninvertible defaults to false. --> - - - - + + + + - - - - + + + + @@ -139,8 +139,8 @@ - - + + diff --git a/solr/modules/sql/src/test-files/solr/configsets/sql/conf/solrconfig.xml b/solr/modules/sql/src/test-files/solr/configsets/sql/conf/solrconfig.xml index 059e58f447c2..0b563dc569de 100644 --- a/solr/modules/sql/src/test-files/solr/configsets/sql/conf/solrconfig.xml +++ b/solr/modules/sql/src/test-files/solr/configsets/sql/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -45,4 +45,3 @@ - diff --git a/solr/packaging/test/analysis_extras_config/conf/solrconfig.xml b/solr/packaging/test/analysis_extras_config/conf/solrconfig.xml index 19de28ee1a67..634ae9fd8795 100644 --- a/solr/packaging/test/analysis_extras_config/conf/solrconfig.xml +++ b/solr/packaging/test/analysis_extras_config/conf/solrconfig.xml @@ -24,5 +24,5 @@ single - + diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml index dbb1924c44b8..59e6018d4aae 100644 --- a/solr/server/solr/configsets/_default/conf/solrconfig.xml +++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml @@ -61,7 +61,7 @@ solr.RAMDirectoryFactory is memory based and not persistent. --> + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> - - + + diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml index 78fb661213d6..09f307acb364 100644 --- a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml +++ b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml @@ -26,7 +26,7 @@ ${useCompoundFile:false} ${solr.data.dir:} - + diff --git a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml index 5a202baa2b89..5fc48d7d7143 100644 --- a/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml +++ b/solr/solrj-streaming/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml @@ -40,15 +40,15 @@ --> - - - - + + + + - - - - + + + + @@ -115,8 +115,8 @@ - - + + - - - - + + - - - - + + + + - - + + - - - - + + + + - - - - + + + + @@ -94,8 +94,8 @@ - - + + - - + + diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml index 78fb661213d6..09f307acb364 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml @@ -26,7 +26,7 @@ ${useCompoundFile:false} ${solr.data.dir:} - + diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml index f12c5e09038c..c6ba2646a51a 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/schema.xml @@ -42,7 +42,7 @@ - + @@ -54,4 +54,3 @@ id - diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml index fb89854b08c5..b2b6e51ea8ac 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml @@ -26,7 +26,7 @@ ${useCompoundFile:false} ${tempDir}/data/${l10n:}-${version:} - + diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/schema.xml index 7519343d4464..c18affaca04f 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/schema.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/schema.xml @@ -21,7 +21,7 @@ --> - + diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml index 45c8613c1ae3..ca2d04da0966 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml @@ -33,7 +33,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> @@ -54,4 +54,3 @@ - diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml index 5a202baa2b89..5fc48d7d7143 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/schema.xml @@ -40,15 +40,15 @@ --> - - - - + + + + - - - - + + + + @@ -115,8 +115,8 @@ - - + + - - + + diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/tracking-updates/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/tracking-updates/conf/solrconfig.xml index d6df57ba1348..288055312072 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/tracking-updates/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/tracking-updates/conf/solrconfig.xml @@ -36,7 +36,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -60,4 +60,3 @@ - diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml index 8dddc57a24e5..f882aa3f0bf2 100644 --- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml +++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/schema.xml @@ -19,7 +19,7 @@ - + @@ -30,4 +30,3 @@ id - diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml index 15b73df7a871..c16f0d9ba731 100644 --- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml @@ -25,7 +25,7 @@ - + ${solr.core0.data.dir:} diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml index 079a2683edb2..ef8b227d83d3 100644 --- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml +++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/schema.xml @@ -19,7 +19,7 @@ - + @@ -31,4 +31,3 @@ id - diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml index 53dab46b7c95..cd8fb44dbe59 100644 --- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml @@ -25,7 +25,7 @@ - + ${solr.core1.data.dir:} diff --git a/solr/solrj/src/test-files/solrj/solr/solr-metrics-enabled.xml b/solr/solrj/src/test-files/solrj/solr/solr-metrics-enabled.xml index e2e4fc7c10d3..07d8307c51df 100644 --- a/solr/solrj/src/test-files/solrj/solr/solr-metrics-enabled.xml +++ b/solr/solrj/src/test-files/solrj/solr/solr-metrics-enabled.xml @@ -27,7 +27,7 @@ ${shareSchema:false} ${configSetBaseDir:configsets} ${coreRootDirectory:.} - ${solr.tests.security.allow.urls:} + ${tests.solr.security.allow.urls:} ${socketTimeout:90000} diff --git a/solr/solrj/src/test-files/solrj/solr/solr.xml b/solr/solrj/src/test-files/solrj/solr/solr.xml index f9ec9e5ec968..e80a03f4076c 100644 --- a/solr/solrj/src/test-files/solrj/solr/solr.xml +++ b/solr/solrj/src/test-files/solrj/solr/solr.xml @@ -25,7 +25,7 @@ ${shareSchema:false} ${configSetBaseDir:configsets} ${coreRootDirectory:.} - ${solr.tests.security.allow.urls:} + ${tests.solr.security.allow.urls:} ${socketTimeout:90000} diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java index bbf63842d62e..6a81e18f58f6 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java @@ -58,7 +58,7 @@ protected void setupCoreContainer() { @Override public void setUp() throws Exception { - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); super.setUp(); Path dataDir1 = createTempDir(); // setup datadirs diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LB2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LB2SolrClientTest.java index 5fca5e8f7898..db17ccb88e29 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LB2SolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LB2SolrClientTest.java @@ -65,7 +65,8 @@ public class LB2SolrClientTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() { - System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory"); + System.setProperty( + "tests.solr.directory.factory", "org.apache.solr.core.MockFSDirectoryFactory"); System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong())); } diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java index 6d5cb25ad482..69385492bcb4 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java @@ -97,7 +97,7 @@ public void init() throws Exception { Path tmpSolrHome = createTempDir(); PathUtils.copyDirectory(getFile("solrj/solr/collection1").getParent(), tmpSolrHome); - System.setProperty("managed.schema.mutable", "true"); + System.setProperty("tests.solr.schema.managed.mutable", "true"); System.setProperty("solr.index.updatelog.enabled", "false"); createJettyAndHarness(tmpSolrHome, "solrconfig-managed-schema.xml", "schema.xml"); diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java index be382bcbbb72..e0a9ae166f52 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java @@ -450,7 +450,7 @@ public void start() throws Exception { } // silly stuff included from solrconfig.snippet.randomindexconfig.xml - System.setProperty("solr.tests.maxBufferedDocs", String.valueOf(100000)); + System.setProperty("tests.solr.maxBufferedDocs", String.valueOf(100000)); // If we want to run with allowlist, this must be explicitly set to true for the test // otherwise we disable the check diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index e77fa41fcade..b3045e2a4b4b 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -160,9 +160,9 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase { protected static final String CORE_PROPERTIES_FILENAME = "core.properties"; public static final String SYSTEM_PROPERTY_SOLR_TESTS_MERGEPOLICYFACTORY = - "solr.tests.mergePolicyFactory"; + "tests.solr.mergePolicyFactory"; - public static final String TEST_URL_ALLOW_LIST = "solr.tests.security.allow.urls"; + public static final String TEST_URL_ALLOW_LIST = "tests.solr.security.allow.urls"; protected static String coreName = DEFAULT_TEST_CORENAME; public static int DEFAULT_CONNECTION_TIMEOUT = 60000; // default socket connection timeout in ms @@ -372,7 +372,7 @@ protected static boolean isSSLMode() { public static void useFactory(String factory) throws Exception { // allow calling more than once so a subclass can override a base class if (!changedFactory) { - savedFactory = System.getProperty("solr.DirectoryFactory"); + savedFactory = System.getProperty("tests.solr.directory.factory"); } if (factory == null) { @@ -381,7 +381,7 @@ public static void useFactory(String factory) throws Exception { ? "solr.NRTCachingDirectoryFactory" : "solr.StandardDirectoryFactory"; // test the default most of the time } - System.setProperty("solr.directoryFactory", factory); + System.setProperty("tests.solr.directory.factory", factory); changedFactory = true; } @@ -389,7 +389,7 @@ public static void resetFactory() { if (!changedFactory) return; changedFactory = false; if (savedFactory != null) { - System.setProperty("solr.directoryFactory", savedFactory); + System.setProperty("tests.solr.directory.factory", savedFactory); savedFactory = null; } } @@ -458,17 +458,17 @@ public static void newRandomConfig() { System.setProperty("useCompoundFile", String.valueOf(iwc.getUseCompoundFile())); - System.setProperty("solr.tests.maxBufferedDocs", String.valueOf(iwc.getMaxBufferedDocs())); + System.setProperty("tests.solr.maxBufferedDocs", String.valueOf(iwc.getMaxBufferedDocs())); System.setProperty( - "solr.tests.ramPerThreadHardLimitMB", String.valueOf(iwc.getRAMPerThreadHardLimitMB())); - System.setProperty("solr.tests.ramBufferSizeMB", String.valueOf(iwc.getRAMBufferSizeMB())); + "tests.solr.ramPerThreadHardLimitMB", String.valueOf(iwc.getRAMPerThreadHardLimitMB())); + System.setProperty("tests.solr.ramBufferSizeMB", String.valueOf(iwc.getRAMBufferSizeMB())); String mergeSchedulerClass = iwc.getMergeScheduler().getClass().getName(); if (mergeSchedulerClass.contains("$")) { // anonymous subclass - we can't instantiate via the resource loader, so use CMS instead mergeSchedulerClass = "org.apache.lucene.index.ConcurrentMergeScheduler"; } - System.setProperty("solr.tests.mergeScheduler", mergeSchedulerClass); + System.setProperty("tests.solr.mergeScheduler", mergeSchedulerClass); randomizeNumericTypesProperties(); } @@ -2681,7 +2681,7 @@ protected static T pickRandom(T... options) { * * @see #NUMERIC_POINTS_SYSPROP */ - public static final String USE_NUMERIC_POINTS_SYSPROP = "solr.tests.use.numeric.points"; + public static final String USE_NUMERIC_POINTS_SYSPROP = "tests.solr.use.numeric.points"; /** * The name of a sysprop that will either true or false indicating if @@ -2691,7 +2691,7 @@ protected static T pickRandom(T... options) { * * @see #randomizeNumericTypesProperties */ - public static final String NUMERIC_POINTS_SYSPROP = "solr.tests.numeric.points"; + public static final String NUMERIC_POINTS_SYSPROP = "tests.solr.numeric.points"; /** * The name of a sysprop that will be either true or false indicating if @@ -2703,9 +2703,9 @@ protected static T pickRandom(T... options) { * * @see #randomizeNumericTypesProperties */ - public static final String NUMERIC_DOCVALUES_SYSPROP = "solr.tests.numeric.dv"; + public static final String NUMERIC_DOCVALUES_SYSPROP = "tests.solr.numeric.dv.enabled"; - public static final String UPDATELOG_SYSPROP = "solr.tests.ulog"; + public static final String UPDATELOG_SYSPROP = "tests.solr.ulog"; /** * Sets various sys props related to user specified or randomized choices regarding the types of @@ -2759,7 +2759,7 @@ private static void randomizeNumericTypesProperties() { } for (Map.Entry, String> entry : RANDOMIZED_NUMERIC_FIELDTYPES.entrySet()) { System.setProperty( - "solr.tests." + entry.getKey().getSimpleName() + "FieldType", entry.getValue()); + "tests.solr." + entry.getKey().getSimpleName() + "FieldType", entry.getValue()); } } diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java index b1f56c274380..8b579f0e4403 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java @@ -74,12 +74,12 @@ public class ChaosMonkey { private Map> shardToJetty; private static final Boolean MONKEY_ENABLED = - Boolean.valueOf(System.getProperty("solr.tests.cloud.cm.enabled", "true")); + Boolean.valueOf(System.getProperty("tests.solr.cloud.cm.enabled", "true")); // NOTE: CONN_LOSS and EXP are currently being set to "false" intentionally here. Remove the // default value once we know tests pass reliably under those conditions private static final String CONN_LOSS = - System.getProperty("solr.tests.cloud.cm.connloss.enabled", "false"); - private static final String EXP = System.getProperty("solr.tests.cloud.cm.exp", "false"); + System.getProperty("tests.solr.cloud.cm.connloss.enabled", "false"); + private static final String EXP = System.getProperty("tests.solr.cloud.cm.exp.enabled", "false"); private ZkTestServer zkServer; private ZkStateReader zkStateReader; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java b/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java index 4011e4f74dbf..419205ad3642 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java @@ -28,7 +28,7 @@ public class IpTables { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - private static final boolean ENABLED = Boolean.getBoolean("solr.tests.use.iptables"); + private static final boolean ENABLED = Boolean.getBoolean("tests.solr.use.iptables.enabled"); private static final Set BLOCK_PORTS = Collections.synchronizedSet(new HashSet()); diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java index 932b8116c57d..b93d41649a93 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractIncrementalBackupTest.java @@ -103,7 +103,7 @@ public abstract class AbstractIncrementalBackupTest extends SolrCloudTestCase { @BeforeClass public static void createCluster() throws Exception { docsSeed = random().nextLong(); - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); } @Before diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java index 86d12f4a7bdf..d49a3c016e51 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractInstallShardTest.java @@ -80,7 +80,7 @@ public abstract class AbstractInstallShardTest extends SolrCloudTestCase { @BeforeClass public static void seedDocGenerator() { docsSeed = random().nextLong(); - System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory"); + System.setProperty("tests.solr.directory.factory", "solr.StandardDirectoryFactory"); } @Before diff --git a/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java b/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java index ba5a82112d40..0e99987a30e3 100644 --- a/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java @@ -30,9 +30,9 @@ public class MockDirectoryFactory extends EphemeralDirectoryFactory { public static final String SOLR_TESTS_ALLOW_READING_FILES_STILL_OPEN_FOR_WRITE = - "solr.tests.allow_reading_files_still_open_for_write"; + "tests.solr.allow_reading_files_still_open_for_write"; public static final String SOLR_TESTS_USING_MOCK_DIRECTORY_WRAPPER = - "solr.tests.using_mock_directory_wrapper"; + "tests.solr.using_mock_directory_wrapper"; private boolean allowReadingFilesStillOpenForWrite = Boolean.getBoolean(SOLR_TESTS_ALLOW_READING_FILES_STILL_OPEN_FOR_WRITE); private boolean useMockDirectoryWrapper = diff --git a/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml b/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml index 02a57b654454..b601feaa55a8 100644 --- a/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml +++ b/solr/test-framework/src/test-files/solr/collection1/conf/schema.xml @@ -33,16 +33,16 @@ behavior of the fieldType. --> - - - - + + + + - - - - + + + + @@ -112,9 +112,9 @@ - - - + + + - + diff --git a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml index 4884c5905e54..9bb56dc035ea 100644 --- a/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml +++ b/solr/test-framework/src/test-files/solr/collection1/conf/solrconfig.xml @@ -38,7 +38,7 @@ - + diff --git a/solr/test-framework/src/test-files/solr/configsets/minimal/conf/solrconfig.xml b/solr/test-framework/src/test-files/solr/configsets/minimal/conf/solrconfig.xml index 346b0448318c..b02bbc58a7fe 100644 --- a/solr/test-framework/src/test-files/solr/configsets/minimal/conf/solrconfig.xml +++ b/solr/test-framework/src/test-files/solr/configsets/minimal/conf/solrconfig.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} + class="${tests.solr.directory.factory:solr.NRTCachingDirectoryFactory}"/> ${tests.luceneMatchVersion:LATEST} @@ -44,4 +44,3 @@ - diff --git a/solr/webapp/src/test/org/apache/solr/webapp/AdminUiReplicationStandaloneTest.java b/solr/webapp/src/test/org/apache/solr/webapp/AdminUiReplicationStandaloneTest.java index 3434feebb0e0..186926e6efdd 100644 --- a/solr/webapp/src/test/org/apache/solr/webapp/AdminUiReplicationStandaloneTest.java +++ b/solr/webapp/src/test/org/apache/solr/webapp/AdminUiReplicationStandaloneTest.java @@ -47,7 +47,7 @@ public class AdminUiReplicationStandaloneTest extends AdminUiStandaloneTestBase @BeforeClass public static void startLeaderAndFollower() throws Exception { - // sets the solr.tests.* index-config properties the test solrconfigs require + // sets the tests.solr.* index-config properties the test solrconfigs require newRandomConfig(); // the follower's leaderUrl is not covered by the URL allow-list System.setProperty(AllowListUrlChecker.ENABLE_URL_ALLOW_LIST, "false");