This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push: new 513689d Documented: MacroFormRenderer refactoring (OFBIZ-11456) 513689d is described below commit 513689da9682a7f2cf84cc49cb006b66dceed014 Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Tue Nov 30 19:12:33 2021 +0100 Documented: MacroFormRenderer refactoring (OFBIZ-11456) Adds a FIXME about: SpotBugs reporting: Argument 1 is definitely null but must not be null --- .../renderer/macro/MacroFormRendererTest.java | 61 ++++++++++++---------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java index 20bbdaa..1473b9c 100644 --- a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java +++ b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java @@ -18,17 +18,25 @@ *******************************************************************************/ package org.apache.ofbiz.widget.renderer.macro; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import freemarker.core.Environment; -import freemarker.template.Template; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; -import mockit.Tested; -import mockit.Verifications; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.startsWith; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + import org.apache.ofbiz.base.util.UtilCodec.SimpleEncoder; import org.apache.ofbiz.base.util.UtilHttp; import org.apache.ofbiz.base.util.UtilProperties; @@ -48,23 +56,18 @@ import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.stream.Collectors; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.startsWith; +import freemarker.core.Environment; +import freemarker.template.Template; +import mockit.Expectations; +import mockit.Injectable; +import mockit.Mock; +import mockit.MockUp; +import mockit.Mocked; +import mockit.Tested; +import mockit.Verifications; public class MacroFormRendererTest { @@ -841,7 +844,7 @@ public class MacroFormRendererTest { { modelForm.getPaginateTarget(withNotNull()); result = targetService; - + // FIXME SpotBugs reports: Argument 1 is definitely null but must not be null requestHandler.makeLink(null, null, withSubstring(qbeString)); result = linkFromQbeString; } @@ -868,7 +871,7 @@ public class MacroFormRendererTest { modelForm.getPaginateTarget(withNotNull()); result = paginateTarget; - + // FIXME SpotBugs reports: Argument 1 is definitely null but must not be null requestHandler.makeLink(null, null, withSubstring(qbeString)); result = linkFromQbeString;