svn commit: r1716156 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java

[an...@apache.org]

Author: anshum
Date: Tue Nov 24 15:19:18 2015
New Revision: 1716156

URL: http://svn.apache.org/viewvc?rev=1716156&view=rev
Log:
SOLR-7912: Removing complicated query assertions from the MLTQParser cloud test as it was getting to be more of a hack. Only test for doc ordering and query assertion in simple cases.

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java?rev=1716156&r1=1716155&r2=1716156&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java Tue Nov 24 15:19:18 2015
@@ -17,6 +17,10 @@ package org.apache.solr.search.mlt;
  * limitations under the License.
  */
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
@@ -29,11 +33,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-
 public class CloudMLTQParserTest extends AbstractFullDistribZkTestBase {
 
   static Logger log = LoggerFactory.getLogger(CloudMLTQParserTest.class);
@@ -160,21 +159,6 @@ public class CloudMLTQParserTest extends
     
     assertArrayEquals(expectedIds, actualIds);
 
-    expectedQueryStrings = new String[]{
-      "(+(lowerfilt:bmw lowerfilt:usa) -id:26)/no_coord",
-      "(+(lowerfilt:usa lowerfilt:bmw lowerfilt:328i) -id:26)/no_coord"};
-
-    if(queryResponse.getDebugMap().get("parsedquery") instanceof  String) {
-      // todo: We might run into issues here. Should think about a better way to test this.
-      // Skipping testing in this case for now.
-      // actualParsedQueries = new String[]{(String) queryResponse.getDebugMap().get("parsedquery")};
-    } else {
-      actualParsedQueries = ((ArrayList<String>) queryResponse
-          .getDebugMap().get("parsedquery")).toArray(new String[0]);
-      Arrays.sort(actualParsedQueries);
-      assertArrayEquals(expectedQueryStrings, actualParsedQueries);
-    }
-
     params = new ModifiableSolrParams();
     // Test out a high value of df and make sure nothing matches.
     params.set(CommonParams.Q, "{!mlt qf=lowerfilt mindf=20 mintf=1}3");
@@ -228,12 +212,4 @@ public class CloudMLTQParserTest extends
       // Do nothing.
     }
   }
-  
-  private boolean compareParsedQueryStrings(String expected, String actual) {
-    HashSet<String> expectedQueryParts = new HashSet<>();
-    expectedQueryParts.addAll(Arrays.asList(expected.split("\\s+")));
-    HashSet<String> actualQueryParts = new HashSet();
-    actualQueryParts.addAll(Arrays.asList(actual.split("\\s+")));
-    return expectedQueryParts.containsAll(actualQueryParts);
-  }
 }