XWIKI-23497: Toggling search facets inserts empty space above the search form

* Remove indentation from query limit validation macros to avoid extra
  whitespace.
* Add a page test that verifies that there isn't any empty space above
  the search form.

Author: michitux

xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/src/test/java/org/xwiki/search/solr/ui/SolrSearchPageTest.java

@@ -22,6 +22,8 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.xwiki.model.reference.DocumentReference;
@@ -42,6 +44,8 @@
 import com.xpn.xwiki.plugin.feed.FeedPlugin;
 import com.xpn.xwiki.web.XWikiServletResponseStub;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -81,6 +85,19 @@ void setUp() throws Exception
         loadPage(SOLR_SEARCH_MACROS_REFERENCE);
     }
 
+    @Test
+    void noEmptyParagraph() throws Exception
+    {
+        // Prevent that the search UI triggers a redirect.
+        this.request.put("r", "1");
+        Document searchDocument = renderHTMLPage(SOLR_SEARCH_REFERENCE);
+        Element firstElement = searchDocument.body().firstElementChild();
+        assertNotNull(firstElement);
+        // When there is whitespace inserted in the Velocity macro output, the first tag is a paragraph instead.
+        assertEquals("div", firstElement.tagName());
+        assertEquals("search-ui", firstElement.className());
+    }
+
     @Test
     void checkRSSFeedContent() throws Exception
     {

xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/macros.vm

@@ -2070,13 +2070,14 @@ $displayName##
  * @since 16.10.11
  *#
 #macro(validateQueryLimit $limit $parameterName)
-  #set ($configuredLimit = $services.security.getQueryItemsLimit())
-  #if ($configuredLimit > 0 && ($limit < 0 || $limit > $configuredLimit))
-    #set($discard =
-      $response.sendError(400,
-        "Invalid parameter value $limit for $parameterName: Must be a positive integer and less than or equal to $configuredLimit"))
-    #stop
-  #end
+## This macro is used in places that are sensitive to whitespace - don't indent.
+#set ($configuredLimit = $services.security.getQueryItemsLimit())
+#if ($configuredLimit > 0 && ($limit < 0 || $limit > $configuredLimit))
+#set($discard =
+  $response.sendError(400,
+    "Invalid parameter value $limit for $parameterName: Must be a positive integer and less than or equal to $configuredLimit"))
+#stop
+#end
 #end
 ##
 ##
@@ -2091,14 +2092,15 @@ $displayName##
  * @since 16.10.11
  *#
 #macro(getAndValidateQueryLimitFromRequest $parameterName $defaultValue $_limit)
-  #set ($return = $numbertool.toNumber("$!{request.get($parameterName)}").intValue())
-  #if (!$return)
-    #set ($return = $defaultValue)
-  #else
-    #validateQueryLimit($return $parameterName)
-  #end
-  #set ($_limit = $NULL)
-  #setVariable("$_limit" $return)
+## This macro is used in places that are sensitive to whitespace - don't indent.
+#set ($return = $numbertool.toNumber("$!{request.get($parameterName)}").intValue())
+#if (!$return)
+#set ($return = $defaultValue)
+#else
+#validateQueryLimit($return $parameterName)
+#end
+#set ($_limit = $NULL)
+#setVariable("$_limit" $return)
 #end
 ##
 ##