Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7966: tests - use HttpClients instead of HttpClientUtil to create a client guaranteed to have http registered 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1698414 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2015-08-28 20:43:00 +00:00
parent bdf516f015
commit b3b4a5be68
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
View File

@ -29,9 +29,9 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.impl.client.HttpClients;
import org.apache.solr.SolrJettyTestBase; import org.apache.solr.SolrJettyTestBase;
import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.util.ExternalPaths; import org.apache.solr.util.ExternalPaths;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.HttpConnectionFactory;
@ -107,8 +107,7 @@ public class JettyWebappTest extends SolrTestCaseJ4
byte[] bytes = IOUtils.toByteArray( new URL(adminPath).openStream() ); byte[] bytes = IOUtils.toByteArray( new URL(adminPath).openStream() );
assertNotNull( bytes ); // real error will be an exception assertNotNull( bytes ); // real error will be an exception
HttpClient client = HttpClients.createDefault();
HttpClient client = HttpClientUtil.createClient(null);
HttpRequestBase m = new HttpGet(adminPath); HttpRequestBase m = new HttpGet(adminPath);
HttpResponse response = client.execute(m); HttpResponse response = client.execute(m);
assertEquals(200, response.getStatusLine().getStatusCode()); assertEquals(200, response.getStatusLine().getStatusCode());