commit 25511a1cd4c61e4058e97a6a5f9fb8c18d290862
author William A. Kennington III <wak@google.com> Thu Aug 04 16:32:28 2022 -0700
committer William A. Kennington III <wak@google.com> Tue Aug 30 20:09:48 2022 +0000
tree b8c95bf2fc4de77ba680db3afe17432bcd96542d
parent a809f92e05bfbb07414a77cda64d5d75f3ad1bce

config_parser: Cleanups and modern c++ standards

This was exposing many functions and semantics that are unused by the
application. The goal is to simplify the interface and convert to using
types like `string_view` and referenceable lists where possible.

Change-Id: I4cba6326f9a96a943d384165e656f8589f931959
Signed-off-by: William A. Kennington III <wak@google.com>

test/test_vlan_interface.cpp

diff --git a/test/test_vlan_interface.cpp b/test/test_vlan_interface.cpp
index ea8eb01..126d2d0 100644
--- a/test/test_vlan_interface.cpp
+++ b/test/test_vlan_interface.cpp
@@ -8,7 +8,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
-#include <exception>
 #include <filesystem>
 #include <sdbusplus/bus.hpp>
 #include <stdplus/gtest/tmp.hpp>
@@ -94,19 +93,6 @@
     {
         interface.ip(addressType, ipaddress, subnetMask, gateway);
     }
-
-    bool isValueFound(const std::vector<std::string>& values,
-                      const std::string& expectedValue)
-    {
-        for (const auto& value : values)
-        {
-            if (expectedValue == value)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
 };
 
 TEST_F(TestVlanInterface, createVLAN)
@@ -116,23 +102,11 @@
     filePath /= "test0.50.netdev";
 
     config::Parser parser(filePath.string());
-    config::ReturnCode rc = config::ReturnCode::SUCCESS;
-    config::ValueList values;
 
-    std::tie(rc, values) = parser.getValues("NetDev", "Name");
-    std::string expectedValue = "test0.50";
-    bool found = isValueFound(values, expectedValue);
-    EXPECT_EQ(found, true);
-
-    std::tie(rc, values) = parser.getValues("NetDev", "Kind");
-    expectedValue = "vlan";
-    found = isValueFound(values, expectedValue);
-    EXPECT_EQ(found, true);
-
-    std::tie(rc, values) = parser.getValues("VLAN", "Id");
-    expectedValue = "50";
-    found = isValueFound(values, expectedValue);
-    EXPECT_EQ(found, true);
+    EXPECT_EQ(parser.getValues("NetDev", "Name"),
+              (config::ValueList{"test0.50"}));
+    EXPECT_EQ(parser.getValues("NetDev", "Kind"), (config::ValueList{"vlan"}));
+    EXPECT_EQ(parser.getValues("VLAN", "Id"), (config::ValueList{"50"}));
 }
 
 TEST_F(TestVlanInterface, deleteVLAN)
@@ -158,36 +132,18 @@
     fs::path filePath = confDir;
     filePath /= "test0.50.netdev";
     config::Parser parser(filePath.string());
-    config::ReturnCode rc = config::ReturnCode::SUCCESS;
-    config::ValueList values;
-
-    std::tie(rc, values) = parser.getValues("NetDev", "Name");
-    std::string expectedValue = "test0.50";
-    bool found = isValueFound(values, expectedValue);
-    EXPECT_EQ(found, true);
-
-    std::tie(rc, values) = parser.getValues("NetDev", "Kind");
-    expectedValue = "vlan";
-    found = isValueFound(values, expectedValue);
-    EXPECT_EQ(found, true);
-
-    std::tie(rc, values) = parser.getValues("VLAN", "Id");
-    expectedValue = "50";
-    found = isValueFound(values, expectedValue);
-    EXPECT_EQ(found, true);
+    EXPECT_EQ(parser.getValues("NetDev", "Name"),
+              (config::ValueList{"test0.50"}));
+    EXPECT_EQ(parser.getValues("NetDev", "Kind"), (config::ValueList{"vlan"}));
+    EXPECT_EQ(parser.getValues("VLAN", "Id"), (config::ValueList{"50"}));
 
     filePath = confDir;
     filePath /= "test0.60.netdev";
     parser.setFile(filePath.string());
-    std::tie(rc, values) = parser.getValues("NetDev", "Name");
-    expectedValue = "test0.60";
-    found = isValueFound(values, expectedValue);
-    EXPECT_EQ(found, true);
-
-    std::tie(rc, values) = parser.getValues("VLAN", "Id");
-    expectedValue = "60";
-    found = isValueFound(values, expectedValue);
-    EXPECT_EQ(found, true);
+    EXPECT_EQ(parser.getValues("NetDev", "Name"),
+              (config::ValueList{"test0.60"}));
+    EXPECT_EQ(parser.getValues("NetDev", "Kind"), (config::ValueList{"vlan"}));
+    EXPECT_EQ(parser.getValues("VLAN", "Id"), (config::ValueList{"60"}));
 
     deleteVlan("test0.50");
     deleteVlan("test0.60");