svn commit: r1698415 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/solrj/ solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java

[yo...@apache.org]

Author: yonik
Date: Fri Aug 28 20:43:34 2015
New Revision: 1698415

URL: http://svn.apache.org/r1698415
Log:
SOLR-7966: tests - use HttpClients instead of HttpClientUtil to create a client guaranteed to have http registered

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/solrj/   (props changed)
    lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java

Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1698415&r1=1698414&r2=1698415&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Fri Aug 28 20:43:34 2015
@@ -29,9 +29,9 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.impl.client.HttpClients;
 import org.apache.solr.SolrJettyTestBase;
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.util.ExternalPaths;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -107,8 +107,7 @@ public class JettyWebappTest extends Sol
     byte[] bytes = IOUtils.toByteArray( new URL(adminPath).openStream() );
     assertNotNull( bytes ); // real error will be an exception
 
-
-    HttpClient client = HttpClientUtil.createClient(null);
+    HttpClient client = HttpClients.createDefault();
     HttpRequestBase m = new HttpGet(adminPath);
     HttpResponse response = client.execute(m);
     assertEquals(200, response.getStatusLine().getStatusCode());