diff options
author | 2015-08-13 10:31:05 -0700 | |
---|---|---|
committer | 2015-08-13 10:31:05 -0700 | |
commit | 46e85b02cda4ad4d549e444b78d1e74a3021a9d9 (patch) | |
tree | 51bccc374623625a19a5fb53df60bc08c2c7713e /src/csharp/Grpc.Examples.Tests | |
parent | 58d637444187f36181d3662e85e42aa1d23af92a (diff) | |
parent | 58d7310fbc291d2afa9cbb100544fc5c96cd3249 (diff) |
Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3
Conflicts:
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
src/csharp/Grpc.IntegrationTesting/InteropClient.cs
src/csharp/Grpc.IntegrationTesting/packages.config
src/csharp/build_packages.bat
Diffstat (limited to 'src/csharp/Grpc.Examples.Tests')
-rw-r--r-- | src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs b/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs index a2348defc3..91c82b586b 100644 --- a/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs +++ b/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs @@ -92,15 +92,8 @@ namespace Math.Tests [Test] public void DivByZero() { - try - { - DivReply response = client.Div(new DivArgs { Dividend = 0, Divisor = 0 }); - Assert.Fail(); - } - catch (RpcException e) - { - Assert.AreEqual(StatusCode.Unknown, e.Status.StatusCode); - } + var ex = Assert.Throws<RpcException>(() => client.Div(new DivArgs { Dividend = 0, Divisor = 0 })); + Assert.AreEqual(StatusCode.Unknown, ex.Status.StatusCode); } [Test] @@ -116,7 +109,7 @@ namespace Math.Tests { using (var call = client.Fib(new FibArgs { Limit = 6 })) { - var responses = await call.ResponseStream.ToList(); + var responses = await call.ResponseStream.ToListAsync(); CollectionAssert.AreEqual(new List<long> { 1, 1, 2, 3, 5, 8 }, responses.ConvertAll((n) => n.Num_)); } @@ -157,15 +150,10 @@ namespace Math.Tests using (var call = client.Fib(new FibArgs { Limit = 0 }, deadline: DateTime.UtcNow.AddMilliseconds(500))) { - try - { - await call.ResponseStream.ToList(); - Assert.Fail(); - } - catch (RpcException e) - { - Assert.AreEqual(StatusCode.DeadlineExceeded, e.Status.StatusCode); - } + var ex = Assert.Throws<RpcException>(async () => await call.ResponseStream.ToListAsync()); + + // We can't guarantee the status code always DeadlineExceeded. See issue #2685. + Assert.Contains(ex.Status.StatusCode, new[] { StatusCode.DeadlineExceeded, StatusCode.Internal }); } } @@ -177,7 +165,7 @@ namespace Math.Tests { var numbers = new List<long> { 10, 20, 30 }.ConvertAll(n => new Num{ Num_ = n }); - await call.RequestStream.WriteAll(numbers); + await call.RequestStream.WriteAllAsync(numbers); var result = await call.ResponseAsync; Assert.AreEqual(60, result.Num_); } @@ -195,8 +183,8 @@ namespace Math.Tests using (var call = client.DivMany()) { - await call.RequestStream.WriteAll(divArgsList); - var result = await call.ResponseStream.ToList(); + await call.RequestStream.WriteAllAsync(divArgsList); + var result = await call.ResponseStream.ToListAsync(); CollectionAssert.AreEqual(new long[] { 3, 4, 3 }, result.ConvertAll((divReply) => divReply.Quotient)); CollectionAssert.AreEqual(new long[] { 1, 16, 1 }, result.ConvertAll((divReply) => divReply.Remainder)); |