epugh commented on code in PR #3947:
URL: https://github.com/apache/solr/pull/3947#discussion_r2643133128
##########
solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java:
##########
@@ -49,24 +57,41 @@ public void after() {
}
}
client = null;
+ super.tearDown();
}
- @Override
- public SolrClient getSolrClient() {
+ protected SolrClient getSolrClient() {
if (client == null) {
client = createNewSolrClient();
}
return client;
}
/**
- * Create a new solr client. If createJetty was called, a http
implementation will be created,
+ * Create a new solr client. If createJetty was called, an http
implementation will be created,
* otherwise an embedded implementation will be created. Subclasses should
override for other
* options.
*/
- @Override
public SolrClient createNewSolrClient() {
- return getHttpSolrClient(getBaseUrl(), DEFAULT_TEST_CORENAME);
+ return getHttpSolrClient(solrJettyTestRule.getBaseUrl(),
DEFAULT_TEST_CORENAME);
+ }
+
+ public static HttpSolrClient getHttpSolrClient(String baseUrl, String
coreName) {
Review Comment:
i amc hecking if we duplicate methods from parent classes..
##########
solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java:
##########
@@ -21,55 +21,61 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
+import java.util.Properties;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
-import org.apache.solr.SolrJettyTestBase;
+import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.client.solrj.apache.HttpClientUtil;
+import org.apache.solr.embedded.JettyConfig;
import org.apache.solr.handler.component.ResponseBuilder;
import org.apache.solr.handler.component.SearchComponent;
-import org.junit.AfterClass;
+import org.apache.solr.util.SolrJettyTestRule;
import org.junit.BeforeClass;
+import org.junit.ClassRule;
import org.junit.Test;
-public class ResponseHeaderTest extends SolrJettyTestBase {
+public class ResponseHeaderTest extends SolrTestCaseJ4 {
+
+ @ClassRule public static SolrJettyTestRule solrJettyTestRule = new
SolrJettyTestRule();
private static Path solrHomeDirectory;
@BeforeClass
public static void beforeTest() throws Exception {
solrHomeDirectory = createTempDir();
- setupJettyTestHome(solrHomeDirectory, "collection1");
- String top = SolrTestCaseJ4.TEST_HOME() + "/collection1/conf";
+ Path collectionDirectory = solrHomeDirectory.resolve("collection1");
+
Files.copy(
- Path.of(top, "solrconfig-headers.xml"),
- Path.of(solrHomeDirectory + "/collection1/conf", "solrconfig.xml"),
+ SolrTestCaseJ4.TEST_PATH().resolve("solr.xml"),
+ solrHomeDirectory.resolve("solr.xml"),
StandardCopyOption.REPLACE_EXISTING);
- createAndStartJetty(solrHomeDirectory);
- }
- @AfterClass
- public static void afterTest() throws Exception {
- if (null != solrHomeDirectory) {
- cleanUpJettyHome(solrHomeDirectory);
- }
+ // Create minimal config with custom solrconfig for headers testing
+ SolrTestCaseJ4.copyMinConf(collectionDirectory, "name=collection1\n",
"solrconfig-headers.xml");
+
+ solrJettyTestRule.startSolr(solrHomeDirectory, new Properties(),
JettyConfig.builder().build());
}
@Test
public void testHttpResponse() throws IOException {
- URI uri = URI.create(getBaseUrl() + "/collection1/withHeaders?q=*:*");
+ URI uri = URI.create(solrJettyTestRule.getBaseUrl() +
"/collection1/withHeaders?q=*:*");
HttpGet httpGet = new HttpGet(uri);
- HttpResponse response = getHttpClient().execute(httpGet);
- Header[] headers = response.getAllHeaders();
- boolean containsWarningHeader = false;
- for (Header header : headers) {
- if ("Warning".equals(header.getName())) {
- containsWarningHeader = true;
- assertEquals("This is a test warning", header.getValue());
- break;
+ try (CloseableHttpClient httpClient = HttpClientUtil.createClient(null)) {
+ HttpResponse response = httpClient.execute(httpGet);
+ Header[] headers = response.getAllHeaders();
+ boolean containsWarningHeader = false;
+ for (Header header : headers) {
+ if ("Warning".equals(header.getName())) {
+ containsWarningHeader = true;
+ assertEquals("This is a test warning", header.getValue());
+ break;
+ }
}
+ assertTrue("Expected header not found", containsWarningHeader);
+ HttpClientUtil.close(httpClient);
Review Comment:
thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
