SolrClientTestRule usage conformance (#4217)

* startSolr don't specify temp dir
* newCollection don't specify collection1
* getSolrClient don't specify collection1
* withConfigSet use Path if possible

org.apache.solr.SolrTestCaseJ4.getFile should return an absolute file to reduce ambiguity

Author: dsmiley

solr/core/src/test/org/apache/solr/TestTolerantSearch.java

@@ -70,8 +70,7 @@ private static Path createSolrHome() throws Exception {
   @BeforeClass
   public static void createThings() throws Exception {
     systemSetPropertyEnableUrlAllowList(false);
-    Path solrHome = createSolrHome();
-    solrTestRule.startSolr(solrHome);
+    solrTestRule.startSolr(createSolrHome());
 
     collection1 = solrTestRule.getSolrClient("collection1");
 

solr/core/src/test/org/apache/solr/handler/TestHttpRequestId.java

@@ -48,7 +48,7 @@ public class TestHttpRequestId extends SolrTestCaseJ4 {
 
   @BeforeClass
   public static void beforeTest() throws Exception {
-    solrTestRule.startSolr(createTempDir());
+    solrTestRule.startSolr();
   }
 
   @Test

solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java

@@ -54,11 +54,8 @@ public class ShowFileRequestHandlerTest extends SolrTestCaseJ4 {
   public static void beforeTest() throws Exception {
     EnvUtils.setProperty(
         ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
-    solrTestRule.startSolr(createTempDir());
-    solrTestRule
-        .newCollection("collection1")
-        .withConfigSet(ExternalPaths.DEFAULT_CONFIGSET)
-        .create();
+    solrTestRule.startSolr();
+    solrTestRule.newCollection().withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
   }
 
   private GenericSolrRequest createShowFileRequest(SolrParams params) {

solr/core/src/test/org/apache/solr/handler/admin/api/RenameCoreAPITest.java

@@ -50,11 +50,8 @@ public class RenameCoreAPITest extends SolrTestCaseJ4 {
   public static void beforeTest() throws Exception {
     EnvUtils.setProperty(
         ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
-    solrTestRule.startSolr(createTempDir());
-    solrTestRule
-        .newCollection(DEFAULT_TEST_CORENAME)
-        .withConfigSet(ExternalPaths.DEFAULT_CONFIGSET)
-        .create();
+    solrTestRule.startSolr();
+    solrTestRule.newCollection().withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
   }
 
   @Test

solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java

@@ -59,7 +59,7 @@ public static void createThings() throws Exception {
     systemSetPropertyEnableUrlAllowList(false);
     EnvUtils.setProperty(
         ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
-    solrTestRule.startSolr(createTempDir());
+    solrTestRule.startSolr();
 
     solrTestRule
         .newCollection("collection1")

solr/core/src/test/org/apache/solr/metrics/JvmMetricsTest.java

@@ -54,7 +54,7 @@ public class JvmMetricsTest extends SolrTestCaseJ4 {
   @BeforeClass
   public static void beforeTest() throws Exception {
     System.setProperty("solr.metrics.jvm.enabled", "true");
-    solrTestRule.startSolr(createTempDir());
+    solrTestRule.startSolr();
   }
 
   @Test

solr/core/src/test/org/apache/solr/response/TestErrorResponseStackTrace.java

@@ -24,7 +24,6 @@
 import org.apache.commons.codec.CharEncoding;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.RemoteSolrException;
@@ -67,7 +66,7 @@ public static void setupSolrHome() throws Exception {
                     + "  </requestHandler>\n"
                     + "</config>"));
 
-    solrTestRule.startSolr(LuceneTestCase.createTempDir());
+    solrTestRule.startSolr();
     solrTestRule.newCollection().withConfigSet(configSet).create();
   }
 

solr/core/src/test/org/apache/solr/response/TestPrometheusResponseWriter.java

@@ -26,7 +26,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.request.MetricsRequest;
@@ -51,7 +50,7 @@ public class TestPrometheusResponseWriter extends SolrTestCaseJ4 {
   public static void beforeClass() throws Exception {
     EnvUtils.setProperty(
         ALLOW_PATHS_SYSPROP, ExternalPaths.SERVER_HOME.toAbsolutePath().toString());
-    solrTestRule.startSolr(LuceneTestCase.createTempDir());
+    solrTestRule.startSolr();
     solrTestRule.newCollection("core1").withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
     solrTestRule.newCollection("core2").withConfigSet(ExternalPaths.DEFAULT_CONFIGSET).create();
 

solr/core/src/test/org/apache/solr/search/TestDocValuesIteratorCache.java

@@ -50,7 +50,7 @@ protected void before() throws Throwable {
           // existence of multiple segments; if the merge policy happens to combine into a single
           // segment, no OrdinalMap will be built, throwing off our tests
           systemSetPropertySolrTestsMergePolicyFactory(NoMergePolicyFactory.class.getName());
-          startSolr(LuceneTestCase.createTempDir());
+          startSolr();
         }
       };
 

solr/core/src/test/org/apache/solr/search/json/TestJsonRequestWithEdismaxDefType.java

@@ -32,7 +32,7 @@ public class TestJsonRequestWithEdismaxDefType extends SolrTestCaseJ4 {
   @ClassRule public static final SolrClientTestRule solrTestRule = new EmbeddedSolrServerTestRule();
 
   public void test() throws Exception {
-    solrTestRule.startSolr(LuceneTestCase.createTempDir());
+    solrTestRule.startSolr();
 
     Path configSet = LuceneTestCase.createTempDir();
     SolrTestCaseJ4.copyMinConf(configSet);