You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2020/12/07 15:48:18 UTC
[ofbiz-framework] branch trunk updated: Fixed: Make locale
available for DateFindField and DateTimeField macros (OFBIZ-12086)
This is an automated email from the ASF dual-hosted git repository.
jamesyong 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 c164494 Fixed: Make locale available for DateFindField and DateTimeField macros (OFBIZ-12086)
c164494 is described below
commit c1644940e94771dcaddb1b0d5f98b7042cdc1f8c
Author: James Yong <ja...@apache.org>
AuthorDate: Mon Dec 7 23:46:02 2020 +0800
Fixed: Make locale available for DateFindField and DateTimeField macros (OFBIZ-12086)
Fixed compile error in MacroFormRendererTest.java.
Thanks: Daniel and Tomek for the finding
---
.../org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 8999bcb..d7f197e 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
@@ -124,7 +124,7 @@ public class MacroFormRendererTest {
label.getText(withNotNull());
result = "";
- ftlWriter.executeMacro(withNotNull(), withNotNull());
+ ftlWriter.executeMacro(withNotNull(), withNull(), withNotNull());
times = 0;
}
};
@@ -1039,7 +1039,7 @@ public class MacroFormRendererTest {
new Verifications() {
{
List<String> macros = new ArrayList<>();
- ftlWriter.executeMacro(withNotNull(), withCapture(macros));
+ ftlWriter.executeMacro(withNotNull(), withNull(), withCapture(macros));
assertThat(macros, not(empty()));
final String macro = macros.get(0);