diff options
author | 2015-05-08 10:12:52 -0700 | |
---|---|---|
committer | 2015-05-08 10:12:52 -0700 | |
commit | 1c51f550deb9d29d468e6eb74ae157ddbac129f3 (patch) | |
tree | 97232cdc820feb3802d15d0b0ea1c1c8d0c5cdf2 /src/csharp/Grpc.Examples.Tests | |
parent | e84b6180dcbadc133af1b01a9b680eabfaa7da35 (diff) | |
parent | 7a24ecb303f9f13c9ca2cffeb9422b5083a88400 (diff) |
Merge branch 'master' of github.com:grpc/grpc into csharp_cleanup
Conflicts:
src/csharp/Grpc.Examples/MathGrpc.cs
Diffstat (limited to 'src/csharp/Grpc.Examples.Tests')
-rw-r--r-- | src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs b/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs index b0f09dd881..4997d3aa42 100644 --- a/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs +++ b/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs @@ -49,7 +49,7 @@ namespace math.Tests string host = "localhost"; Server server; Channel channel; - MathGrpc.IMathServiceClient client; + Math.IMathClient client; [TestFixtureSetUp] public void Init() @@ -57,7 +57,7 @@ namespace math.Tests GrpcEnvironment.Initialize(); server = new Server(); - server.AddServiceDefinition(MathGrpc.BindService(new MathServiceImpl())); + server.AddServiceDefinition(Math.BindService(new MathServiceImpl())); int port = server.AddListeningPort(host, Server.PickUnusedPort); server.Start(); channel = new Channel(host + ":" + port); @@ -68,7 +68,7 @@ namespace math.Tests { headerBuilder.Add(new Metadata.MetadataEntry("customHeader", "abcdef")); }); - client = MathGrpc.NewStub(channel, stubConfig); + client = Math.NewStub(channel, stubConfig); } [TestFixtureTearDown] |