You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/05/18 00:15:57 UTC
svn commit: r1595551 -
/lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
Author: rjernst
Date: Sat May 17 22:15:57 2014
New Revision: 1595551
URL: http://svn.apache.org/r1595551
Log:
LUCENE-5650: fix one more solr test
Modified:
lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
Modified: lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/core/TestConfigSets.java?rev=1595551&r1=1595550&r2=1595551&view=diff
==============================================================================
--- lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/core/TestConfigSets.java (original)
+++ lucene/dev/branches/lucene5650/solr/core/src/test/org/apache/solr/core/TestConfigSets.java Sat May 17 22:15:57 2014
@@ -56,17 +56,19 @@ public class TestConfigSets extends Solr
@Test
public void testConfigSetServiceFindsConfigSets() {
CoreContainer container = null;
+ SolrCore core1 = null;
try {
container = setupContainer(getFile("solr/configsets").getAbsolutePath());
- String testDirectory = container.getResourceLoader().getInstanceDir();
+ String testDirectory = new File(container.getResourceLoader().getInstanceDir()).getAbsolutePath();
- SolrCore core1 = container.create("core1", testDirectory + "/core1", "configSet", "configset-2");
+ core1 = container.create("core1", testDirectory + "core1", "configSet", "configset-2");
assertThat(core1.getCoreDescriptor().getName(), is("core1"));
- assertThat(core1.getDataDir(), is(testDirectory + "/core1" + File.separator + "data" + File.separator));
- core1.close();
-
+ assertThat(core1.getDataDir(), is(testDirectory + "core1" + File.separator + "data" + File.separator));
}
finally {
+ if (core1 != null) {
+ core1.close();
+ }
if (container != null)
container.shutdown();
}