Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Remove extra solr.xml and other config setup for tests that are not needed (#3988)

Eric Pugh1245fa81a772
diff --git a/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java b/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
index f565649adf7..e7213bc3de5 100644
--- a/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
+++ b/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java
@@ -47,8 +47,6 @@ public class SolrTestCaseJ4Test extends SolrTestCaseJ4 {
PathUtils.touch(tmpSolrHome.resolve("core0/core.properties"));
PathUtils.touch(tmpSolrHome.resolve("core1/core.properties"));
- Files.copy(getFile("solr/solr.xml"), tmpSolrHome.resolve("solr.xml"));
-
initCore("solrconfig-minimal.xml", "schema-tiny.xml", tmpSolrHome, "core1");
}
diff --git a/solr/core/src/test/org/apache/solr/TestCustomCoreProperties.java b/solr/core/src/test/org/apache/solr/TestCustomCoreProperties.java
index 488c00ea753..7e5deebad86 100644
--- a/solr/core/src/test/org/apache/solr/TestCustomCoreProperties.java
+++ b/solr/core/src/test/org/apache/solr/TestCustomCoreProperties.java
@@ -49,12 +49,11 @@ public class TestCustomCoreProperties extends SolrTestCaseJ4 {
Files.createDirectories(confDir);
- String src_dir = TEST_HOME() + "/collection1/conf";
- Files.copy(Path.of(src_dir, "schema-tiny.xml"), confDir.resolve("schema.xml"));
+ String srcDir = TEST_HOME() + "/collection1/conf";
+ Files.copy(Path.of(srcDir, "schema-tiny.xml"), confDir.resolve("schema.xml"));
+ Files.copy(Path.of(srcDir, "solrconfig-coreproperties.xml"), confDir.resolve("solrconfig.xml"));
Files.copy(
- Path.of(src_dir, "solrconfig-coreproperties.xml"), confDir.resolve("solrconfig.xml"));
- Files.copy(
- Path.of(src_dir, "solrconfig.snippet.randomindexconfig.xml"),
+ Path.of(srcDir, "solrconfig.snippet.randomindexconfig.xml"),
confDir.resolve("solrconfig.snippet.randomindexconfig.xml"));
Properties p = new Properties();
@@ -72,13 +71,7 @@ public class TestCustomCoreProperties extends SolrTestCaseJ4 {
coreProperties.store(fos, null);
}
- Properties nodeProperties = new Properties();
- // this sets the property for jetty starting SolrDispatchFilter
- if (System.getProperty("solr.data.dir") == null) {
- nodeProperties.setProperty("solr.data.dir", createTempDir().toRealPath().toString());
- }
-
- solrTestRule.startSolr(homeDir, nodeProperties, JettyConfig.builder().build());
+ solrTestRule.startSolr(homeDir, new Properties(), JettyConfig.builder().build());
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
index 87e8c336920..661b27d912a 100644
--- a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
+++ b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java
@@ -68,7 +68,6 @@ public class TestLazyCores extends SolrTestCaseJ4 {
private CoreContainer init() throws Exception {
solrHomeDirectory = createTempDir();
- copyXmlToHome(solrHomeDirectory, "solr.xml");
for (int idx = 1; idx < 10; ++idx) {
copyMinConf(solrHomeDirectory.resolve("collection" + idx));
}
diff --git a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
index a5eace8426d..3051c06802c 100644
--- a/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
+++ b/solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java
@@ -27,7 +27,6 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@@ -62,14 +61,9 @@ public final class ReplicationTestHelper {
+ FileSystems.getDefault().getSeparator();
public static JettySolrRunner createAndStartJetty(SolrInstance instance) throws Exception {
- Files.copy(
- SolrTestCaseJ4.TEST_HOME().resolve("solr.xml"),
- Path.of(instance.getHomeDir(), "solr.xml"),
- StandardCopyOption.REPLACE_EXISTING);
- Properties nodeProperties = new Properties();
- nodeProperties.setProperty("solr.data.dir", instance.getDataDir());
JettyConfig jettyConfig = JettyConfig.builder().setPort(0).build();
- JettySolrRunner jetty = new JettySolrRunner(instance.getHomeDir(), nodeProperties, jettyConfig);
+ JettySolrRunner jetty =
+ new JettySolrRunner(instance.getHomeDir(), new Properties(), jettyConfig);
jetty.start();
return jetty;
}
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
index c91d1eadb33..c325a0ffebf 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java
@@ -67,12 +67,9 @@ public class TestReplicationHandlerBackup extends SolrTestCaseJ4 {
private static JettySolrRunner createAndStartJetty(ReplicationTestHelper.SolrInstance instance)
throws Exception {
- Files.copy(
- SolrTestCaseJ4.TEST_HOME().resolve("solr.xml"), Path.of(instance.getHomeDir(), "solr.xml"));
- Properties nodeProperties = new Properties();
- nodeProperties.setProperty("solr.data.dir", instance.getDataDir());
JettyConfig jettyConfig = JettyConfig.builder().setPort(0).build();
- JettySolrRunner jetty = new JettySolrRunner(instance.getHomeDir(), nodeProperties, jettyConfig);
+ JettySolrRunner jetty =
+ new JettySolrRunner(instance.getHomeDir(), new Properties(), jettyConfig);
jetty.start();
return jetty;
}
diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
index 055b8423f5a..9c0d8a3abbb 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
@@ -68,6 +68,8 @@ public class TestReplicationHandlerDiskOverFlow extends SolrTestCaseJ4 {
originalTestWait = IndexFetcher.testWait;
super.setUp();
+ // Disable URL allow-list checks for replication tests
+ System.setProperty("solr.security.allow.urls.enabled", "false");
System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
String factory =
random().nextInt(100) < 75
@@ -114,6 +116,7 @@ public class TestReplicationHandlerDiskOverFlow extends SolrTestCaseJ4 {
followerClient = null;
}
System.clearProperty(TEST_URL_ALLOW_LIST);
+ System.clearProperty("solr.security.allow.urls.enabled");
IndexFetcher.usableDiskSpaceProvider = originalDiskSpaceprovider;
IndexFetcher.testWait = originalTestWait;
diff --git a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
index fbcac1a5bc7..deaaddfac89 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java
@@ -52,12 +52,9 @@ public class TestRestoreCore extends SolrTestCaseJ4 {
private static JettySolrRunner createAndStartJetty(ReplicationTestHelper.SolrInstance instance)
throws Exception {
- Files.copy(
- SolrTestCaseJ4.TEST_HOME().resolve("solr.xml"), Path.of(instance.getHomeDir(), "solr.xml"));
- Properties nodeProperties = new Properties();
- nodeProperties.setProperty("solr.data.dir", instance.getDataDir());
JettyConfig jettyConfig = JettyConfig.builder().setPort(0).build();
- JettySolrRunner jetty = new JettySolrRunner(instance.getHomeDir(), nodeProperties, jettyConfig);
+ JettySolrRunner jetty =
+ new JettySolrRunner(instance.getHomeDir(), new Properties(), jettyConfig);
jetty.start();
return jetty;
}
@@ -179,7 +176,7 @@ public class TestRestoreCore extends SolrTestCaseJ4 {
}
}
- public void testBackupFailsMissingAllowPaths() throws Exception {
+ public void testBackupFailsMissingAllowPaths() {
final String params =
"&location=" + URLEncoder.encode(createTempDir().toString(), StandardCharsets.UTF_8);
Throwable t =
diff --git a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
index 43163e10218..aa76092cf5d 100644
--- a/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/V2StandaloneTest.java
@@ -17,7 +17,6 @@
package org.apache.solr.handler;
-import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.commons.io.file.PathUtils;
import org.apache.solr.SolrTestCaseJ4;
@@ -35,7 +34,6 @@ public class V2StandaloneTest extends SolrTestCaseJ4 {
Path solrHomeTmp = createTempDir();
PathUtils.copyDirectory(
TEST_HOME().resolve("configsets/minimal/conf"), solrHomeTmp.resolve("conf"));
- Files.copy(TEST_HOME().resolve("solr.xml"), solrHomeTmp.resolve("solr.xml"));
JettySolrRunner jetty =
new JettySolrRunner(solrHomeTmp.toString(), JettyConfig.builder().build());
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
index 75b4de3ffd4..5384f9e88e5 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
@@ -64,8 +64,6 @@ public class DistributedDebugComponentTest extends SolrTestCaseJ4 {
.newCollection("collection2")
.withConfigSet(ExternalPaths.TECHPRODUCTS_CONFIGSET)
.create();
- var cc = solrTestRule.getCoreContainer();
- cc.waitForLoadingCoresToFinish(30000);
String urlCollection1 = solrTestRule.getBaseUrl() + "/" + "collection1";
String urlCollection2 = solrTestRule.getBaseUrl() + "/" + "collection2";
diff --git a/solr/core/src/test/org/apache/solr/jersey/JerseyApplicationSharingTest.java b/solr/core/src/test/org/apache/solr/jersey/JerseyApplicationSharingTest.java
index df21c0cef8b..6410623de92 100644
--- a/solr/core/src/test/org/apache/solr/jersey/JerseyApplicationSharingTest.java
+++ b/solr/core/src/test/org/apache/solr/jersey/JerseyApplicationSharingTest.java
@@ -33,9 +33,6 @@ import org.junit.Test;
*/
public class JerseyApplicationSharingTest extends SolrCloudTestCase {
- private static final String collection = "collection1";
- private static final String confDir = collection + "/conf";
-
@BeforeClass
public static void setupCluster() throws Exception {
configureCluster(1)
diff --git a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
index 76738839a1a..b38706a0108 100644
--- a/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
+++ b/solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.stream.Collectors;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
@@ -51,8 +50,6 @@ public class TestPrometheusResponseWriter extends SolrTestCaseJ4 {
solrTestRule.startSolr(LuceneTestCase.createTempDir());
solrTestRule.newCollection("core1").withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
solrTestRule.newCollection("core2").withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
- var cc = solrTestRule.getCoreContainer();
- cc.waitForLoadingCoresToFinish(30000);
// Populate request metrics on both cores
ModifiableSolrParams queryParams = new ModifiableSolrParams();
@@ -88,7 +85,7 @@ public class TestPrometheusResponseWriter extends SolrTestCaseJ4 {
seenTypeInfo.add(line));
return false;
})
- .collect(Collectors.toList());
+ .toList();
filteredResponse.forEach(
(actualMetric) -> {
String actualValue;
diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
index f806032b7b4..ba58f58cc23 100644
--- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java
@@ -23,7 +23,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
import java.util.regex.Pattern;
-import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
@@ -80,7 +79,6 @@ public class TestRawTransformer extends SolrCloudTestCase {
final Path collDir = homeDir.resolve("collection1");
final Path confDir = collDir.resolve("conf");
Files.createDirectories(confDir);
- Files.copy(SolrTestCaseJ4.TEST_HOME().resolve("solr.xml"), homeDir.resolve("solr.xml"));
String src_dir = TEST_HOME() + "/collection1/conf";
Files.copy(Path.of(src_dir, "schema_latest.xml"), confDir.resolve("schema.xml"));
Files.copy(Path.of(src_dir, "solrconfig-minimal.xml"), confDir.resolve("solrconfig.xml"));
@@ -96,11 +94,9 @@ public class TestRawTransformer extends SolrCloudTestCase {
Files.copy(Path.of(src_dir, file), confDir.resolve(file));
}
Files.createFile(collDir.resolve("core.properties"));
- Properties nodeProperties = new Properties();
- nodeProperties.setProperty("solr.data.dir", h.getCore().getDataDir());
JSR =
new JettySolrRunner(
- homeDir.toAbsolutePath().toString(), nodeProperties, JettyConfig.builder().build());
+ homeDir.toAbsolutePath().toString(), new Properties(), JettyConfig.builder().build());
}
private static void initCloud() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
index f70f49991ff..0c830249ae0 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
@@ -89,7 +89,7 @@ public class TestBinaryField extends SolrTestCaseJ4 {
assertEquals(3, res.size());
assertEquals(3, beans.size());
for (SolrDocument d : res) {
- Integer id = Integer.parseInt(d.getFieldValue("id").toString());
+ int id = Integer.parseInt(d.getFieldValue("id").toString());
for (String field : new String[] {"data", "data_dv"}) {
byte[] data = (byte[]) d.getFieldValue(field);
if (id == 1) {
@@ -116,7 +116,7 @@ public class TestBinaryField extends SolrTestCaseJ4 {
}
}
for (Bean d : beans) {
- Integer id = Integer.parseInt(d.id);
+ int id = Integer.parseInt(d.id);
for (byte[] data : new byte[][] {d.data, d.data_dv}) {
if (id == 1) {
assertEquals(5, data.length);
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
index 466e3ffed78..6b290aac687 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
@@ -23,7 +23,6 @@ import static org.apache.solr.security.BasicAuthIntegrationTest.verifySecuritySt
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Base64;
import java.util.Collections;
@@ -53,9 +52,6 @@ import org.slf4j.LoggerFactory;
public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private static final Path ROOT_DIR = TEST_HOME();
- private static final Path CONF_DIR =
- ROOT_DIR.resolve("configsets").resolve("configset-2").resolve("conf");
SecurityConfHandlerLocalForTesting securityConfHandler;
SolrInstance instance = null;
@@ -198,11 +194,9 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {
}
static JettySolrRunner createAndStartJetty(SolrInstance instance) throws Exception {
- Properties nodeProperties = new Properties();
- nodeProperties.setProperty("solr.data.dir", instance.getDataDir().toString());
JettySolrRunner jetty =
new JettySolrRunner(
- instance.getHomeDir().toString(), nodeProperties, JettyConfig.builder().build());
+ instance.getHomeDir().toString(), new Properties(), JettyConfig.builder().build());
jetty.start();
return jetty;
}
@@ -211,7 +205,6 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {
String name;
Integer port;
Path homeDir;
- Path confDir;
Path dataDir;
/**
@@ -227,36 +220,13 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {
return homeDir;
}
- public Path getSchemaFile() {
- return CONF_DIR.resolve("schema.xml");
- }
-
public Path getDataDir() {
return dataDir;
}
- public Path getSolrConfigFile() {
- return CONF_DIR.resolve("solrconfig.xml");
- }
-
- public Path getSolrXmlFile() {
- return ROOT_DIR.resolve("solr.xml");
- }
-
public void setUp() throws Exception {
homeDir = createTempDir(name).toAbsolutePath();
dataDir = homeDir.resolve("collection1").resolve("data");
- confDir = homeDir.resolve("collection1").resolve("conf");
-
- Files.createDirectories(homeDir);
- Files.createDirectories(dataDir);
- Files.createDirectories(confDir);
-
- Files.copy(getSolrXmlFile(), homeDir.resolve("solr.xml"));
- Files.copy(getSolrConfigFile(), confDir.resolve("solrconfig.xml"));
- Files.copy(getSchemaFile(), confDir.resolve("schema.xml"));
-
- Files.createFile(homeDir.resolve("collection1").resolve("core.properties"));
}
}
}
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
index 2ad79dc68c0..222a17018a6 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java
@@ -278,10 +278,6 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
return homeDir.toString();
}
- public String getUrl() {
- return buildUrl(port) + "/collection1";
- }
-
public String getBaseUrl() {
return buildUrl(port);
}
@@ -294,10 +290,6 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
return "solrj/solr/collection1/conf/schema-replication1.xml";
}
- public String getConfDir() {
- return confDir.toString();
- }
-
public String getDataDir() {
return dataDir.toString();
}
@@ -306,17 +298,11 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 {
return "solrj/solr/collection1/conf/solrconfig-follower1.xml";
}
- public String getSolrXmlFile() {
- return "solrj/solr/solr.xml";
- }
-
public void setUp() throws Exception {
Files.createDirectories(homeDir);
Files.createDirectories(dataDir);
Files.createDirectories(confDir);
- Files.copy(SolrTestCaseJ4.getFile(getSolrXmlFile()), homeDir.resolve("solr.xml"));
-
Path f = confDir.resolve("solrconfig.xml");
Files.copy(SolrTestCaseJ4.getFile(getSolrConfigFile()), f);
f = confDir.resolve("schema.xml");
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 ee94a47afce..2196f69675e 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
@@ -256,10 +256,6 @@ public class LB2SolrClientTest extends SolrTestCaseJ4 {
return homeDir.toString();
}
- public String getUrl() {
- return buildUrl(port) + "/collection1";
- }
-
public String getBaseUrl() {
return buildUrl(port);
}
@@ -272,10 +268,6 @@ public class LB2SolrClientTest extends SolrTestCaseJ4 {
return "solrj/solr/collection1/conf/schema-replication1.xml";
}
- public String getConfDir() {
- return confDir.toString();
- }
-
public String getDataDir() {
return dataDir.toString();
}
@@ -284,17 +276,11 @@ public class LB2SolrClientTest extends SolrTestCaseJ4 {
return "solrj/solr/collection1/conf/solrconfig-follower1.xml";
}
- public String getSolrXmlFile() {
- return "solrj/solr/solr.xml";
- }
-
public void setUp() throws Exception {
Files.createDirectories(homeDir);
Files.createDirectories(dataDir);
Files.createDirectories(confDir);
- Files.copy(SolrTestCaseJ4.getFile(getSolrXmlFile()), homeDir.resolve("solr.xml"));
-
Path f = confDir.resolve("solrconfig.xml");
Files.copy(SolrTestCaseJ4.getFile(getSolrConfigFile()), f);
f = confDir.resolve("schema.xml");
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 fc7faa12c3e..f1c62f17ee8 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -2256,19 +2256,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
subHome.resolve("solrconfig.snippet.randomindexconfig.xml"));
}
- // Creates minimal full setup, including solr.xml
- public static void copyMinFullSetup(Path dstRoot) throws IOException {
- Files.createDirectories(dstRoot);
- Files.copy(SolrTestCaseJ4.TEST_PATH().resolve("solr.xml"), dstRoot.resolve("solr.xml"));
- copyMinConf(dstRoot);
- }
-
- // Just copies the file indicated to the tmp home directory naming it "solr.xml"
- public static void copyXmlToHome(Path dstRoot, String fromFile) throws IOException {
- Files.createDirectories(dstRoot);
- Files.copy(SolrTestCaseJ4.TEST_PATH().resolve(fromFile), dstRoot.resolve("solr.xml"));
- }
-
// Creates a consistent configuration, _including_ solr.xml at dstRoot. Creates collection1/conf
// and copies the stock files in there.
@@ -2312,7 +2299,6 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
try {
Path tempSolrHome = FilterPath.unwrap(LuceneTestCase.createTempDir());
Path serverSolr = tempSolrHome.resolve(sourceHome).resolve("server").resolve("solr");
- Files.copy(serverSolr.resolve("solr.xml"), tempSolrHome.resolve("solr.xml"));
Path sourceConfig = serverSolr.resolve("configsets").resolve("sample_techproducts_configs");
Path collection1Dir = tempSolrHome.resolve("collection1");