Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

This actually works!

[email protected]3cbd85640046
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
index 538255b664a..15542963ed1 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
@@ -16,21 +16,35 @@
*/
package org.apache.solr.client.solrj;
+import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.client.solrj.request.RequestWriter;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.BeforeClass;
+import java.io.File;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
/**
* A subclass of SolrExampleTests that explicitly uses the xml codec for
* communication.
*/
@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
public class SolrExampleXMLTest extends SolrExampleTests {
+
@BeforeClass
public static void beforeTest() throws Exception {
- createAndStartJetty(legacyExampleCollection1SolrHome());
+ File tmpSolrHome = createTempDir().toFile();
+ FileUtils.copyDirectory(new File(getFile("solrj/solr/testproducts/conf").getParent()), new File(tmpSolrHome.getAbsoluteFile(), "collection1"));
+
+ FileUtils.copyFile(getFile("solrj/solr/solr.xml"), new File(tmpSolrHome.getAbsoluteFile(), "solr.xml"));
+
+ final SortedMap<ServletHolder, String> extraServlets = new TreeMap<>();
+
+ createAndStartJetty(tmpSolrHome.getAbsolutePath(), "solrconfig.xml", "managed-schema", "/solr", true, extraServlets);
}
@Override