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 afbe2437c8 Improved: Improvement of the Check xml tag (OFBIZ-12821) afbe2437c8 is described below commit afbe2437c8b622d811115acda63d0d9e257579ae Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Fri Feb 16 15:59:20 2024 +0100 Improved: Improvement of the Check xml tag (OFBIZ-12821) Cleans MacroFormRendererTest.java for test check to pass + removes useless things --- .../renderer/macro/MacroFormRendererTest.java | 32 +++++----------------- 1 file changed, 7 insertions(+), 25 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 e2d7801b72..44fa5e3802 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 @@ -26,7 +26,12 @@ import static org.hamcrest.Matchers.startsWith; import java.io.IOException; import java.io.StringWriter; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; @@ -126,7 +131,6 @@ public class MacroFormRendererTest { new UtilPropertiesMockUp(); } - @SuppressWarnings("checkstyle:InnerAssignment") @Test public void labelRenderedAsSingleMacro(@Mocked ModelScreenWidget.Label label) { new Expectations() { @@ -325,7 +329,6 @@ public class MacroFormRendererTest { e.printStackTrace(); } - String renderedString = writer.toString(); assertAndGetMacroString("renderCheckField", ImmutableMap.of( "items", ImmutableList.of( "{'value':'KEY1', 'description':'DESC1', 'checked':'true'}", @@ -334,7 +337,7 @@ public class MacroFormRendererTest { "{'value':'KEY4', 'description':'DESC4', 'checked':'false'}"))); } - @Test + @Test public void radioFieldMacroRendered(@Mocked ModelFormField.RadioField radioField) throws IOException { final List<ModelFormField.OptionValue> optionValues = ImmutableList.of( new ModelFormField.OptionValue("KEY1", "DESC1"), @@ -1019,27 +1022,6 @@ public class MacroFormRendererTest { }; } - private void genericSubHyperlinkRenderedExpectation(final ModelFormField.SubHyperlink subHyperlink) { - new Expectations() { - { - subHyperlink.shouldUse(withNotNull()); - result = true; - - subHyperlink.getStyle(withNotNull()); - result = "buttontext"; - - subHyperlink.getUrlMode(); - result = "inter-app"; - - subHyperlink.getTarget(withNotNull()); - result = "/path/to/target"; - - subHyperlink.getDescription(withNotNull()); - result = "LinkDescription"; - } - }; - } - private void genericSubHyperlinkRenderedVerification() { new Verifications() { {