diff options
author | 2015-08-12 19:53:03 +0200 | |
---|---|---|
committer | 2015-08-12 19:53:03 +0200 | |
commit | 9b6248fc6d3be0e3970e19138bedd0655e4565e8 (patch) | |
tree | ee2852ba33f5638d9d3973c944ccc604b5e6fb99 /src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs | |
parent | b457cd831ad519d5ec023005ba6ccfb52ff4c9cb (diff) | |
parent | 3b226512d4aa84d58e1e61ce3f9adb9315f2d619 (diff) |
Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown
Conflicts:
src/node/ext/call.cc
src/node/ext/channel.cc
Diffstat (limited to 'src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs')
-rw-r--r-- | src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs b/src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs index df09857efe..52be77c846 100644 --- a/src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs +++ b/src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs @@ -67,9 +67,9 @@ namespace Grpc.Core.Internal.Tests [Test] public void ConstructorPreconditions() { - Assert.Throws(typeof(NullReferenceException), () => { new ChannelOption(null, "abc"); }); - Assert.Throws(typeof(NullReferenceException), () => { new ChannelOption(null, 1); }); - Assert.Throws(typeof(NullReferenceException), () => { new ChannelOption("abc", null); }); + Assert.Throws(typeof(ArgumentNullException), () => { new ChannelOption(null, "abc"); }); + Assert.Throws(typeof(ArgumentNullException), () => { new ChannelOption(null, 1); }); + Assert.Throws(typeof(ArgumentNullException), () => { new ChannelOption("abc", null); }); } [Test] |