commit 6bdcc373ac7e633af04f180a96f0ed8df5d4b8b2
author Austin Schuh <austin.linux@gmail.com> Thu Jun 27 14:49:11 2024 -0700
committer Austin Schuh <austin.linux@gmail.com> Wed Jul 10 12:21:13 2024 -0700
tree 65ccbe993ae76d55506f89886895a5bf9a3ecb76
parent 93a83a2377a6785ebd40de83aa3953c3366134b1

Remove usage of CHECK_NOTNULL

We want to switch to absl logging instead of glog.  gtest and ceres are
going there, and we already have absl as a dependency.  ABSL doesn't
have CHECK_NOTNULL, and we can move things over in an easier to review
fashion.

Change-Id: Ifd9a11ec34a2357cec43f88dba015db9c28ed2cf
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

aos/configuration_test.cc

diff --git a/aos/configuration_test.cc b/aos/configuration_test.cc
index da96402..d980dad 100644
--- a/aos/configuration_test.cc
+++ b/aos/configuration_test.cc
@@ -979,14 +979,16 @@
 TEST_F(ConfigurationTest, GetNodeFromHostname) {
   FlatbufferDetachedBuffer<Configuration> config =
       ReadConfig(ArtifactPath("aos/testdata/good_multinode.json"));
-  EXPECT_EQ("pi1",
-            CHECK_NOTNULL(GetNodeFromHostname(&config.message(), "raspberrypi"))
-                ->name()
-                ->string_view());
-  EXPECT_EQ("pi2", CHECK_NOTNULL(
-                       GetNodeFromHostname(&config.message(), "raspberrypi2"))
-                       ->name()
-                       ->string_view());
+  {
+    const Node *pi1 = GetNodeFromHostname(&config.message(), "raspberrypi");
+    ASSERT_TRUE(pi1 != nullptr);
+    EXPECT_EQ("pi1", pi1->name()->string_view());
+  }
+  {
+    const Node *pi2 = GetNodeFromHostname(&config.message(), "raspberrypi2");
+    ASSERT_TRUE(pi2 != nullptr);
+    EXPECT_EQ("pi2", pi2->name()->string_view());
+  }
   EXPECT_EQ(nullptr, GetNodeFromHostname(&config.message(), "raspberrypi3"));
   EXPECT_EQ(nullptr, GetNodeFromHostname(&config.message(), "localhost"));
   EXPECT_EQ(nullptr, GetNodeFromHostname(&config.message(), "3"));
@@ -995,22 +997,26 @@
 TEST_F(ConfigurationTest, GetNodeFromHostnames) {
   FlatbufferDetachedBuffer<Configuration> config =
       ReadConfig(ArtifactPath("aos/testdata/good_multinode_hostnames.json"));
-  EXPECT_EQ("pi1",
-            CHECK_NOTNULL(GetNodeFromHostname(&config.message(), "raspberrypi"))
-                ->name()
-                ->string_view());
-  EXPECT_EQ("pi2", CHECK_NOTNULL(
-                       GetNodeFromHostname(&config.message(), "raspberrypi2"))
-                       ->name()
-                       ->string_view());
-  EXPECT_EQ("pi2", CHECK_NOTNULL(
-                       GetNodeFromHostname(&config.message(), "raspberrypi3"))
-                       ->name()
-                       ->string_view());
-  EXPECT_EQ("pi2",
-            CHECK_NOTNULL(GetNodeFromHostname(&config.message(), "other"))
-                ->name()
-                ->string_view());
+  {
+    const Node *pi1 = GetNodeFromHostname(&config.message(), "raspberrypi");
+    ASSERT_TRUE(pi1 != nullptr);
+    EXPECT_EQ("pi1", pi1->name()->string_view());
+  }
+  {
+    const Node *pi2 = GetNodeFromHostname(&config.message(), "raspberrypi2");
+    ASSERT_TRUE(pi2 != nullptr);
+    EXPECT_EQ("pi2", pi2->name()->string_view());
+  }
+  {
+    const Node *pi2 = GetNodeFromHostname(&config.message(), "raspberrypi3");
+    ASSERT_TRUE(pi2 != nullptr);
+    EXPECT_EQ("pi2", pi2->name()->string_view());
+  }
+  {
+    const Node *pi2 = GetNodeFromHostname(&config.message(), "other");
+    ASSERT_TRUE(pi2 != nullptr);
+    EXPECT_EQ("pi2", pi2->name()->string_view());
+  }
   EXPECT_EQ(nullptr, GetNodeFromHostname(&config.message(), "raspberrypi4"));
   EXPECT_EQ(nullptr, GetNodeFromHostname(&config.message(), "localhost"));
   EXPECT_EQ(nullptr, GetNodeFromHostname(&config.message(), "3"));