Skip to content

Commit f84bf0e

Browse files
committed
refactor: 精简代码
1 parent 809a531 commit f84bf0e

File tree

1 file changed

+26
-43
lines changed

1 file changed

+26
-43
lines changed

test/UnitTest/Services/TcpSocketFactoryTest.cs

Lines changed: 26 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -308,22 +308,16 @@ public async Task FixLengthDataPackageHandler_Ok()
308308
// 设置数据适配器
309309
var adapter = new DataPackageAdapter
310310
{
311-
DataPackageHandler = new FixLengthDataPackageHandler(7),
312-
ReceivedCallBack = buffer =>
313-
{
314-
// buffer 即是接收到的数据
315-
buffer.CopyTo(receivedBuffer);
316-
receivedBuffer = receivedBuffer[..buffer.Length];
317-
tcs.SetResult();
318-
return ValueTask.CompletedTask;
319-
}
311+
DataPackageHandler = new FixLengthDataPackageHandler(7)
320312
};
321-
322-
client.ReceivedCallBack = async buffer =>
313+
client.SetDataPackageAdapter(adapter, buffer =>
323314
{
324-
// 将接收到的数据传递给 DataPackageAdapter
325-
await adapter.HandlerAsync(buffer);
326-
};
315+
// buffer 即是接收到的数据
316+
buffer.CopyTo(receivedBuffer);
317+
receivedBuffer = receivedBuffer[..buffer.Length];
318+
tcs.SetResult();
319+
return ValueTask.CompletedTask;
320+
});
327321

328322
// 测试 ConnectAsync 方法
329323
var connect = await client.ConnectAsync("localhost", port);
@@ -350,30 +344,25 @@ public async Task FixLengthDataPackageHandler_Sticky()
350344
var server = StartTcpServer(port, MockStickyPackageAsync);
351345
var client = CreateClient();
352346
var tcs = new TaskCompletionSource();
353-
var receivedBuffer = new byte[1024];
347+
var receivedBuffer = new byte[128];
354348

355349
// 连接 TCP Server
356350
var connect = await client.ConnectAsync("localhost", port);
357351

358352
// 设置数据适配器
359353
var adapter = new DataPackageAdapter
360354
{
361-
DataPackageHandler = new FixLengthDataPackageHandler(7),
362-
ReceivedCallBack = buffer =>
363-
{
364-
// buffer 即是接收到的数据
365-
buffer.CopyTo(receivedBuffer);
366-
receivedBuffer = receivedBuffer[..buffer.Length];
367-
tcs.SetResult();
368-
return ValueTask.CompletedTask;
369-
}
355+
DataPackageHandler = new FixLengthDataPackageHandler(7)
370356
};
371357

372-
client.ReceivedCallBack = async buffer =>
358+
client.SetDataPackageAdapter(adapter, buffer =>
373359
{
374-
// 将接收到的数据传递给 DataPackageAdapter
375-
await adapter.HandlerAsync(buffer);
376-
};
360+
// buffer 即是接收到的数据
361+
buffer.CopyTo(receivedBuffer);
362+
receivedBuffer = receivedBuffer[..buffer.Length];
363+
tcs.SetResult();
364+
return ValueTask.CompletedTask;
365+
});
377366

378367
// 发送数据
379368
var data = new ReadOnlyMemory<byte>([1, 2, 3, 4, 5]);
@@ -408,31 +397,25 @@ public async Task FixLengthDataPackageHandler_Sticky()
408397
[Fact]
409398
public async Task DelimiterDataPackageHandler_Ok()
410399
{
411-
var port = 8886;
400+
var port = 8883;
412401
var server = StartTcpServer(port, MockDelimiterPackageAsync);
413402
var client = CreateClient();
414403
var tcs = new TaskCompletionSource();
415-
var receivedBuffer = new byte[1024];
404+
var receivedBuffer = new byte[128];
416405

417406
// 设置数据适配器
418407
var adapter = new DataPackageAdapter
419408
{
420409
DataPackageHandler = new DelimiterDataPackageHandler([13, 10]),
421-
ReceivedCallBack = buffer =>
422-
{
423-
// buffer 即是接收到的数据
424-
buffer.CopyTo(receivedBuffer);
425-
receivedBuffer = receivedBuffer[..buffer.Length];
426-
tcs.SetResult();
427-
return ValueTask.CompletedTask;
428-
}
429410
};
430-
431-
client.ReceivedCallBack = async buffer =>
411+
client.SetDataPackageAdapter(adapter, buffer =>
432412
{
433-
// 将接收到的数据传递给 DataPackageAdapter
434-
await adapter.HandlerAsync(buffer);
435-
};
413+
// buffer 即是接收到的数据
414+
buffer.CopyTo(receivedBuffer);
415+
receivedBuffer = receivedBuffer[..buffer.Length];
416+
tcs.SetResult();
417+
return ValueTask.CompletedTask;
418+
});
436419

437420
// 连接 TCP Server
438421
var connect = await client.ConnectAsync("localhost", port);

0 commit comments

Comments
 (0)