Skip to content

Switch to MTPv2 #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ScarletKuro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to MTPv2 #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,10 @@ jobs:
run: dotnet build -c Release samples/samples.sln
- name: Test - Linux
if: runner.os == 'Linux'
run: |
cd test/SuperSocket.Tests
dotnet test --logger "console;verbosity=detailed"
run: dotnet test --project test/SuperSocket.Tests/SuperSocket.Tests.csproj --output Detailed
- name: Test - macOS
if: runner.os == 'macOS'
run: |
cd test/SuperSocket.Tests
dotnet test --filter FullyQualifiedName\!~TestQuicSupport --logger "console;verbosity=detailed"
run: dotnet test --project test/SuperSocket.Tests/SuperSocket.Tests.csproj --filter-not-method "*.TestQuicSupport" --output Detailed
- name: Test - Windows
if: runner.os == 'Windows'
run: |
cd test/SuperSocket.Tests
dotnet test --filter FullyQualifiedName!~TestQuicSupport --logger "console;verbosity=detailed"
run: dotnet test --project test/SuperSocket.Tests/SuperSocket.Tests.csproj --filter-not-method "*.TestQuicSupport" --output Detailed
4 changes: 1 addition & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MSExtensionsVersion)" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="xunit.v3" Version="1.0.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
<PackageVersion Include="xunit.v3" Version="4.0.2" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.5" />
<PackageVersion Include="Meziantou.Extensions.Logging.Xunit.v3" Version="1.0.0" />
Expand Down
5 changes: 4 additions & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"sdk": {
"version": "10.0.0",
"rollForward": "latestFeature"
},
"test": {
"runner": "Microsoft.Testing.Platform"
}
}
}
2 changes: 1 addition & 1 deletion src/SuperSocket.MCP/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ The package includes comprehensive tests covering:
Run tests with:

```bash
dotnet test test/SuperSocket.MCP.Tests/
dotnet test --project test/SuperSocket.Tests/SuperSocket.Tests.csproj --filter-namespace "SuperSocket.Tests.Mcp"
```

## Examples
Expand Down
16 changes: 8 additions & 8 deletions test/SuperSocket.Tests/AspNetIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public async Task TestSingleHostServiceAccess()

using (var host = builder.Build())
{
await host.StartAsync();
await host.StartAsync(TestContext.Current.CancellationToken);
var server = host.AsServer();

Assert.IsType<TestService>(server.ServiceProvider.GetService<ITestService>());
Expand All @@ -103,7 +103,7 @@ public async Task TestSingleHostServiceAccess()
Assert.IsType<ScopedTestService>(scope.ServiceProvider.GetService<IScopedTestService>());
}

await host.StopAsync();
await host.StopAsync(TestContext.Current.CancellationToken);
}
}

Expand Down Expand Up @@ -137,7 +137,7 @@ public async Task TestMultipleHostServiceAccess()

using (var host = builder.Build())
{
await host.StartAsync();
await host.StartAsync(TestContext.Current.CancellationToken);
var server = host.AsServer();

Assert.IsType<TestService>(server.ServiceProvider.GetService<ITestService>());
Expand All @@ -147,7 +147,7 @@ public async Task TestMultipleHostServiceAccess()
Assert.IsType<ScopedTestService>(scope.ServiceProvider.GetService<IScopedTestService>());
}

await host.StopAsync();
await host.StopAsync(TestContext.Current.CancellationToken);
}
}

Expand Down Expand Up @@ -209,14 +209,14 @@ public async Task TestMultipleHostServiceAccess2()

using (var host = builder.Build())
{
await host.StartAsync();
await host.StartAsync(TestContext.Current.CancellationToken);

var server = host.AsServer();

using(var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
{
await client.ConnectAsync(GetDefaultServerEndPoint());
await Task.Delay(1000);
await client.ConnectAsync(GetDefaultServerEndPoint(), TestContext.Current.CancellationToken);
await Task.Delay(1000, TestContext.Current.CancellationToken);

Assert.NotNull(session);
Assert.NotNull(session.TestService as TestService);
Expand All @@ -225,7 +225,7 @@ public async Task TestMultipleHostServiceAccess2()
client.Close();
}

await host.StopAsync();
await host.StopAsync(TestContext.Current.CancellationToken);
}
}
}
Expand Down
62 changes: 31 additions & 31 deletions test/SuperSocket.Tests/AutofacTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,35 +55,35 @@ public async Task TestCommands(Type hostConfiguratorType)

Assert.Equal("TestServer", server.Name);

Assert.True(await server.StartAsync());
Assert.True(await server.StartAsync(TestContext.Current.CancellationToken));
OutputHelper.WriteLine("Server started.");


var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
await client.ConnectAsync(new IPEndPoint(IPAddress.Loopback, hostConfigurator.Listener.Port));
await client.ConnectAsync(new IPEndPoint(IPAddress.Loopback, hostConfigurator.Listener.Port), TestContext.Current.CancellationToken);
OutputHelper.WriteLine("Connected.");

using (var stream = await hostConfigurator.GetClientStream(client))
using (var streamReader = new StreamReader(stream, Utf8Encoding, true))
using (var streamWriter = new StreamWriter(stream, Utf8Encoding, 1024 * 1024 * 4))
{
await streamWriter.WriteAsync("ADD 1 2 3\r\n");
await streamWriter.FlushAsync();
var line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
var line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("6", line);

await streamWriter.WriteAsync("MULT 2 5\r\n");
await streamWriter.FlushAsync();
line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("10", line);

await streamWriter.WriteAsync("SUB 8 2\r\n");
await streamWriter.FlushAsync();
line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("6", line);
}

await server.StopAsync();
await server.StopAsync(TestContext.Current.CancellationToken);
}
}

Expand All @@ -110,40 +110,40 @@ public async Task TestCommandsWithCustomSession(Type hostConfiguratorType)

Assert.Equal("TestServer", server.Name);

Assert.True(await server.StartAsync());
Assert.True(await server.StartAsync(TestContext.Current.CancellationToken));
OutputHelper.WriteLine("Server started.");


var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
await client.ConnectAsync(new IPEndPoint(IPAddress.Loopback, hostConfigurator.Listener.Port));
await client.ConnectAsync(new IPEndPoint(IPAddress.Loopback, hostConfigurator.Listener.Port), TestContext.Current.CancellationToken);
OutputHelper.WriteLine("Connected.");

using (var stream = await hostConfigurator.GetClientStream(client))
using (var streamReader = new StreamReader(stream, Utf8Encoding, true))
using (var streamWriter = new StreamWriter(stream, Utf8Encoding, 1024 * 1024 * 4))
{
await streamWriter.WriteAsync("ADD 1 2 3\r\n");
await streamWriter.FlushAsync();
var line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
var line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("6", line);

await streamWriter.WriteAsync("MULT 2 5\r\n");
await streamWriter.FlushAsync();
line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("10", line);

await streamWriter.WriteAsync("SUB 8 2\r\n");
await streamWriter.FlushAsync();
line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("6", line);

await streamWriter.WriteAsync("DIV 8 2\r\n");
await streamWriter.FlushAsync();
line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("4", line);
}

await server.StopAsync();
await server.StopAsync(TestContext.Current.CancellationToken);
}
}

Expand Down Expand Up @@ -180,39 +180,39 @@ public async Task TestCommandsWithCustomSessionMultipleServerHost()

Assert.Equal("TestServer", server.Name);

Assert.True(await server.StartAsync());
Assert.True(await server.StartAsync(TestContext.Current.CancellationToken));
OutputHelper.WriteLine("Server started.");

var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
await client.ConnectAsync(GetDefaultServerEndPoint());
await client.ConnectAsync(GetDefaultServerEndPoint(), TestContext.Current.CancellationToken);
OutputHelper.WriteLine("Connected.");

using (var stream = new NetworkStream(client))
using (var streamReader = new StreamReader(stream, Utf8Encoding, true))
using (var streamWriter = new StreamWriter(stream, Utf8Encoding, 1024 * 1024 * 4))
{
await streamWriter.WriteAsync("ADD 1 2 3\r\n");
await streamWriter.FlushAsync();
var line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
var line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("6", line);

await streamWriter.WriteAsync("MULT 2 5\r\n");
await streamWriter.FlushAsync();
line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("10", line);

await streamWriter.WriteAsync("SUB 8 2\r\n");
await streamWriter.FlushAsync();
line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("6", line);

await streamWriter.WriteAsync("DIV 8 2\r\n");
await streamWriter.FlushAsync();
line = await streamReader.ReadLineAsync();
await streamWriter.FlushAsync(TestContext.Current.CancellationToken);
line = await streamReader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal("4", line);
}

await server.StopAsync();
await server.StopAsync(TestContext.Current.CancellationToken);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/SuperSocket.Tests/BeginEndMarkProtocolTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public async Task TestBreakRequest2(Type hostConfiguratorType)

using (var server = CreateServer(hostConfigurator))
{
await server.StartAsync();
await server.StartAsync(TestContext.Current.CancellationToken);

using (var socket = CreateClient(hostConfigurator))
{
Expand All @@ -296,13 +296,13 @@ public async Task TestBreakRequest2(Type hostConfiguratorType)

for (var i = 0; i < size; i++)
{
var receivedLine = await reader.ReadLineAsync();
var receivedLine = await reader.ReadLineAsync(TestContext.Current.CancellationToken);
Assert.Equal(lines[i], receivedLine);
}
}
}

await server.StopAsync();
await server.StopAsync(TestContext.Current.CancellationToken);
}
}
}
Expand Down
Loading