svn commit: r648683 - in /lucene/solr/trunk: CHANGES.txt client/java/solrj/test/org/apache/solr/client/solrj/SolrExceptionTest.java

[gsingers]

Author: gsingers
Date: Wed Apr 16 05:38:35 2008
New Revision: 648683

URL: http://svn.apache.org/viewvc?rev=648683&view=rev
Log:
SOLR-400: Handle OpenDNS failure

Modified:
    lucene/solr/trunk/CHANGES.txt
    
lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExceptionTest.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=648683&r1=648682&r2=648683&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed Apr 16 05:38:35 2008
@@ -348,6 +348,8 @@
 
 24. SOLR-533: Fixed tests so they don't use hardcoded port numbers. 
     (hossman)
+
+25. SOLR-400: SolrExceptionTest should now handle using OpenDNS as a DNS 
provider (gsingers)
     
 Other Changes
  1. SOLR-135: Moved common classes to org.apache.solr.common and altered the

Modified: 
lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExceptionTest.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExceptionTest.java?rev=648683&r1=648682&r2=648683&view=diff
==============================================================================
--- 
lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExceptionTest.java
 (original)
+++ 
lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrExceptionTest.java
 Wed Apr 16 05:38:35 2008
@@ -22,6 +22,8 @@
 import junit.framework.TestCase;
 
 import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrException;
 
 /**
  * 
@@ -41,7 +43,9 @@
       client.query(query);
     } catch (SolrServerException sse) {
       gotExpectedError = true;
-      assertTrue(UnknownHostException.class == sse.getRootCause().getClass());
+      assertTrue(UnknownHostException.class == sse.getRootCause().getClass()
+              //If one is using OpenDNS, then you don't get 
UnknownHostException, instead you get back that the query couldn't execute
+              || (sse.getRootCause().getClass() == SolrException.class && 
((SolrException) sse.getRootCause()).code() == 302 && 
sse.getMessage().equals("Error executing query")));
     }
     assertTrue(gotExpectedError);
   }