tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-05-31 22:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

test[websocket]: 简化websocket测试用例

Browse Source
This commit is contained in:
jaysunxiao
2021-07-01 14:52:28 +08:00
parent 325c8449aa
commit 1a36d72aba
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/src/test/java/com/zfoo/net/core/websocket/server/controller/WebsocketPacketController.java → net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketPacketController.java
+6 -4
View File
@@ -1,6 +1,5 @@
/*
* 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
*
@@ -11,13 +10,15 @@
* See the License for the specific language governing permissions and limitations under the License.
*/
package com.zfoo.net.core.websocket.server.controller;
package com.zfoo.net.core.websocket.server;
import com.zfoo.net.NetContext;
import com.zfoo.net.dispatcher.model.anno.PacketReceiver;
import com.zfoo.net.packet.websocket.CM_WebSocketPacket;
import com.zfoo.net.session.model.Session;
import com.zfoo.protocol.util.JsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
/**
@@ -27,10 +28,11 @@ import org.springframework.stereotype.Component;
@Component
public class WebsocketPacketController {
private static final Logger logger = LoggerFactory.getLogger(WebsocketPacketController.class);
@PacketReceiver
public void atCM_WebSocketPacket(Session session, CM_WebSocketPacket cm) {
System.out.println("receive packet from client:");
System.out.println(JsonUtils.object2String(cm));
logger.info("websocket server receive [packet:{}] from browser", JsonUtils.object2String(cm));
NetContext.getDispatcher().send(session, cm);
net/src/test/java/com/zfoo/net/core/websocket/server/WebsocketServerTest.java
+2 -7
View File
@@ -21,9 +21,6 @@ import org.junit.Ignore;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* @author jaysunxiao
* @version 3.0
@@ -31,12 +28,10 @@ import java.util.concurrent.Executors;
@Ignore
public class WebsocketServerTest {
private static final ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("config.xml");
private static final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
@Test
public void startServer() {
var context = new ClassPathXmlApplicationContext("config.xml");
var server = new WebsocketServer(HostAndPort.valueOf(NetContext.getConfigManager().getLocalConfig().getHostConfig().getAddressMap().get("server0")));
server.start();