You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2017/12/13 09:39:30 UTC
svn commit: r1817990 -
/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
Author: tommaso
Date: Wed Dec 13 09:39:30 2017
New Revision: 1817990
URL: http://svn.apache.org/viewvc?rev=1817990&view=rev
Log:
OAK-4318 - TestUtils path resolution via URI
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java?rev=1817990&r1=1817989&r2=1817990&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java Wed Dec 13 09:39:30 2017
@@ -16,11 +16,10 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr;
-import java.io.File;
-import java.io.IOException;
-
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import java.io.File;
+import java.io.IOException;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
@@ -29,7 +28,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.SolrServer;
import static org.junit.Assert.assertTrue;
@@ -42,10 +40,12 @@ public class TestUtils
static final String SOLR_HOME_PATH = "/solr";
public static SolrClient createSolrServer() {
- EmbeddedSolrServerConfiguration configuration = new EmbeddedSolrServerConfiguration(
- TestUtils.class.getResource(SOLR_HOME_PATH).getFile(), "oak");
- EmbeddedSolrServerProvider provider = new EmbeddedSolrServerProvider(configuration);
try {
+ File file = new File(TestUtils.class.getResource(SOLR_HOME_PATH).toURI());
+ EmbeddedSolrServerConfiguration configuration = new EmbeddedSolrServerConfiguration(
+ file.getAbsolutePath(), "oak");
+ EmbeddedSolrServerProvider provider = new EmbeddedSolrServerProvider(configuration);
+
return provider.getSolrServer();
} catch (Exception e) {
throw new RuntimeException(e);