svn commit: r1370606 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/ solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java

[rm...@apache.org]

Author: rmuir
Date: Wed Aug  8 00:11:46 2012
New Revision: 1370606

URL: http://svn.apache.org/viewvc?rev=1370606&view=rev
Log:
harden test against internet problems

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java?rev=1370606&r1=1370605&r2=1370606&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java Wed Aug  8 00:11:46 2012
@@ -21,6 +21,8 @@ import static org.easymock.EasyMock.crea
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 
+import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
@@ -114,10 +116,13 @@ public class SolrRequestParserTest exten
     String url = "http://www.apache.org/dist/lucene/solr/";
     byte[] bytes = null;
     try {
-      URLConnection connection = new URL(url).openConnection();
+      URL u = new URL(url);
+      HttpURLConnection connection = (HttpURLConnection)u.openConnection();
       connection.setConnectTimeout(5000);
       connection.setReadTimeout(5000);
       connection.connect();
+      int code = connection.getResponseCode();
+      assumeTrue("wrong response code from server: " + code, 200 == code);
       bytes = IOUtils.toByteArray( connection.getInputStream());
     }
     catch( Exception ex ) {
@@ -134,8 +139,13 @@ public class SolrRequestParserTest exten
     List<ContentStream> streams = new ArrayList<ContentStream>();
     SolrQueryRequest req = parser.buildRequestFrom( core, new MultiMapSolrParams( args ), streams );
     assertEquals( 1, streams.size() );
-    assertArrayEquals( bytes, IOUtils.toByteArray( streams.get(0).getStream() ) );
-    req.close();
+    try {
+      assertArrayEquals( bytes, IOUtils.toByteArray( streams.get(0).getStream() ) );
+    } catch (SocketTimeoutException ex) {
+      assumeNoException("Problems retrieving from " + url + " to run the test.", ex);
+    } finally {
+      req.close();
+    }
   }
   
   @Test