diff --git a/net/src/test/java/com/zfoo/net/core/json/client/JsonWsClientController.java b/net/src/test/java/com/zfoo/net/core/json/client/JsonClientController.java similarity index 94% rename from net/src/test/java/com/zfoo/net/core/json/client/JsonWsClientController.java rename to net/src/test/java/com/zfoo/net/core/json/client/JsonClientController.java index 92475b37..d6f30433 100644 --- a/net/src/test/java/com/zfoo/net/core/json/client/JsonWsClientController.java +++ b/net/src/test/java/com/zfoo/net/core/json/client/JsonClientController.java @@ -25,9 +25,9 @@ import org.springframework.stereotype.Component; * @author godotg */ @Component -public class JsonWsClientController { +public class JsonClientController { - private static final Logger logger = LoggerFactory.getLogger(JsonWsClientController.class); + private static final Logger logger = LoggerFactory.getLogger(JsonClientController.class); @PacketReceiver public void atJsonHelloResponse(Session session, JsonHelloResponse response) { diff --git a/net/src/test/java/com/zfoo/net/core/json/client/JsonTcpClientTest.java b/net/src/test/java/com/zfoo/net/core/json/client/JsonTcpClientTest.java new file mode 100644 index 00000000..7a1c1dd1 --- /dev/null +++ b/net/src/test/java/com/zfoo/net/core/json/client/JsonTcpClientTest.java @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2020 The zfoo Authors + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + * + */ + +package com.zfoo.net.core.json.client; + +import com.zfoo.net.NetContext; +import com.zfoo.net.core.HostAndPort; +import com.zfoo.net.core.json.JsonTcpClient; +import com.zfoo.net.packet.json.JsonHelloRequest; +import com.zfoo.net.packet.json.JsonHelloResponse; +import com.zfoo.protocol.util.JsonUtils; +import com.zfoo.protocol.util.ThreadUtils; +import org.junit.Ignore; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import java.util.function.Consumer; + +/** + * @author godotg + */ +@Ignore +public class JsonTcpClientTest { + + private static final Logger logger = LoggerFactory.getLogger(JsonTcpClientTest.class); + + @Test + public void startClient() throws Exception { + var context = new ClassPathXmlApplicationContext("config.xml"); + + var client = new JsonTcpClient(HostAndPort.valueOf("127.0.0.1:9000")); + var session = client.start(); + + var request = new JsonHelloRequest(); + request.setMessage("Hello, this is the json client!"); + + for (int i = 0; i < 1000; i++) { + ThreadUtils.sleep(1000); + NetContext.getRouter().send(session, request); + ThreadUtils.sleep(1000); + var response = NetContext.getRouter().syncAsk(session, request, JsonHelloResponse.class, null).packet(); + logger.info("sync json client receive [packet:{}] from server", JsonUtils.object2String(response)); + NetContext.getRouter().asyncAsk(session, request, JsonHelloResponse.class, null) + .whenComplete(new Consumer() { + @Override + public void accept(JsonHelloResponse jsonHelloResponse) { + logger.info("async json client receive [packet:{}] from server", JsonUtils.object2String(jsonHelloResponse)); + } + }); + } + + ThreadUtils.sleep(Long.MAX_VALUE); + } + + +} diff --git a/net/src/test/java/com/zfoo/net/core/json/server/JsonWsServerController.java b/net/src/test/java/com/zfoo/net/core/json/server/JsonServerController.java similarity index 95% rename from net/src/test/java/com/zfoo/net/core/json/server/JsonWsServerController.java rename to net/src/test/java/com/zfoo/net/core/json/server/JsonServerController.java index db756773..bf9c1b9d 100644 --- a/net/src/test/java/com/zfoo/net/core/json/server/JsonWsServerController.java +++ b/net/src/test/java/com/zfoo/net/core/json/server/JsonServerController.java @@ -27,9 +27,9 @@ import org.springframework.stereotype.Component; * @author godotg */ @Component -public class JsonWsServerController { +public class JsonServerController { - private static final Logger logger = LoggerFactory.getLogger(JsonWsServerController.class); + private static final Logger logger = LoggerFactory.getLogger(JsonServerController.class); @PacketReceiver public void atJsonHelloRequest(Session session, JsonHelloRequest request) { diff --git a/net/src/test/java/com/zfoo/net/core/json/server/JsonTcpServerTest.java b/net/src/test/java/com/zfoo/net/core/json/server/JsonTcpServerTest.java new file mode 100644 index 00000000..9e04af61 --- /dev/null +++ b/net/src/test/java/com/zfoo/net/core/json/server/JsonTcpServerTest.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2020 The zfoo Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + */ + +package com.zfoo.net.core.json.server; + +import com.zfoo.net.core.HostAndPort; +import com.zfoo.net.core.json.JsonTcpServer; +import com.zfoo.net.core.json.JsonWebsocketServer; +import com.zfoo.protocol.util.ThreadUtils; +import org.junit.Ignore; +import org.junit.Test; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * @author godotg + */ +@Ignore +public class JsonTcpServerTest { + + @Test + public void startServer() { + var context = new ClassPathXmlApplicationContext("config.xml"); + + var server = new JsonTcpServer(HostAndPort.valueOf("0.0.0.0:9000")); + server.start(); + + ThreadUtils.sleep(Long.MAX_VALUE); + } + +}