添加 nami 新单测

Author: noear

__test/src/main/java/webapp/demo5_rpc/HelloService.java

@@ -1,15 +1,14 @@
 package webapp.demo5_rpc;
 
-import org.noear.nami.annotation.NamiClient;
 import org.noear.solon.annotation.*;
 import org.noear.solon.core.handle.UploadedFile;
 
 import java.util.List;
 
 //@NamiClient
 public interface HelloService {
-    @Post
     @Mapping("hello")
+    @Post
     String hello(String name, @Header("H1") String h1, @Cookie("C1") String c1);
 
     @Mapping("/test01")
@@ -23,4 +22,12 @@ public interface HelloService {
     @Mapping("/test03")
     @Post
     String test03();
+
+    @Mapping("/test04/{name}")
+    @Get
+    String test04(String name);
+
+    @Mapping("/test05?type={type}")
+    @Post
+    String test05(int type, @Body String body);
 }

__test/src/main/java/webapp/demo5_rpc/HelloService2.java

@@ -0,0 +1,36 @@
+package webapp.demo5_rpc;
+
+import org.noear.solon.annotation.*;
+import org.noear.solon.core.handle.UploadedFile;
+
+import java.util.List;
+
+/**
+ * 简化模式
+ * */
+//@NamiClient
+public interface HelloService2 {
+    @Mapping("hello")
+//    @Post
+    String hello(String name, @Header("H1") String h1, @Cookie("C1") String c1);
+
+    @Mapping("/test01")
+//    @Post
+    String test01(@Param("ids") List<String> ids);
+
+    @Mapping("/test02")
+//    @Post
+    String test02(@Param("file") UploadedFile file);
+
+    @Mapping("/test03")
+    @Post
+    String test03();
+
+    @Mapping("/test04/{name}")
+//    @Get
+    String test04(String name);
+
+    @Mapping("/test05?type={type}")
+//    @Post
+    String test05(int type, @Body String body);
+}

__test/src/main/java/webapp/demo5_rpc/HelloServiceImpl.java

@@ -38,4 +38,18 @@ public String test02(@Param("file") UploadedFile file) {
     public String test03() {
         return "test03";
     }
+
+    @Mapping("/test04/{name}")
+    @Get
+    @Override
+    public String test04(@Path String name) {
+        return name;
+    }
+
+    @Mapping("/test05")
+    @Post
+    @Override
+    public String test05(int type, @Body String body) {
+        return type + ":" + body;
+    }
 }

__test/src/test/java/features/HeaderTest.java

@@ -15,6 +15,7 @@
  */
 package features;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.noear.snack.ONode;
 import org.noear.solon.server.handle.HeaderNames;
@@ -130,15 +131,15 @@ public void testContentType_post_multipart() throws Exception {
     @Test
     public void testContentType_get() throws Exception {
         String rst = path("/demo2/header/ct?name=solon").get();
-        assert rst.equals("GET::null::solon");
+        Assertions.assertEquals("GET::null::solon", rst);
     }
 
     @Test
     public void testServer_get() throws Exception {
         String rst = path("/demo2/header/server").exec("GET").header("Server");
-        assert rst == null;
+        Assertions.assertNull(rst);
 
         rst = path("/demo2/header/server?out=1").exec("GET").header("Server");
-        assert "solon".equals(rst);
+        Assertions.assertEquals("solon", rst);
     }
-}
+}

__test/src/test/java/features/NamiAndHttpTest.java

@@ -49,4 +49,14 @@ public void test02() throws IOException {
     public void test03() throws IOException {
         assert helloService.test03().equals("test03");
     }
+
+    @Test
+    public void test04() throws IOException {
+        assert helloService.test04("test04").equals("test04");
+    }
+
+    @Test
+    public void test05() throws IOException {
+        assert helloService.test05(1, "test05").equals("1:\"test05\"");
+    }
 }

__test/src/test/java/features/NamiAndHttpTest2.java

@@ -0,0 +1,63 @@
+package features;
+
+import org.junit.jupiter.api.Test;
+import org.noear.nami.annotation.NamiClient;
+import org.noear.solon.core.handle.UploadedFile;
+import org.noear.solon.core.util.MimeType;
+import org.noear.solon.test.SolonTest;
+import webapp.App;
+import webapp.demo5_rpc.HelloService;
+import webapp.demo5_rpc.HelloService2;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author noear 2025/5/7 created
+ */
+@SolonTest(App.class)
+public class NamiAndHttpTest2 {
+    //直接指定服务端地址
+    @NamiClient(url = "http://localhost:8080/demo5/hello/")
+    HelloService2 helloService;
+
+    @Test
+    public void hello() {
+        assert helloService.hello("world", "1", "a").contains("world:1:a");
+        assert helloService.hello("solon", "2", "b").contains("solon:2:b");
+    }
+
+    @Test
+    public void test01() {
+        List<String> ids = new ArrayList<>();
+        ids.add("a");
+        ids.add("b");
+        assert helloService.test01(ids).equals("a,b");
+    }
+
+    @Test
+    public void test02() throws IOException {
+        UploadedFile file = new UploadedFile(MimeType.TEXT_PLAIN_VALUE,
+                new ByteArrayInputStream("hello".getBytes()),
+                "demo1.txt");
+
+        assert helloService.test02(file).equals("demo1.txt");
+    }
+
+    @Test
+    public void test03() throws IOException {
+        assert helloService.test03().equals("test03");
+    }
+
+    @Test
+    public void test04() throws IOException {
+        assert helloService.test04("test04").equals("test04");
+    }
+
+    @Test
+    public void test05() throws IOException {
+        assert helloService.test05(1, "test05").equals("1:\"test05\"");
+    }
+}