test：补充自定义对象调用单测

Author: AzirZsk

src/main/java/org/github/azirzsk/fcp/invoke/FunctionCall.java

@@ -60,6 +60,7 @@ public Object functionCall(String name, String argumentsStr) {
     private Object[] parseArguments(JSONObject argumentJson, ParametersEntity parameters) {
         Map<String, PropertyEntity> propertiesMap = parameters.getProperties();
         Collection<PropertyEntity> property = propertiesMap.values();
+        // 根据方法中参数顺序排序
         List<PropertyEntity> sortedList = property.stream()
                 .sorted(Comparator.comparingInt(PropertyEntity::getIndex).reversed())
                 .collect(Collectors.toList());

src/test/java/org/github/azirzsk/fcp/invoke/FunctionCallTest.java

@@ -1,9 +1,9 @@
 package org.github.azirzsk.fcp.invoke;
 
 import org.github.azirzsk.fcp.FCP;
-import org.github.azirzsk.fcp.testclass.tool.SingleNoArgMethod;
-import org.github.azirzsk.fcp.testclass.tool.SingleNoReturnMethod;
-import org.github.azirzsk.fcp.testclass.tool.SingleReturnMethod;
+import org.github.azirzsk.fcp.testclass.invoke.SingleNoArgMethod;
+import org.github.azirzsk.fcp.testclass.invoke.SingleNoReturnMethod;
+import org.github.azirzsk.fcp.testclass.invoke.SingleReturnMethod;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -53,4 +53,24 @@ public void testNoArg() {
         String invokeStr = "{}";
         Assertions.assertEquals(123, fcp.functionCall("noArg", invokeStr));
     }
+
+    @Test
+    public void testCustomObject() {
+        SingleReturnMethod singleReturnMethod = new SingleReturnMethod();
+        FCP fcp = FCP.create();
+        fcp.functionCall(singleReturnMethod);
+
+        String invokeStr = "{\"user\":{\"name\":\"azirzsk\",\"age\":25}}";
+        Assertions.assertEquals("姓名：azirzsk，年龄：25", fcp.functionCall("print", invokeStr));
+    }
+
+    @Test
+    public void testNestCustomObject() {
+        SingleReturnMethod singleReturnMethod = new SingleReturnMethod();
+        FCP fcp = FCP.create();
+        fcp.functionCall(singleReturnMethod);
+
+        String invokeStr = "{\"home\":{\"address\":\"北京市朝阳区\",\"userInfo\":{\"name\":\"azirzsk\",\"age\":25}}}";
+        Assertions.assertEquals("地址：北京市朝阳区，用户信息：姓名：azirzsk，年龄：25", fcp.functionCall("printHome", invokeStr));
+    }
 }

src/test/java/org/github/azirzsk/fcp/parser/ToolParserTest.java

@@ -1,7 +1,7 @@
 package org.github.azirzsk.fcp.parser;
 
 import org.github.azirzsk.fcp.entity.ToolEntity;
-import org.github.azirzsk.fcp.testclass.tool.SingleReturnMethod;
+import org.github.azirzsk.fcp.testclass.invoke.SingleReturnMethod;
 import org.github.azirzsk.fcp.utils.FileUtils;
 import org.github.azirzsk.fcp.utils.JsonUtils;
 import org.junit.jupiter.api.Assertions;

…cp/testclass/tool/SingleNoArgMethod.java …/testclass/invoke/SingleNoArgMethod.javasrc/test/java/org/github/azirzsk/fcp/testclass/tool/SingleNoArgMethod.java renamed to src/test/java/org/github/azirzsk/fcp/testclass/invoke/SingleNoArgMethod.java src/test/java/org/github/azirzsk/fcp/testclass/tool/SingleNoArgMethod.java renamed to src/test/java/org/github/azirzsk/fcp/testclass/invoke/SingleNoArgMethod.java

@@ -1,4 +1,4 @@
-package org.github.azirzsk.fcp.testclass.tool;
+package org.github.azirzsk.fcp.testclass.invoke;
 
 import org.github.azirzsk.fcp.annotation.Function;
 

…testclass/tool/SingleNoReturnMethod.java …stclass/invoke/SingleNoReturnMethod.javasrc/test/java/org/github/azirzsk/fcp/testclass/tool/SingleNoReturnMethod.java renamed to src/test/java/org/github/azirzsk/fcp/testclass/invoke/SingleNoReturnMethod.java src/test/java/org/github/azirzsk/fcp/testclass/tool/SingleNoReturnMethod.java renamed to src/test/java/org/github/azirzsk/fcp/testclass/invoke/SingleNoReturnMethod.java

@@ -1,4 +1,4 @@
-package org.github.azirzsk.fcp.testclass.tool;
+package org.github.azirzsk.fcp.testclass.invoke;
 
 import org.github.azirzsk.fcp.annotation.Function;
 import org.github.azirzsk.fcp.annotation.Property;

src/test/java/org/github/azirzsk/fcp/testclass/invoke/SingleReturnMethod.java

@@ -0,0 +1,32 @@
+package org.github.azirzsk.fcp.testclass.invoke;
+
+import org.github.azirzsk.fcp.annotation.Function;
+import org.github.azirzsk.fcp.annotation.Property;
+import org.github.azirzsk.fcp.testclass.property.PropertyTestClass;
+
+/**
+ * @author zhangshukun
+ * @since 2024/12/22
+ */
+public class SingleReturnMethod {
+
+    @Function(desc = "计算最大公约数")
+    public int gcd(@Property(desc = "非负整数A") int a, @Property(desc = "非负整数B") int b) {
+        if (b == 0) {
+            return a;
+        }
+        return gcd(b, a % b);
+    }
+
+    @Function(desc = "打印用户信息")
+    public String print(@Property(desc = "用户信息") PropertyTestClass.UserInfo user) {
+        return String.format("姓名：%s，年龄：%s", user.getName(), user.getAge());
+    }
+
+    @Function(desc = "打印家庭信息")
+    public String printHome(@Property(desc = "家庭信息") PropertyTestClass.Home home) {
+        return String.format("地址：%s，用户信息：姓名：%s，年龄：%s", home.getAddress(),
+                home.getUserInfo().getName(), home.getUserInfo().getAge());
+    }
+
+}