svn commit: r701740 - in /lucene/solr/trunk/client/java/solrj: src/org/apache/solr/client/solrj/SolrQuery.java test/org/apache/solr/client/solrj/SolrQueryTest.java

[ry...@apache.org]

Author: ryan
Date: Sat Oct  4 18:08:17 2008
New Revision: 701740

URL: http://svn.apache.org/viewvc?rev=701740&view=rev
Log:
adding some solr query tests.
deprecating setMissing( String ) and replacing it with setFacetMissing( Boolean ) 

Modified:
    lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/SolrQuery.java
    lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrQueryTest.java

Modified: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/SolrQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/SolrQuery.java?rev=701740&r1=701739&r2=701740&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/SolrQuery.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/SolrQuery.java Sat Oct  4 18:08:17 2008
@@ -184,11 +184,18 @@
     return this.getInt(FacetParams.FACET_MINCOUNT, 1);
   }
 
-  public SolrQuery setMissing(String fld) {
-    this.set(FacetParams.FACET_MISSING, fld);
+  public SolrQuery setFacetMissing(Boolean v) {
+    this.set(FacetParams.FACET_MISSING, v);
     return this;
   }
 
+  /**
+   * @deprecated use {@link #setFacetMissing(String)}
+   */
+  public SolrQuery setMissing(String fld) {
+    return setFacetMissing(Boolean.valueOf(fld));
+  }
+
   /** get facet sort
    * 
    * @return facet sort or default of true

Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrQueryTest.java?rev=701740&r1=701739&r2=701740&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrQueryTest.java (original)
+++ lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/SolrQueryTest.java Sat Oct  4 18:08:17 2008
@@ -17,6 +17,8 @@
 
 package org.apache.solr.client.solrj;
 
+import org.apache.solr.common.params.FacetParams;
+
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
@@ -113,5 +115,18 @@
       assertEquals(10, q.setStart(10).getStart().intValue());
       assertEquals("foo", q.setQueryType("foo").getQueryType());
       assertEquals(10, q.setTimeAllowed(10).getTimeAllowed().intValue());
+      
+      // non-standard
+      assertEquals("foo", q.setFacetPrefix("foo").get( FacetParams.FACET_PREFIX, null ) );
+      assertEquals("foo", q.setFacetPrefix("a", "foo").getFieldParam( "a", FacetParams.FACET_PREFIX, null ) );
+
+      assertEquals( Boolean.TRUE, q.setMissing(Boolean.TRUE.toString()).getBool( FacetParams.FACET_MISSING ) );
+      assertEquals( Boolean.FALSE, q.setFacetMissing( Boolean.FALSE ).getBool( FacetParams.FACET_MISSING ) );      
+      assertEquals( "true", q.setParam( "xxx", true ).getParams( "xxx" )[0] );
+  }
+  
+  public void testOrder() {
+    assertEquals( SolrQuery.ORDER.asc, SolrQuery.ORDER.desc.reverse() );
+    assertEquals( SolrQuery.ORDER.desc, SolrQuery.ORDER.asc.reverse() );
   }
 }