Fixed: Test run was unsuccessful because of failing solr tests (OFBIZ-12595)

JacquesLeRoux · JacquesLeRoux · commit 16ed1303670a · 2022-04-13T15:00:58.000+02:00
The previous commit for OFBIZ-12594 was only working on Windows. On *nix OSs
there is no way to reliably get "--test" String from java.class.path property.

Also the previous fix was brittle because relying only on 1 space separating
words.

This fix puts in the SolrDispatchFilter system property at the beginning of the
4 Solr tests and removes it at end of them. That presence can reliably be tested
in ControlFilter that is called before SolrDispatchFilter. It allows to bypass
SecurityUtil::containsFreemarkerInterpolation that would else change the
parameters content type that must be application/x-www-form-urlencoded.
content

Thanks: Tom Pietsch for report and Mart Naum for confirmation

Conflicts handled by hand
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java
@@ -135,9 +135,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                 offset = requestUri.length();
             }
             if (!GenericValue.getStackTraceAsString().contains("ControlFilterTests")
-                    && !(System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests
-                            || System.getProperty("java.class.path").contains("ofbiz --test_ManifestJar.jar") // Allows Solr tests in testIntegration
-                            || System.getProperty("java.class.path").contains("ofbiz.jar")) // Allows Solr tests in testIntegration in 18.12
+                    && null == System.getProperty("SolrDispatchFilter") // Allows Solr tests
                     && SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, requestUri)) {
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha`
`135`	`135`	`offset = requestUri.length();`
`136`	`136`	`}`
`137`	`137`	`if (!GenericValue.getStackTraceAsString().contains("ControlFilterTests")`
`138`		`- && !(System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests`
`139`		`- \|\| System.getProperty("java.class.path").contains("ofbiz --test_ManifestJar.jar") // Allows Solr tests in testIntegration`
`140`		`- \|\| System.getProperty("java.class.path").contains("ofbiz.jar")) // Allows Solr tests in testIntegration in 18.12`
	`138`	`+ && null == System.getProperty("SolrDispatchFilter") // Allows Solr tests`
`141`	`139`	`&& SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, requestUri)) {`
`142`	`140`	`return;`
`143`	`141`	`}`