Skip to content
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

Jump to bottom

Fix nullable annotation #197

Merged
merged 3 commits into from
Apr 3, 2024
Merged

Fix nullable annotation #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12fe642
fix
nenoNaninu Apr 3, 2024
612e411
update csproj
nenoNaninu Apr 3, 2024
dca784f
add test
nenoNaninu Apr 3, 2024
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
5 changes: 2 additions & 3 deletions src/TypedSignalR.Client/Templates/MethodMetadataExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System.Diagnostics;
using System.Linq;
using System.Text;
using Microsoft.CodeAnalysis;
Expand Down Expand Up @@ -145,11 +144,11 @@ public static string CreateParameterTypeArrayString(this MethodMetadata methodMe
var sb = new StringBuilder();

sb.Append("new[] { ");
sb.Append($"typeof({methodMetadata.Parameters[0].TypeName})");
sb.Append($"typeof({methodMetadata.Parameters[0].Type.ToDisplayString(SymbolDisplayFormatRule.FullyQualifiedFormat)})");

for (int i = 1; i < methodMetadata.Parameters.Count; i++)
{
sb.Append($", typeof({methodMetadata.Parameters[i].TypeName})");
sb.Append($", typeof({methodMetadata.Parameters[i].Type.ToDisplayString(SymbolDisplayFormatRule.FullyQualifiedFormat)})");
}

sb.Append(" }");
Expand Down
2 changes: 1 addition & 1 deletion tests/TypedSignalR.Client.Tests.NuGet/TypedSignalR.Client.Tests.NuGet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<Compile Include="..\TypedSignalR.Client.Tests\Hubs\ReceiverTest.cs" LinkBase="Hubs" />
<Compile Include="..\TypedSignalR.Client.Tests\Hubs\StreamingTest.cs" LinkBase="Hubs" />
<Compile Include="..\TypedSignalR.Client.Tests\Hubs\UnaryTest.cs" LinkBase="Hubs" />
<Compile Include="..\TypedSignalR.Client.Tests\Hubs\NullableHubTest.cs" LinkBase="Hubs" />
<!--<Compile Include="..\TypedSignalR.Client.Tests\Hubs\NullableHubTest.cs" LinkBase="Hubs" />-->
</ItemGroup>

</Project>
10 changes: 10 additions & 0 deletions tests/TypedSignalR.Client.Tests.Server/Hubs/NullableTestHub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,14 @@ public Task<string> GetReferenceType(string message)

return Task.FromResult<string?>(message + "99");
}

public Task<string?> GetNullableReferenceType2(string? message1, string? message2)
{
if (message1 is null && message2 is null)
{
return Task.FromResult<string?>(null);
}

return Task.FromResult<string?>(string.Concat(message1, message2));
}
}
4 changes: 4 additions & 0 deletions tests/TypedSignalR.Client.Tests.Shared/INullableTestHub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public interface INullableTestHub

Task<string> GetReferenceType(string message);
Task<string?> GetNullableReferenceType(string? message);
Task<string?> GetNullableReferenceType2(string? message1, string? message2);
}


Expand All @@ -17,4 +18,7 @@ public interface INullableTestIReceiver

Task<string> GetReferenceType(string message);
Task<string?> GetNullableReferenceType(string? message);
Task<string?> GetNullableReferenceType2(string? message, int? value);
Task<string?> GetNullableReferenceType3(string? message, string message2);
Task<string?> GetNullableReferenceType4(string message, string? message2, int value);
}
50 changes: 50 additions & 0 deletions tests/TypedSignalR.Client.Tests/Hubs/NullableHubTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,41 @@ public async Task GetNullableReferenceType2()
await hubConnection.StopAsync(_cancellationTokenSource.Token);
}

[Fact]
public async Task GetNullableReferenceType3()
{
var hubConnection = CreateHubConnection("/Hubs/NullableTestHub", HttpTransportType.WebSockets);

var hubProxy = hubConnection.CreateHubProxy<INullableTestHub>(_cancellationTokenSource.Token);

await hubConnection.StartAsync(_cancellationTokenSource.Token);

var value = await hubProxy.GetNullableReferenceType2(null, null);

Assert.Null(value);

await hubConnection.StopAsync(_cancellationTokenSource.Token);
}

[Fact]
public async Task GetNullableReferenceType4()
{
var hubConnection = CreateHubConnection("/Hubs/NullableTestHub", HttpTransportType.WebSockets);

var hubProxy = hubConnection.CreateHubProxy<INullableTestHub>(_cancellationTokenSource.Token);

await hubConnection.StartAsync(_cancellationTokenSource.Token);

var message1 = Guid.NewGuid().ToString();
var message2 = Guid.NewGuid().ToString();

var value = await hubProxy.GetNullableReferenceType2(message1, message2);

Assert.Equal(message1 + message2, value);

await hubConnection.StopAsync(_cancellationTokenSource.Token);
}

private void CompileTest()
{
var hubConnection = CreateHubConnection("/Hubs/NullableTestHub", HttpTransportType.WebSockets);
Expand All @@ -136,6 +171,21 @@ private class NullableTestIReceiver : INullableTestIReceiver
throw new NotImplementedException();
}

public Task<string?> GetNullableReferenceType2(string? message, int? value)
{
throw new NotImplementedException();
}

public Task<string?> GetNullableReferenceType3(string? message, string message2)
{
throw new NotImplementedException();
}

public Task<string?> GetNullableReferenceType4(string message, string? message2, int value)
{
throw new NotImplementedException();
}

public Task<int?> GetNullableStruct(int? message)
{
throw new NotImplementedException();
Expand Down