Skip to content

Cleanup gRPC unit testing helpers in tester sample #2548

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

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Cleanup gRPC unit testing helpers in tester sample #2548

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
5 changes: 1 addition & 4 deletions examples/Tester/Tests/Server/UnitTests/Helpers/TestServerCallContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#region Copyright notice and license
#region Copyright notice and license

// Copyright 2019 The gRPC Authors
//
Expand All @@ -22,8 +22,6 @@
using System.Threading.Tasks;
using Grpc.Core;

// TODO(JamesNK): Remove nullable override after Grpc.Core.Api update
#pragma warning disable CS8764 // Nullability of return type doesn't match overridden member (possibly because of nullability attributes).
namespace Tests.Server.UnitTests.Helpers
{
public class TestServerCallContext : ServerCallContext
Expand Down Expand Up @@ -81,4 +79,3 @@ public static TestServerCallContext Create(Metadata? requestHeaders = null, Canc
}
}
}
#pragma warning restore CS8764 // Nullability of return type doesn't match overridden member (possibly because of nullability attributes).
16 changes: 11 additions & 5 deletions examples/Tester/Tests/Server/UnitTests/Helpers/TestServerStreamWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#region Copyright notice and license
#region Copyright notice and license

// Copyright 2019 The gRPC Authors
//
Expand All @@ -22,8 +22,6 @@
using System.Threading.Tasks;
using Grpc.Core;

// TODO(JamesNK): Remove nullable override after Grpc.Core.Api update
#pragma warning disable CS8766 // Nullability of reference types in return type doesn't match implicitly implemented member (possibly because of nullability attributes).
namespace Tests.Server.UnitTests.Helpers
{
public class TestServerStreamWriter<T> : IServerStreamWriter<T> where T : class
Expand Down Expand Up @@ -63,8 +61,12 @@ public IAsyncEnumerable<T> ReadAllAsync()
}
}

public Task WriteAsync(T message)
public Task WriteAsync(T message, CancellationToken cancellationToken)
{
if (cancellationToken.IsCancellationRequested)
{
return Task.FromCanceled(cancellationToken);
}
if (_serverCallContext.CancellationToken.IsCancellationRequested)
{
return Task.FromCanceled(_serverCallContext.CancellationToken);
Expand All @@ -77,6 +79,10 @@ public Task WriteAsync(T message)

return Task.CompletedTask;
}

public Task WriteAsync(T message)
{
return WriteAsync(message, CancellationToken.None);
}
}
}
#pragma warning restore CS8766 // Nullability of reference types in return type doesn't match implicitly implemented member (possibly because of nullability attributes).