reviewer feedback

2 files changed, 24 insertions, 30 deletions

diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc
index 78964b2d72..64de05bc0a 100644
--- a/test/core/channel/channel_trace_test.cc
+++ b/test/core/channel/channel_trace_test.cc
@@ -99,8 +99,7 @@ void ValidateTraceDataMatchedUuidLookup(RefCountedPtr<ChannelTrace> tracer) {
   intptr_t uuid = tracer->GetUuid();
   if (uuid == -1) return;  // Doesn't make sense to lookup if tracing disabled
   char* tracer_json_str = tracer->RenderTrace();
-  ChannelTrace* uuid_lookup =
-      ChannelzRegistry::Default()->Get<ChannelTrace>(uuid);
+  ChannelTrace* uuid_lookup = ChannelzRegistry::Get<ChannelTrace>(uuid);
   char* uuid_lookup_json_str = uuid_lookup->RenderTrace();
   EXPECT_EQ(strcmp(tracer_json_str, uuid_lookup_json_str), 0);
   gpr_free(tracer_json_str);
diff --git a/test/core/channel/channelz_registry_test.cc b/test/core/channel/channelz_registry_test.cc
index 58e10c6522..44bb17be2c 100644
--- a/test/core/channel/channelz_registry_test.cc
+++ b/test/core/channel/channelz_registry_test.cc
@@ -43,12 +43,12 @@ namespace testing {
 // lookups by uuid.
 TEST(ChannelzRegistryTest, UuidStartsAboveZeroTest) {
   int object_to_register;
-  intptr_t uuid = ChannelzRegistry::Default()->Register(&object_to_register);
-  ASSERT_GT(uuid, 0) << "First uuid chose must be greater than zero. Zero if "
+  intptr_t uuid = ChannelzRegistry::Register(&object_to_register);
+  EXPECT_GT(uuid, 0) << "First uuid chose must be greater than zero. Zero if "
                         "reserved according to "
                         "https://github.com/grpc/proposal/blob/master/"
                         "A14-channelz.md";
-  ChannelzRegistry::Default()->Unregister(uuid);
+  ChannelzRegistry::Unregister(uuid);
 }
 
 TEST(ChannelzRegistryTest, UuidsAreIncreasing) {
@@ -56,33 +56,29 @@ TEST(ChannelzRegistryTest, UuidsAreIncreasing) {
   std::vector<intptr_t> uuids;
   for (int i = 0; i < 10; ++i) {
     // reregister the same object. It's ok since we are just testing uuids
-    uuids.push_back(ChannelzRegistry::Default()->Register(&object_to_register));
+    uuids.push_back(ChannelzRegistry::Register(&object_to_register));
   }
   for (size_t i = 1; i < uuids.size(); ++i) {
-    ASSERT_LT(uuids[i - 1], uuids[i]) << "Uuids must always be increasing";
+    EXPECT_LT(uuids[i - 1], uuids[i]) << "Uuids must always be increasing";
   }
 }
 
 TEST(ChannelzRegistryTest, RegisterGetTest) {
   int object_to_register = 42;
-  intptr_t uuid = ChannelzRegistry::Default()->Register(&object_to_register);
-  int* retrieved = ChannelzRegistry::Default()->Get<int>(uuid);
-  ASSERT_EQ(object_to_register, *retrieved);
-  ASSERT_EQ(&object_to_register, retrieved);
+  intptr_t uuid = ChannelzRegistry::Register(&object_to_register);
+  int* retrieved = ChannelzRegistry::Get<int>(uuid);
+  EXPECT_EQ(&object_to_register, retrieved);
 }
 
 TEST(ChannelzRegistryTest, MultipleTypeTest) {
   int int_to_register = 42;
-  intptr_t int_uuid = ChannelzRegistry::Default()->Register(&int_to_register);
+  intptr_t int_uuid = ChannelzRegistry::Register(&int_to_register);
   std::string str_to_register = "hello world";
-  intptr_t str_uuid = ChannelzRegistry::Default()->Register(&str_to_register);
-  int* retrieved_int = ChannelzRegistry::Default()->Get<int>(int_uuid);
-  std::string* retrieved_str =
-      ChannelzRegistry::Default()->Get<std::string>(str_uuid);
-  ASSERT_EQ(int_to_register, *retrieved_int);
-  ASSERT_EQ(&int_to_register, retrieved_int);
-  ASSERT_STREQ(str_to_register.c_str(), (*retrieved_str).c_str());
-  ASSERT_EQ(&str_to_register, retrieved_str);
+  intptr_t str_uuid = ChannelzRegistry::Register(&str_to_register);
+  int* retrieved_int = ChannelzRegistry::Get<int>(int_uuid);
+  std::string* retrieved_str = ChannelzRegistry::Get<std::string>(str_uuid);
+  EXPECT_EQ(&int_to_register, retrieved_int);
+  EXPECT_EQ(&str_to_register, retrieved_str);
 }
 
 namespace {
@@ -95,21 +91,20 @@ class Foo {
 TEST(ChannelzRegistryTest, CustomObjectTest) {
   Foo* foo = New<Foo>();
   foo->bar = 1024;
-  intptr_t uuid = ChannelzRegistry::Default()->Register(foo);
-  Foo* retrieved = ChannelzRegistry::Default()->Get<Foo>(uuid);
-  ASSERT_EQ(foo, retrieved);
-  ASSERT_EQ(foo->bar, retrieved->bar);
+  intptr_t uuid = ChannelzRegistry::Register(foo);
+  Foo* retrieved = ChannelzRegistry::Get<Foo>(uuid);
+  EXPECT_EQ(foo, retrieved);
 }
 
 TEST(ChannelzRegistryTest, NullIfNotPresentTest) {
   int object_to_register = 42;
-  intptr_t uuid = ChannelzRegistry::Default()->Register(&object_to_register);
+  intptr_t uuid = ChannelzRegistry::Register(&object_to_register);
   // try to pull out a uuid that does not exist.
-  int* nonexistant = ChannelzRegistry::Default()->Get<int>(1234);
-  ASSERT_EQ(nonexistant, nullptr);
-  int* retrieved = ChannelzRegistry::Default()->Get<int>(uuid);
-  ASSERT_EQ(object_to_register, *retrieved);
-  ASSERT_EQ(&object_to_register, retrieved);
+  int* nonexistant = ChannelzRegistry::Get<int>(uuid + 1);
+  EXPECT_EQ(nonexistant, nullptr);
+  int* retrieved = ChannelzRegistry::Get<int>(uuid);
+  EXPECT_EQ(object_to_register, *retrieved);
+  EXPECT_EQ(&object_to_register, retrieved);
 }
 
 }  // namespace testing