Apache Solr open-source search software
SOLR-16573: Fix test Windows path separator (#1347)
David Smiley704918b6ccfc
diff --git a/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java b/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.javaindex a3c9f4c9ea1..59d212f19cc 100644--- a/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java+++ b/solr/test-framework/src/java/org/apache/solr/util/SolrClientTestRule.java@@ -19,6 +19,7 @@ package org.apache.solr.util;import static org.apache.solr.SolrTestCaseJ4.DEFAULT_TEST_COLLECTION_NAME;import java.io.IOException;+import java.nio.file.FileSystems;import java.nio.file.Path;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.client.solrj.SolrClient;@@ -71,8 +72,11 @@ public abstract class SolrClientTestRule extends ExternalResource {// Without this, managed resources might be written to// conf/conf/_schema_analysis_stopwords_english.json because SolrResourceLoader points to the// wrong dir.- if (configSet != null && configSet.endsWith("/conf")) {- configSet = configSet.substring(0, configSet.length() - "/conf".length());+ if (configSet != null) {+ final var confSuffix = FileSystems.getDefault().getSeparator() + "conf";+ if (configSet.endsWith(confSuffix)) {+ configSet = configSet.substring(0, configSet.length() - confSuffix.length());+ }}this.configSet = configSet;