Skip to content

Commit e02fd18

Browse files
JamesNKJamesNK
authored
Update Grpc dependency to 2.30.0-pre1 (#945)
* Update Grpc dependency to 2.30.0-pre1 * Use Metadata helper methods
1 parent ba05ea1 commit e02fd18

File tree

10 files changed

+33
-42
lines changed

10 files changed

+33
-42
lines changed

‎build/dependencies.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
33
<BenchmarkDotNetPackageVersion>0.12.1</BenchmarkDotNetPackageVersion>
4-
<GoogleProtobufPackageVersion>3.11.4</GoogleProtobufPackageVersion>
4+
<GoogleProtobufPackageVersion>3.12.2</GoogleProtobufPackageVersion>
55
<GrpcDotNetPackageVersion>2.29.0</GrpcDotNetPackageVersion> <!-- Used by example projects -->
6-
<GrpcPackageVersion>2.29.0</GrpcPackageVersion>
6+
<GrpcPackageVersion>2.30.0-pre1</GrpcPackageVersion>
77
<MicrosoftAspNetCorePackageVersion>3.1.3</MicrosoftAspNetCorePackageVersion>
88
<MicrosoftAspNetCoreBlazorPackageVersion>3.2.0</MicrosoftAspNetCoreBlazorPackageVersion>
99
<MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>

‎test/FunctionalTests/Client/StreamingTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ async Task ServerStreamingWithTrailers(DataMessage request, IServerStreamWriter<
453453

454454
var trailers = call.GetTrailers();
455455
Assert.AreEqual(1, trailers.Count);
456-
Assert.AreEqual("value", trailers.First(e => e.Key == "my-trailer").Value);
456+
Assert.AreEqual("value", trailers.GetValue("my-trailer"));
457457

458458
Assert.AreEqual(StatusCode.OK, call.GetStatus().StatusCode);
459459
}
@@ -491,7 +491,7 @@ await context.WriteResponseHeadersAsync(new Metadata
491491

492492
// Assert
493493
var headers = await call.ResponseHeadersAsync;
494-
var keyHeaders = headers.Where(k => k.Key == "key").ToList();
494+
var keyHeaders = headers.GetAll("key").ToList();
495495
Assert.AreEqual("key", keyHeaders[0].Key);
496496
Assert.AreEqual("Value1", keyHeaders[0].Value);
497497
Assert.AreEqual("key", keyHeaders[1].Key);

‎test/FunctionalTests/Client/TrailerMetadataTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ Task<HelloReply> UnaryDeadlineExceeded(HelloRequest request, ServerCallContext c
6666
// Assert
6767
var trailers = call.GetTrailers();
6868
Assert.AreEqual(1, trailers.Count);
69-
Assert.AreEqual("the value was empty", trailers.Single(m => m.Key == "name").Value);
69+
Assert.AreEqual("the value was empty", trailers.GetValue("name"));
7070

7171
Assert.AreEqual(StatusCode.InvalidArgument, ex.StatusCode);
7272
Assert.AreEqual("Validation failed", ex.Status.Detail);
7373
Assert.AreEqual(1, ex.Trailers.Count);
74-
Assert.AreEqual("the value was empty", ex.Trailers.Single(m => m.Key == "name").Value);
74+
Assert.AreEqual("the value was empty", ex.Trailers.GetValue("name"));
7575
}
7676

7777
[Test]
@@ -111,12 +111,12 @@ Task<HelloReply> UnaryDeadlineExceeded(HelloRequest request, ServerCallContext c
111111
// Assert
112112
var trailers = call.GetTrailers();
113113
Assert.GreaterOrEqual(trailers.Count, 1);
114-
Assert.AreEqual("the value was empty", trailers.Single(m => m.Key == "name").Value);
114+
Assert.AreEqual("the value was empty", trailers.GetValue("name"));
115115

116116
Assert.AreEqual(StatusCode.InvalidArgument, ex.StatusCode);
117117
Assert.AreEqual("Validation failed", ex.Status.Detail);
118118
Assert.GreaterOrEqual(ex.Trailers.Count, 1);
119-
Assert.AreEqual("the value was empty", ex.Trailers.Single(m => m.Key == "name").Value);
119+
Assert.AreEqual("the value was empty", ex.Trailers.GetValue("name"));
120120

121121
AssertHasLogRpcConnectionError(StatusCode.InvalidArgument, "Validation failed");
122122
}
@@ -161,12 +161,12 @@ async Task UnaryDeadlineExceeded(HelloRequest request, IAsyncStreamWriter<HelloR
161161
// Assert
162162
var trailers = call.GetTrailers();
163163
Assert.AreEqual(1, trailers.Count);
164-
Assert.AreEqual("the value was empty", trailers.Single(m => m.Key == "name").Value);
164+
Assert.AreEqual("the value was empty", trailers.GetValue("name"));
165165

166166
Assert.AreEqual(StatusCode.InvalidArgument, ex.StatusCode);
167167
Assert.AreEqual("Validation failed", ex.Status.Detail);
168168
Assert.AreEqual(1, ex.Trailers.Count);
169-
Assert.AreEqual("the value was empty", ex.Trailers.Single(m => m.Key == "name").Value);
169+
Assert.AreEqual("the value was empty", ex.Trailers.GetValue("name"));
170170
}
171171

172172
[Test]
@@ -210,12 +210,12 @@ async Task UnaryDeadlineExceeded(HelloRequest request, IAsyncStreamWriter<HelloR
210210
// Assert
211211
var trailers = call.GetTrailers();
212212
Assert.GreaterOrEqual(trailers.Count, 1);
213-
Assert.AreEqual("the value was empty", trailers.Single(m => m.Key == "name").Value);
213+
Assert.AreEqual("the value was empty", trailers.GetValue("name"));
214214

215215
Assert.AreEqual(StatusCode.InvalidArgument, ex.StatusCode);
216216
Assert.AreEqual("Validation failed", ex.Status.Detail);
217217
Assert.GreaterOrEqual(ex.Trailers.Count, 1);
218-
Assert.AreEqual("the value was empty", ex.Trailers.Single(m => m.Key == "name").Value);
218+
Assert.AreEqual("the value was empty", ex.Trailers.GetValue("name"));
219219

220220
AssertHasLogRpcConnectionError(StatusCode.InvalidArgument, "Validation failed");
221221
}

‎test/FunctionalTests/Web/Client/TrailerMetadataTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Task<HelloReply> LargeTrailer(HelloRequest request, ServerCallContext context)
6363
// Assert
6464
var trailers = call.GetTrailers();
6565
Assert.AreEqual(1, trailers.Count);
66-
Assert.AreEqual(trailerValue, trailers.Single(m => m.Key == "name").Value);
66+
Assert.AreEqual(trailerValue, trailers.GetValue("name"));
6767
}
6868

6969
[Test]

‎test/Grpc.Net.Client.Tests/GetTrailersTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public async Task AsyncUnaryCall_MessageReturned_ReturnsTrailers()
5757

5858
// Assert
5959
Assert.AreSame(trailers1, trailers2);
60-
Assert.AreEqual("value", trailers1.Single(t => t.Key == "custom-header").Value);
60+
Assert.AreEqual("value", trailers1.GetValue("custom-header"));
6161
}
6262

6363
[Test]
@@ -80,7 +80,7 @@ public async Task AsyncUnaryCall_HeadersReturned_ReturnsTrailers()
8080
var trailers = call.GetTrailers();
8181

8282
// Assert
83-
Assert.AreEqual("value", trailers.Single(t => t.Key == "custom-header").Value);
83+
Assert.AreEqual("value", trailers.GetValue("custom-header"));
8484
}
8585

8686
[Test]
@@ -229,7 +229,7 @@ public async Task AsyncServerStreamingCall_FinishedReader_ReturnsTrailers()
229229
var trailers = call.GetTrailers();
230230

231231
// Assert
232-
Assert.AreEqual("value", trailers.Single(t => t.Key == "custom-header").Value);
232+
Assert.AreEqual("value", trailers.GetValue("custom-header"));
233233
}
234234

235235
[Test]
@@ -269,7 +269,7 @@ public async Task AsyncClientStreamingCall_CompleteWriter_ReturnsTrailers()
269269
var trailers = call.GetTrailers();
270270

271271
// Assert
272-
Assert.AreEqual("value", trailers.Single(t => t.Key == "custom-header").Value);
272+
Assert.AreEqual("value", trailers.GetValue("custom-header"));
273273
}
274274

275275
[Test]

‎test/Grpc.Net.Client.Tests/ResponseAsyncTests.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ public async Task AsyncUnaryCall_DisposeAfterHeadersAndBeforeMessage_ThrowsError
9090
Assert.AreEqual(StatusCode.Cancelled, ex.StatusCode);
9191
Assert.AreEqual(StatusCode.Cancelled, call.GetStatus().StatusCode);
9292

93-
var header = responseHeaders.Single(h => h.Key == "custom");
94-
Assert.AreEqual("value!", header.Value);
93+
Assert.AreEqual("value!", responseHeaders.GetValue("custom"));
9594
}
9695

9796
[Test]
@@ -117,8 +116,7 @@ public async Task AsyncUnaryCall_DisposeAfterHeadersAndBeforeMessage_ThrowOperat
117116
await ExceptionAssert.ThrowsAsync<TaskCanceledException>(() => call.ResponseAsync).DefaultTimeout();
118117
Assert.AreEqual(StatusCode.Cancelled, call.GetStatus().StatusCode);
119118

120-
var header = responseHeaders.Single(h => h.Key == "custom");
121-
Assert.AreEqual("value!", header.Value);
119+
Assert.AreEqual("value!", responseHeaders.GetValue("custom"));
122120
}
123121

124122
[Test]

‎test/Grpc.Net.Client.Tests/ResponseHeadersAsyncTests.cs‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,11 @@ public async Task AsyncUnaryCall_Success_ResponseHeadersPopulated()
6262
// Assert
6363
Assert.AreSame(responseHeaders1, responseHeaders2);
6464

65-
var header = responseHeaders1.Single(h => h.Key == "server");
66-
Assert.AreEqual("TestName/1.0", header.Value);
65+
Assert.AreEqual("TestName/1.0", responseHeaders1.GetValue("server"));
6766

68-
header = responseHeaders1.Single(h => h.Key == "custom");
69-
Assert.AreEqual("ABC", header.Value);
67+
Assert.AreEqual("ABC", responseHeaders1.GetValue("custom"));
7068

71-
header = responseHeaders1.Single(h => h.Key == "binary-bin");
69+
var header = responseHeaders1.Get("binary-bin");
7270
Assert.AreEqual(true, header.IsBinary);
7371
CollectionAssert.AreEqual(Encoding.UTF8.GetBytes("Hello world"), header.ValueBytes);
7472
}
@@ -91,8 +89,7 @@ public async Task AsyncClientStreamingCall_Success_ResponseHeadersPopulated()
9189
var responseHeaders = await call.ResponseHeadersAsync.DefaultTimeout();
9290

9391
// Assert
94-
var header = responseHeaders.Single(h => h.Key == "custom");
95-
Assert.AreEqual("ABC", header.Value);
92+
Assert.AreEqual("ABC", responseHeaders.GetValue("custom"));
9693
}
9794

9895
[Test]
@@ -113,8 +110,7 @@ public async Task AsyncDuplexStreamingCall_Success_ResponseHeadersPopulated()
113110
var responseHeaders = await call.ResponseHeadersAsync.DefaultTimeout();
114111

115112
// Assert
116-
var header = responseHeaders.Single(h => h.Key == "custom");
117-
Assert.AreEqual("ABC", header.Value);
113+
Assert.AreEqual("ABC", responseHeaders.GetValue("custom"));
118114
}
119115

120116
[Test]
@@ -135,8 +131,7 @@ public async Task AsyncServerStreamingCall_Success_ResponseHeadersPopulated()
135131
var responseHeaders = await call.ResponseHeadersAsync.DefaultTimeout();
136132

137133
// Assert
138-
var header = responseHeaders.Single(h => h.Key == "custom");
139-
Assert.AreEqual("ABC", header.Value);
134+
Assert.AreEqual("ABC", responseHeaders.GetValue("custom"));
140135
}
141136

142137
[Test]
@@ -231,8 +226,7 @@ public async Task AsyncClientStreamingCall_NotFoundStatus_ResponseHeadersPopulat
231226
var responseHeaders = await call.ResponseHeadersAsync.DefaultTimeout();
232227

233228
// Assert
234-
var header = responseHeaders.Single(h => h.Key == "custom");
235-
Assert.AreEqual("ABC", header.Value);
229+
Assert.AreEqual("ABC", responseHeaders.GetValue("custom"));
236230
}
237231

238232
[Test]
@@ -253,8 +247,7 @@ public async Task AsyncClientStreamingCall_InvalidContentType_ResponseHeadersPop
253247
var responseHeaders = await call.ResponseHeadersAsync.DefaultTimeout();
254248

255249
// Assert
256-
var header = responseHeaders.Single(h => h.Key == "custom");
257-
Assert.AreEqual("ABC", header.Value);
250+
Assert.AreEqual("ABC", responseHeaders.GetValue("custom"));
258251
}
259252
}
260253
}

‎testassets/FunctionalTestsWebsite/Services/RacerService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class RacerService : Racer.RacerBase
2929
{
3030
public override async Task ReadySetGo(IAsyncStreamReader<RaceMessage> requestStream, IServerStreamWriter<RaceMessage> responseStream, ServerCallContext context)
3131
{
32-
var raceDuration = TimeSpan.Parse(context.RequestHeaders.Single(h => h.Key == "race-duration").Value);
32+
var raceDuration = TimeSpan.Parse(context.RequestHeaders.GetValue("race-duration"));
3333

3434
// Read incoming messages in a background task
3535
RaceMessage? lastMessageReceived = null;

‎testassets/FunctionalTestsWebsite/Services/StreamService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public override async Task EchoAllData(
7474
IServerStreamWriter<DataMessage> responseStream,
7575
ServerCallContext context)
7676
{
77-
var flushHeaders = context.RequestHeaders.Any(x => x.Key == "flush-headers");
77+
var flushHeaders = context.RequestHeaders.Get("flush-headers") != null;
7878
if (flushHeaders)
7979
{
8080
await context.WriteResponseHeadersAsync(new Metadata());

‎testassets/Shared/InteropClient.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ public static async Task RunCustomMetadataAsync(IChannelWrapper channel, ClientO
551551
var responseHeaders = await call.ResponseHeadersAsync;
552552
var responseTrailers = call.GetTrailers();
553553

554-
Assert.AreEqual("test_initial_metadata_value", responseHeaders.First((entry) => entry.Key == "x-grpc-test-echo-initial").Value);
555-
CollectionAssert.AreEqual(new byte[] { 0xab, 0xab, 0xab }, responseTrailers.First((entry) => entry.Key == "x-grpc-test-echo-trailing-bin").ValueBytes);
554+
Assert.AreEqual("test_initial_metadata_value", responseHeaders.GetValue("x-grpc-test-echo-initial"));
555+
CollectionAssert.AreEqual(new byte[] { 0xab, 0xab, 0xab }, responseTrailers.GetValueBytes("x-grpc-test-echo-trailing-bin"));
556556
}
557557

558558
{
@@ -572,8 +572,8 @@ public static async Task RunCustomMetadataAsync(IChannelWrapper channel, ClientO
572572
var responseHeaders = await call.ResponseHeadersAsync;
573573
var responseTrailers = call.GetTrailers();
574574

575-
Assert.AreEqual("test_initial_metadata_value", responseHeaders.First((entry) => entry.Key == "x-grpc-test-echo-initial").Value);
576-
CollectionAssert.AreEqual(new byte[] { 0xab, 0xab, 0xab }, responseTrailers.First((entry) => entry.Key == "x-grpc-test-echo-trailing-bin").ValueBytes);
575+
Assert.AreEqual("test_initial_metadata_value", responseHeaders.GetValue("x-grpc-test-echo-initial"));
576+
CollectionAssert.AreEqual(new byte[] { 0xab, 0xab, 0xab }, responseTrailers.GetValueBytes("x-grpc-test-echo-trailing-bin"));
577577
}
578578
}
579579

0 commit comments

Comments
 (0)