Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-9575 Fix remaining tests

Jan Høydahl74a1febf58b1
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
index 55fcab8acab..8507ea2597e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java
@@ -140,8 +140,20 @@ public class SolrXmlInZkTest extends SolrTestCaseJ4 {
}
@Test
- public void testNotInZkOrOnDisk() throws Exception {
+ public void testNotInZkOrOnDiskFallbackDefault() throws Exception {
try {
+ setUpZkAndDiskXml(false, false);
+ assertEquals("Should have gotten the default port",
+ cfg.getCloudConfig().getSolrHostPort(), 8983);
+ } finally {
+ closeZK();
+ }
+ }
+
+ @Test
+ public void testNotInZkOrOnDiskWhenRequired() throws Exception {
+ try {
+ System.setProperty("solr.solrxml.required", "true");
SolrException e = expectThrows(SolrException.class, () -> {
System.setProperty("hostPort", "8787");
setUpZkAndDiskXml(false, false); // solr.xml not on disk either
@@ -150,6 +162,7 @@ public class SolrXmlInZkTest extends SolrTestCaseJ4 {
e.getMessage().contains("solr.xml does not exist"));
} finally {
closeZK();
+ System.clearProperty("solr.solrxml.required");
}
}
diff --git a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
index 467ebb89943..133927fb2f1 100644
--- a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
+++ b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
@@ -111,7 +111,7 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
FileUtils.copyFile(new File(top, "solrconfig.snippet.randomindexconfig.xml"), new File(confDir, "solrconfig.snippet.randomindexconfig.xml"));
}
- private CoreContainer init() throws Exception {
+ private CoreContainer init() {
final CoreContainer container = new CoreContainer(solrHomeDirectory, new Properties());
try {
container.load();
@@ -122,9 +122,9 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
long status = container.getStatus();
- assertTrue("Load complete flag should be set",
+ assertTrue("Load complete flag should be set",
(status & LOAD_COMPLETE) == LOAD_COMPLETE);
- assertTrue("Core discovery should be complete",
+ assertTrue("Core discovery should be complete",
(status & CORE_DISCOVERY_COMPLETE) == CORE_DISCOVERY_COMPLETE);
assertTrue("Initial core loading should be complete",
(status & INITIAL_CORE_LOAD_COMPLETE) == INITIAL_CORE_LOAD_COMPLETE);
@@ -324,9 +324,7 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
c5.close();
c6.close();
} finally {
- if (cc != null) {
- cc.shutdown();
- }
+ cc.shutdown();
}
}
@@ -503,7 +501,7 @@ public class TestCoreDiscovery extends SolrTestCaseJ4 {
cc = init();
} catch (SolrException ex) {
assertTrue("Core init doesn't report if solr home directory doesn't exist " + ex.getMessage(),
- 0 <= ex.getMessage().indexOf("solr.xml does not exist"));
+ ex.getMessage().contains("Error reading core root directory"));
} finally {
if (cc != null) {
cc.shutdown();