From 32fde7af294808f43dc92749b1c008eaba5f65b9 Mon Sep 17 00:00:00 2001
From: Jorge Canizales <jcanizales@google.com>
Date: Fri, 29 Jul 2016 17:31:07 -0700
Subject: [PATCH] Better names for the methods to clear all host settings
---
src/objective-c/GRPCClient/GRPCCall+Tests.h | 2 +-
src/objective-c/GRPCClient/GRPCCall+Tests.m | 4 ++--
src/objective-c/GRPCClient/private/GRPCHost.h | 2 +-
src/objective-c/GRPCClient/private/GRPCHost.m | 2 +-
src/objective-c/tests/InteropTests.m | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/objective-c/GRPCClient/GRPCCall+Tests.h b/src/objective-c/GRPCClient/GRPCCall+Tests.h
index fe2c360477..184ad09c5c 100644
--- a/src/objective-c/GRPCClient/GRPCCall+Tests.h
+++ b/src/objective-c/GRPCClient/GRPCCall+Tests.h
@@ -62,5 +62,5 @@
* Resets all host configurations to their default values, and flushes all connections from the
* cache.
*/
-+ (void)clearAllConfigurationsForTesting;
++ (void)resetHostSettings;
@end
diff --git a/src/objective-c/GRPCClient/GRPCCall+Tests.m b/src/objective-c/GRPCClient/GRPCCall+Tests.m
index 44d42f382c..656cba8fec 100644
--- a/src/objective-c/GRPCClient/GRPCCall+Tests.m
+++ b/src/objective-c/GRPCClient/GRPCCall+Tests.m
@@ -61,7 +61,7 @@
hostConfig.secure = NO;
}
-+ (void)clearAllConfigurationsForTesting {
- [GRPCHost clearAllHostsForTesting];
++ (void)resetHostSettings {
+ [GRPCHost resetAllHostSettings];
}
@end
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.h b/src/objective-c/GRPCClient/private/GRPCHost.h
index 48fe7854ff..c8b5dd315b 100644
--- a/src/objective-c/GRPCClient/private/GRPCHost.h
+++ b/src/objective-c/GRPCClient/private/GRPCHost.h
@@ -42,7 +42,7 @@ struct grpc_channel_credentials;
@interface GRPCHost : NSObject
+ (void)flushChannelCache;
-+ (void)clearAllHostsForTesting;
++ (void)resetAllHostSettings;
@property(nonatomic, readonly) NSString *address;
@property(nonatomic, copy, nullable) NSString *userAgentPrefix;
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m
index b46c24212b..477ddf51d9 100644
--- a/src/objective-c/GRPCClient/private/GRPCHost.m
+++ b/src/objective-c/GRPCClient/private/GRPCHost.m
@@ -113,7 +113,7 @@ static NSMutableDictionary *kHostCache;
}
}
-+ (void)clearAllHostsForTesting {
++ (void)resetAllHostSettings {
@synchronized (kHostCache) {
kHostCache = [NSMutableDictionary dictionary];
}
diff --git a/src/objective-c/tests/InteropTests.m b/src/objective-c/tests/InteropTests.m
index 67ab43329f..1ae0d7a848 100644
--- a/src/objective-c/tests/InteropTests.m
+++ b/src/objective-c/tests/InteropTests.m
@@ -91,7 +91,7 @@
- (void)setUp {
self.continueAfterFailure = NO;
- [GRPCCall clearAllConfigurationsForTesting];
+ [GRPCCall resetHostSettings];
_service = self.class.host ? [RMTTestService serviceWithHost:self.class.host] : nil;
#ifdef GRPC_COMPILE_WITH_CRONET
--
GitLab