[nifi] branch main updated: NIFI-10875 Changed TestQuerySolr to check for path elements

[exceptionfactory]

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new a3c895341c NIFI-10875 Changed TestQuerySolr to check for path elements
a3c895341c is described below

commit a3c895341c973ddcdc9115259da7cf7390f8aeb2
Author: Yihen Liu <tt0s...@gmail.com>
AuthorDate: Thu Nov 24 13:37:29 2022 -0600

    NIFI-10875 Changed TestQuerySolr to check for path elements
    
    - Changes avoid non-deterministic expectations for query parameters
    
    This closes #6718
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../apache/nifi/processors/solr/TestQuerySolr.java | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestQuerySolr.java
 
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestQuerySolr.java
index 60cb32f117..0ea1db65da 100644
--- 
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestQuerySolr.java
+++ 
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/test/java/org/apache/nifi/processors/solr/TestQuerySolr.java
@@ -602,8 +602,12 @@ public class TestQuerySolr {
 
         assertEquals(SOLR_CONNECT, 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_CONNECT));
         assertEquals(DEFAULT_SOLR_CORE, 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_COLLECTION));
-
-        assertEquals("q=*:*&qt=/select&start=0&rows=10&stats=true&facet=true", 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("q=*:*"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("qt=/select"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("start=0"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("rows=10"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("stats=true"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("facet=true"));
         assertEquals("0", attributes.get(QuerySolr.ATTRIBUTE_SOLR_STATUS));
         assertEquals("0", attributes.get(QuerySolr.ATTRIBUTE_SOLR_START));
         assertEquals("10", attributes.get(QuerySolr.ATTRIBUTE_SOLR_ROWS));
@@ -626,8 +630,12 @@ public class TestQuerySolr {
 
         assertEquals(SOLR_CONNECT, 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_CONNECT));
         assertEquals(DEFAULT_SOLR_CORE, 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_COLLECTION));
-
-        assertEquals("q=*:*&qt=/select&start=0&rows=10&stats=true&facet=true", 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("q=*:*"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("qt=/select"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("start=0"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("rows=10"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("stats=true"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("facet=true"));
         assertEquals("0", attributes.get(QuerySolr.ATTRIBUTE_SOLR_STATUS));
         assertEquals("0", attributes.get(QuerySolr.ATTRIBUTE_SOLR_START));
         assertEquals("10", attributes.get(QuerySolr.ATTRIBUTE_SOLR_ROWS));
@@ -650,8 +658,12 @@ public class TestQuerySolr {
 
         assertEquals(SOLR_CONNECT, 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_CONNECT));
         assertEquals(DEFAULT_SOLR_CORE, 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_COLLECTION));
-
-        assertEquals("q=*:*&qt=/select&start=0&rows=10&stats=true&facet=true", 
attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("q=*:*"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("qt=/select"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("start=0"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("rows=10"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("stats=true"));
+        
assertTrue(attributes.get(QuerySolr.ATTRIBUTE_SOLR_QUERY).contains("facet=true"));
         assertEquals("0", attributes.get(QuerySolr.ATTRIBUTE_SOLR_STATUS));
         assertEquals("0", attributes.get(QuerySolr.ATTRIBUTE_SOLR_START));
         assertEquals("10", attributes.get(QuerySolr.ATTRIBUTE_SOLR_ROWS));