svn commit: r1229655 - /lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java

[yo...@apache.org]

Author: yonik
Date: Tue Jan 10 17:47:33 2012
New Revision: 1229655

URL: http://svn.apache.org/viewvc?rev=1229655&view=rev
Log:
minor test cleanup - use sdoc

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java?rev=1229655&r1=1229654&r2=1229655&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java Tue Jan 10 17:47:33 2012
@@ -95,7 +95,7 @@ public class SolrCmdDistributorTest exte
     // add one doc to controlClient
     
     AddUpdateCommand cmd = new AddUpdateCommand(null);
-    cmd.solrDoc = getSolrDoc("id", 1);
+    cmd.solrDoc = sdoc("id", 1);
     cmdDistrib.distribAdd(cmd, nodes, params);
     
     CommitUpdateCommand ccmd = new CommitUpdateCommand(null, false);
@@ -116,16 +116,16 @@ public class SolrCmdDistributorTest exte
     
     // add another 2 docs to control and 3 to client
     
-    cmd.solrDoc = getSolrDoc("id", 2);
+    cmd.solrDoc = sdoc("id", 2);
     cmdDistrib.distribAdd(cmd, nodes, params);
     
     AddUpdateCommand cmd2 = new AddUpdateCommand(null);
-    cmd2.solrDoc = getSolrDoc("id", 3);
+    cmd2.solrDoc = sdoc("id", 3);
 
     cmdDistrib.distribAdd(cmd2, nodes, params);
     
     AddUpdateCommand cmd3 = new AddUpdateCommand(null);
-    cmd3.solrDoc = getSolrDoc("id", 4);
+    cmd3.solrDoc = sdoc("id", 4);
     
     cmdDistrib.distribAdd(cmd3, Collections.singletonList(nodes.get(1)), params);
     
@@ -164,16 +164,4 @@ public class SolrCmdDistributorTest exte
         .getNumFound();
     assertEquals(results.toString(), 2, numFound);
   }
-  
-  protected void addFields(SolrInputDocument doc, Object... fields) {
-    for (int i = 0; i < fields.length; i += 2) {
-      doc.addField((String) (fields[i]), fields[i + 1]);
-    }
-  }
-  
-  private SolrInputDocument getSolrDoc(Object... fields) throws Exception {
-    SolrInputDocument doc = new SolrInputDocument();
-    addFields(doc, fields);
-    return doc;
-  }
 }