You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2014/10/07 18:37:17 UTC
svn commit: r1629924 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/solrj/
solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
Author: tflobbe
Date: Tue Oct 7 16:37:17 2014
New Revision: 1629924
URL: http://svn.apache.org/r1629924
Log:
SOLR-6589: Test is fixed by the commit in SOLR-6590
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/SolrExampleTests.java
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1629924&r1=1629923&r2=1629924&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Tue Oct 7 16:37:17 2014
@@ -18,18 +18,8 @@
package org.apache.solr.client.solrj;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
+import com.google.common.collect.Maps;
import junit.framework.Assert;
-
import org.apache.lucene.util.TestUtil;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
@@ -61,7 +51,18 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Maps;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
/**
* This should include tests against the example solr config
@@ -83,7 +84,6 @@ abstract public class SolrExampleTests e
* query the example
*/
@Test
- @AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-6589")
public void testExampleConfig() throws Exception
{
SolrServer server = getSolrServer();