Skip to content

Commit 41b36a2

Browse files
update unit test
1 parent ae76e14 commit 41b36a2

File tree

2 files changed

+37
-34
lines changed

2 files changed

+37
-34
lines changed

Miku.UnitTest/Miku.UnitTest.csproj

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
1717
<PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
19-
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
20-
<PackageReference Include="Nino" Version="3.1.4" />
21-
<PackageReference Include="NUnit" Version="3.14.0"/>
22-
<PackageReference Include="NUnit.Analyzers" Version="3.9.0"/>
23-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25107-01" />
19+
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
20+
<PackageReference Include="Nino" Version="3.2.3" />
21+
<PackageReference Include="NUnit" Version="4.3.2" />
22+
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
26+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
2427
</ItemGroup>
2528

2629
<ItemGroup>

Miku.UnitTest/ServerTests.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void Setup()
1818
AppDomain.CurrentDomain.UnhandledException += (_, e) => { Console.WriteLine(e.ExceptionObject); };
1919
}
2020

21-
[Test, Timeout(1000)]
21+
[Test, CancelAfter(1000)]
2222
public async Task ServerReceiveTest()
2323
{
2424
// A data for testing.
@@ -62,13 +62,13 @@ public async Task ServerReceiveTest()
6262
client.Stop();
6363

6464
// await for the server to stop
65-
Assert.IsTrue(await tcs.Task);
65+
Assert.That(await tcs.Task);
6666

6767
// Stop the server.
6868
server.Stop();
6969
}
7070

71-
[Test, Timeout(1000)]
71+
[Test, CancelAfter(1000)]
7272
public async Task ServerStopsClientTest()
7373
{
7474
// A data for testing.
@@ -110,13 +110,13 @@ public async Task ServerStopsClientTest()
110110
client.Send(buffer);
111111

112112
// await for the server to stop
113-
Assert.IsTrue(await tcs.Task);
113+
Assert.That(await tcs.Task);
114114

115115
// Stop the server.
116116
server.Stop();
117117
}
118118

119-
[Test, Timeout(1000)]
119+
[Test, CancelAfter(1000)]
120120
public async Task EchoTest()
121121
{
122122
// A data for testing.
@@ -160,13 +160,13 @@ public async Task EchoTest()
160160
client.Send(buffer);
161161

162162
// await for the server to stop
163-
Assert.IsTrue(await tcs.Task);
163+
Assert.That(await tcs.Task);
164164

165165
// Stop the server.
166166
server.Stop();
167167
}
168168

169-
[Test, Timeout(1000)]
169+
[Test, CancelAfter(1000)]
170170
public async Task FramingMiddlewareTest()
171171
{
172172
// A data for testing.
@@ -216,13 +216,13 @@ public async Task FramingMiddlewareTest()
216216
client.Send(buffer);
217217

218218
// await for the server to stop
219-
Assert.IsTrue(await tcs.Task);
219+
Assert.That(await tcs.Task);
220220

221221
// Stop the server.
222222
server.Stop();
223223
}
224224

225-
[Test, Timeout(1000)]
225+
[Test, CancelAfter(1000)]
226226
public async Task MultipleMiddlewareTest()
227227
{
228228
// A data for testing.
@@ -274,13 +274,13 @@ public async Task MultipleMiddlewareTest()
274274
client.Send(buffer);
275275

276276
// await for the server to stop
277-
Assert.IsTrue(await tcs.Task);
277+
Assert.That(await tcs.Task);
278278

279279
// Stop the server.
280280
server.Stop();
281281
}
282282

283-
[Test, Timeout(1000)]
283+
[Test, CancelAfter(1000)]
284284
public async Task PingPongTest()
285285
{
286286
// ip port info
@@ -290,25 +290,25 @@ public async Task PingPongTest()
290290
TaskCompletionSource<IProtocol> tcs = new TaskCompletionSource<IProtocol>();
291291
Ping dataToSend = new Ping
292292
{
293-
// Field1 = 1,
294-
// Field2 = "2",
295-
// Field3 = 3.5f,
296-
// Field4 = 4.5,
297-
// Field5 = 5,
298-
// Field6 = 6,
299-
// Field7 = 7,
300-
// Field8 = Guid.NewGuid()
293+
Field1 = 1,
294+
Field2 = "2",
295+
Field3 = 3.5f,
296+
Field4 = 4.5,
297+
Field5 = 5,
298+
Field6 = 6,
299+
Field7 = 7,
300+
Field8 = Guid.NewGuid()
301301
};
302302
Pong dataToReceive = new Pong
303303
{
304-
// Field1 = 1,
305-
// Field2 = "2",
306-
// Field3 = 3.5f,
307-
// Field4 = 4.5,
308-
// Field5 = 5,
309-
// Field6 = 6,
310-
// Field7 = 7,
311-
// Field8 = Guid.NewGuid()
304+
Field1 = 1,
305+
Field2 = "2",
306+
Field3 = 3.5f,
307+
Field4 = 4.5,
308+
Field5 = 5,
309+
Field6 = 6,
310+
Field7 = 7,
311+
Field8 = Guid.NewGuid()
312312
};
313313

314314
// Create a new server.
@@ -363,7 +363,7 @@ public async Task PingPongTest()
363363
client.Send(dataToSend.Serialize());
364364

365365
// await for the server to stop
366-
Assert.IsTrue(await tcs.Task is Pong pong && pong.Equals(dataToReceive));
366+
Assert.That(await tcs.Task is Pong pong && pong.Equals(dataToReceive));
367367

368368
// Stop the server.
369369
server.Stop();

0 commit comments

Comments
 (0)