From 44efb726d2f27efd45db4665150c6266e75c8e44 Mon Sep 17 00:00:00 2001 From: Qing Wang Date: Wed, 21 Oct 2020 22:41:56 +0800 Subject: [PATCH] Fix --- .../main/java/org/restrpc/client/Codec.java | 8 ----- .../org/restrpc/test/BasicClientTest.java | 36 ++++--------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/java/src/main/java/org/restrpc/client/Codec.java b/java/src/main/java/org/restrpc/client/Codec.java index f19ead3..1935441 100644 --- a/java/src/main/java/org/restrpc/client/Codec.java +++ b/java/src/main/java/org/restrpc/client/Codec.java @@ -17,7 +17,6 @@ public class Codec { public byte[] encode(String funcName, Object[] args) throws IOException { // assert args != nullptr. - MessageBufferPacker messagePacker = MessagePack.newDefaultBufferPacker(); messagePacker.packArrayHeader(1 + args.length); messagePacker.packString(funcName); @@ -70,11 +69,4 @@ public class Codec { } throw new RuntimeException("Unknown type: " + returnClz); } - - public int myDecodeInt(byte[] encodedBytes) throws IOException { - MessageUnpacker messageUnpacker = MessagePack.newDefaultUnpacker(encodedBytes); - messageUnpacker.unpackArrayHeader(); - messageUnpacker.unpackInt(); - return messageUnpacker.unpackInt(); - } } diff --git a/java/src/test/java/org/restrpc/test/BasicClientTest.java b/java/src/test/java/org/restrpc/test/BasicClientTest.java index 8ccd5d2..03445f7 100644 --- a/java/src/test/java/org/restrpc/test/BasicClientTest.java +++ b/java/src/test/java/org/restrpc/test/BasicClientTest.java @@ -1,48 +1,24 @@ package org.restrpc.test; -import org.restrpc.client.Codec; import org.restrpc.client.NativeRpcClient; import org.restrpc.client.RpcClient; +import org.testng.Assert; import org.testng.annotations.Test; -import java.io.IOException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; public class BasicClientTest { @Test - public void testBasic() throws IOException, InterruptedException, ExecutionException { + public void testBasic() throws InterruptedException, ExecutionException { + // Note that you must run the `basic_server` first and then run this test. RpcClient rpcClient = new NativeRpcClient(); rpcClient.connect("127.0.0.1:9000"); CompletableFuture future = rpcClient.asyncFunc("add").invoke(Integer.class, 2, 3); - System.out.println("The result of add(2, 3) is " + future.get()); + Assert.assertEquals(future.get(), 5); - { - CompletableFuture future1 = rpcClient.asyncFunc("echo").invoke(String.class, "hello world!"); - System.out.println("The result of echo is " + future1.get()); - } + CompletableFuture future1 = rpcClient.asyncFunc("echo").invoke(String.class, "hello world"); + Assert.assertEquals(future1.get(), "hello world"); } - private String getClassStr(Object o) { - return o.getClass().getName(); - } - - @Test - public void testClass() { - int a = 3; - System.out.println("int -> " + getClassStr(a)); - long b = 3; - System.out.println("long -> " + getClassStr(b)); - String s = "3"; - System.out.println("string ->" + getClassStr(s)); - String c = null; - System.out.println("null str ->" + getClassStr(c)); - } - - @Test - public void testEncode() throws IOException { - Codec codec = new Codec(); - Object[] args = new Object[] {2, 3}; - byte[] bs = codec.encode("add", args); - } }