diff --git a/fizz-core/src/main/java/we/fizz/function/CommonFunc.java b/fizz-core/src/main/java/we/fizz/function/CommonFunc.java
new file mode 100644
index 0000000..6c36314
--- /dev/null
+++ b/fizz-core/src/main/java/we/fizz/function/CommonFunc.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2021 the original author or authors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * Compares two Strings, returning {@code true} if they represent equal
+ * sequences of Strings.
+ *
+ *
+ *
+ * {@code null}s are handled without exceptions. Two {@code null} references are
+ * considered to be equal. The comparison is case sensitive .
+ *
+ *
+ *
+ * equals(null, null) = true
+ * equals(null, "abc") = false
+ * equals("abc", null) = false
+ * equals("abc", "abc") = true
+ * equals("abc", "ABC") = false
+ *
+ *
+ * @param str1 the first String, may be {@code null}
+ * @param str2 the second String, may be {@code null}
+ * @return {@code true} if the Strings are equal (case-sensitive), or both
+ * {@code null}
+ */
+ public boolean equals(String str1, String str2) {
+ return StringUtils.equals(str1, str2);
+ }
+
+ /**
+ *
+ * Compares two Strings, returning {@code true} if they represent equal
+ * sequences of Strings, ignoring case.
+ *
+ *
+ *
+ * {@code null}s are handled without exceptions. Two {@code null} references are
+ * considered equal. The comparison is case insensitive .
+ *
+ *
+ *
+ * equalsIgnoreCase(null, null) = true
+ * equalsIgnoreCase(null, "abc") = false
+ * equalsIgnoreCase("abc", null) = false
+ * equalsIgnoreCase("abc", "abc") = true
+ * equalsIgnoreCase("abc", "ABC") = true
+ *
+ *
+ * @param str1 the first String, may be {@code null}
+ * @param str2 the second String, may be {@code null}
+ * @return {@code true} if the Strings are equal (case-insensitive), or both
+ * {@code null}
+ */
+ public boolean equalsIgnoreCase(String str1, String str2) {
+ return StringUtils.equalsIgnoreCase(str1, str2);
+ }
+
+ /**
+ * Compare two Strings lexicographically
+ *
+ * @param str1
+ * @param str2
+ * @return -1, 0, 1, if {@code str1} is respectively less, equal or greater than
+ * {@code str2}
+ */
+ public int compare(String str1, String str2) {
+ int n = StringUtils.compare(str1, str2);
+ return n == 0 ? 0 : (n > 0 ? 1 : -1);
}
/**
@@ -172,9 +245,17 @@ public class StringFunc implements IFunc {
}
return str.toLowerCase();
}
-
+
+ /**
+ *
+ * @return UUID
+ */
public String uuid() {
return UUID.randomUUID().toString().replaceAll("-", "");
}
+ public String toString(Object obj) {
+ return obj == null ? null : obj.toString();
+ }
+
}
diff --git a/fizz-core/src/test/java/we/fizz/function/CommonFuncTests.java b/fizz-core/src/test/java/we/fizz/function/CommonFuncTests.java
new file mode 100644
index 0000000..0c1a423
--- /dev/null
+++ b/fizz-core/src/test/java/we/fizz/function/CommonFuncTests.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2021 the original author or authors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see createRecord(String key, Object value) {
+ Map m = new HashMap<>();
+ m.put(key, value);
+ return m;
+ }
+
+ private ONode getCtxNode() {
+ ONode ctxNode = ONode.load(new HashMap());
+
+ Map m = new HashMap<>();
+ m.put("a", "1");
+ m.put("b", "1");
+ m.put("d", "");
+
+ List list = new ArrayList<>();
+ list.add(createRecord("a", "a1"));
+ list.add(createRecord("a", "a2"));
+ list.add(createRecord("a", "a3"));
+
+ List list2 = new ArrayList<>();
+
+ PathMapping.setByPath(ctxNode, "data.m", m, true);
+ PathMapping.setByPath(ctxNode, "data.m2", new HashMap<>(), true);
+ PathMapping.setByPath(ctxNode, "data.list", list, true);
+ PathMapping.setByPath(ctxNode, "data.list2", list2, true);
+ return ctxNode;
+ }
+
+ @Test
+ void testIif() {
+ String funcExpression = "fn.common.iif(true, \"abc\", \"xyz\")";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals("abc", result.toString());
+ }
+
+
+ @Test
+ void testIif2() {
+ String funcExpression = "fn.common.iif(false, \"abc\", \"xyz\")";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals("xyz", result.toString());
+ }
+
+ @Test
+ void testIif3() {
+ String funcExpression = "fn.common.iif(false, \"abc\", 123)";
+ Long result = (Long)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(123, result.intValue());
+ }
+
+ @Test
+ void testIif4() {
+ String funcExpression = "fn.common.iif(false, \"abc\", 123.4)";
+ Double result = (Double)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(123.4, result);
+ }
+
+ @Test
+ void testIif5() {
+ String funcExpression = "fn.common.iif(false, \"abc\", true)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testEquals() {
+ String funcExpression = "fn.common.equals(\"abc\", true)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(false, result);
+ }
+
+ @Test
+ void testEquals2() {
+ String funcExpression = "fn.common.equals(\"abc\", \"abc\")";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testEquals3() {
+ String funcExpression = "fn.common.equals(123, 123)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testEquals4() {
+ String funcExpression = "fn.common.equals(123, 123.0)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(false, result);
+ }
+
+ @Test
+ void testEquals5() {
+ String funcExpression = "fn.common.equals(true, true)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testEquals6() {
+ String funcExpression = "fn.common.equals(123.2, 123.2)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testEquals7() {
+ String funcExpression = "fn.common.equals(null, 123.2)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(false, result);
+ }
+
+ @Test
+ void testEquals8() {
+ String funcExpression = "fn.common.equals(null, null)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testEquals9() {
+ String funcExpression = "fn.common.equals(123, null)";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(false, result);
+ }
+
+ @Test
+ void testIsNull() {
+ ONode ctx = getCtxNode();
+ String funcExpression = "fn.common.isNull({data.m.c})";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testIsNotNull() {
+ ONode ctx = getCtxNode();
+ String funcExpression = "fn.common.isNotNull({data.m.a})";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testIsBlank() {
+ ONode ctx = getCtxNode();
+ String funcExpression = "fn.common.isBlank({data.m.c})";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testIsNotBlank() {
+ ONode ctx = getCtxNode();
+ String funcExpression = "fn.common.isNotBlank({data.m.a})";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testIsEmpty() {
+ ONode ctx = getCtxNode();
+ String funcExpression = "fn.common.isEmpty({data.list2})";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+
+ funcExpression = "fn.common.isEmpty({data.m2})";
+ result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+
+ funcExpression = "fn.common.isEmpty({data.m.x})";
+ result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+
+ funcExpression = "fn.common.isEmpty({data.m.d})";
+ result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testIsNotEmpty() {
+ ONode ctx = getCtxNode();
+ String funcExpression = "fn.common.isNotEmpty({data.list})";
+ Boolean result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+
+ funcExpression = "fn.common.isNotEmpty({data.m})";
+ result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+
+ funcExpression = "fn.common.isNotEmpty({data.m.a})";
+ result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(true, result);
+
+ funcExpression = "fn.common.isNotEmpty({data.m.y})";
+ result = (Boolean)FuncExecutor.getInstance().exec(ctx, funcExpression);
+ assertEquals(false, result);
+ }
+
+}
\ No newline at end of file
diff --git a/fizz-core/src/test/java/we/fizz/function/MathFuncTests.java b/fizz-core/src/test/java/we/fizz/function/MathFuncTests.java
index 1545c92..c34f80f 100644
--- a/fizz-core/src/test/java/we/fizz/function/MathFuncTests.java
+++ b/fizz-core/src/test/java/we/fizz/function/MathFuncTests.java
@@ -18,13 +18,7 @@ package we.fizz.function;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.util.HashMap;
-import java.util.Map;
-
import org.junit.jupiter.api.Test;
-import org.noear.snack.ONode;
-
-import we.fizz.input.PathMapping;
/**
*
@@ -175,5 +169,47 @@ class MathFuncTests {
double result = (double) FuncExecutor.getInstance().exec(null, funcExpression);
// System.out.println(result);
}
+
+ @Test
+ void testcompare() {
+ String funcExpression = "fn.math.compare(4.8456,2)";
+ int result = (int) FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(1, result);
+ }
+
+ @Test
+ void testequals() {
+ String funcExpression = "fn.math.equals(3,3)";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testLt() {
+ String funcExpression = "fn.math.lt(3,23)";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testle() {
+ String funcExpression = "fn.math.le(3,3)";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testgt() {
+ String funcExpression = "fn.math.gt(3,1)";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testge() {
+ String funcExpression = "fn.math.ge(3,3)";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
}
\ No newline at end of file
diff --git a/fizz-core/src/test/java/we/fizz/function/StringFuncTests.java b/fizz-core/src/test/java/we/fizz/function/StringFuncTests.java
index 79f0962..f82bef8 100644
--- a/fizz-core/src/test/java/we/fizz/function/StringFuncTests.java
+++ b/fizz-core/src/test/java/we/fizz/function/StringFuncTests.java
@@ -32,10 +32,46 @@ import we.fizz.input.PathMapping;
*
*/
class StringFuncTests {
+
@Test
void contextLoads() {
}
+
+ @Test
+ void testEquals() {
+ String funcExpression = "fn.string.equals(\"abc\", \"abc\")";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testEquals2() {
+ String funcExpression = "fn.string.equals(null, \"abc\")";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(false, result);
+ }
+
+ @Test
+ void testEquals3() {
+ String funcExpression = "fn.string.equals(\"ab\\\"c\", \"abc\")";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(false, result);
+ }
+
+ @Test
+ void testEqualsIgnoreCase() {
+ String funcExpression = "fn.string.equalsIgnoreCase(\"abc\", \"Abc\")";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(true, result);
+ }
+
+ @Test
+ void testcompare() {
+ String funcExpression = "fn.string.compare(\"abc\", \"cde\")";
+ Object result = FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals(-1, result);
+ }
@Test
void testConcat() {
@@ -126,6 +162,25 @@ class StringFuncTests {
assertEquals("aBc".toLowerCase(), result);
}
-
+ @Test
+ void testToString() {
+ String funcExpression = "fn.string.toString(\"aBc\")";
+ String result = (String)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals("aBc", result);
+ }
+
+ @Test
+ void testToString2() {
+ String funcExpression = "fn.string.toString(true)";
+ String result = (String)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals("true", result);
+ }
+
+ @Test
+ void testToString3() {
+ String funcExpression = "fn.string.toString(234)";
+ String result = (String)FuncExecutor.getInstance().exec(null, funcExpression);
+ assertEquals("234", result);
+ }
}
\ No newline at end of file