diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-08-13 10:31:05 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-08-13 10:31:05 -0700 |
| commit | 46e85b02cda4ad4d549e444b78d1e74a3021a9d9 (patch) | |
| tree | 51bccc374623625a19a5fb53df60bc08c2c7713e /src/csharp/Grpc.HealthCheck.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.HealthCheck.Tests')
| -rw-r--r-- | src/csharp/Grpc.HealthCheck.Tests/HealthServiceImplTest.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/csharp/Grpc.HealthCheck.Tests/HealthServiceImplTest.cs b/src/csharp/Grpc.HealthCheck.Tests/HealthServiceImplTest.cs index 04660cd396..8de8645cd1 100644 --- a/src/csharp/Grpc.HealthCheck.Tests/HealthServiceImplTest.cs +++ b/src/csharp/Grpc.HealthCheck.Tests/HealthServiceImplTest.cs @@ -92,11 +92,11 @@ namespace Grpc.HealthCheck.Tests public void NullsRejected() { var impl = new HealthServiceImpl(); - Assert.Throws(typeof(NullReferenceException), () => impl.SetStatus(null, "", HealthCheckResponse.Types.ServingStatus.SERVING)); - Assert.Throws(typeof(NullReferenceException), () => impl.SetStatus("", null, HealthCheckResponse.Types.ServingStatus.SERVING)); + Assert.Throws(typeof(ArgumentNullException), () => impl.SetStatus(null, "", HealthCheckResponse.Types.ServingStatus.SERVING)); + Assert.Throws(typeof(ArgumentNullException), () => impl.SetStatus("", null, HealthCheckResponse.Types.ServingStatus.SERVING)); - Assert.Throws(typeof(NullReferenceException), () => impl.ClearStatus(null, "")); - Assert.Throws(typeof(NullReferenceException), () => impl.ClearStatus("", null)); + Assert.Throws(typeof(ArgumentNullException), () => impl.ClearStatus(null, "")); + Assert.Throws(typeof(ArgumentNullException), () => impl.ClearStatus("", null)); } private static HealthCheckResponse.Types.ServingStatus GetStatusHelper(HealthServiceImpl impl, string host, string service) |