clang-format: Update to match docs repo
Update the .clang-format file and run clang-format-6.0.
This .clang-format matches the example one in
https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#clang-formatting
Change-Id: Ia331c9a5b040e1a3c45a0ebf1b8d776d93b05ae5
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/test/test_util.cpp b/test/test_util.cpp
index bc3ec64..437b3cf 100644
--- a/test/test_util.cpp
+++ b/test/test_util.cpp
@@ -1,7 +1,9 @@
-#include <gtest/gtest.h>
-#include <netinet/in.h>
#include "util.hpp"
+#include <netinet/in.h>
+
+#include <gtest/gtest.h>
+
namespace phosphor
{
namespace network
@@ -9,12 +11,11 @@
class TestUtil : public testing::Test
{
- public:
- TestUtil()
- {
- // Empty
- }
-
+ public:
+ TestUtil()
+ {
+ // Empty
+ }
};
TEST_F(TestUtil, IpValidation)
@@ -54,8 +55,6 @@
ipaddress = "1::8";
EXPECT_EQ(true, isValidIP(AF_INET6, ipaddress));
-
-
}
TEST_F(TestUtil, PrefixValidation)
@@ -77,10 +76,8 @@
prefixLength = 65;
EXPECT_EQ(false, isValidPrefix(AF_INET, prefixLength));
-
}
-
TEST_F(TestUtil, MacValidation)
{
std::string macaddress = "00:00:00:00:00:00";
@@ -97,7 +94,6 @@
macaddress = "hhh:GGG:iii:jjj:kkk:lll";
EXPECT_EQ(false, phosphor::network::mac_address::validate(macaddress));
-
}
TEST_F(TestUtil, ConvertV4MasktoPrefix)
@@ -118,7 +114,7 @@
prefix = toCidr(AF_INET, mask);
EXPECT_EQ(prefix, 11);
- //Invalid Mask
+ // Invalid Mask
mask = "255.0.255.0";
prefix = toCidr(AF_INET, mask);
EXPECT_EQ(prefix, 0);
@@ -138,7 +134,7 @@
prefix = toCidr(AF_INET6, mask);
EXPECT_EQ(prefix, 38);
- //Invalid Mask
+ // Invalid Mask
mask = "ffff:0fff::";
prefix = toCidr(AF_INET6, mask);
EXPECT_EQ(prefix, 0);
@@ -179,24 +175,24 @@
TEST_F(TestUtil, getNetworkAddress)
{
- std::string address = getNetworkID(AF_INET,"9.3.23.251",24);
- EXPECT_EQ("9.3.23.0",address);
+ std::string address = getNetworkID(AF_INET, "9.3.23.251", 24);
+ EXPECT_EQ("9.3.23.0", address);
- address = getNetworkID(AF_INET,"9.3.23.251",25);
- EXPECT_EQ("9.3.23.128",address);
+ address = getNetworkID(AF_INET, "9.3.23.251", 25);
+ EXPECT_EQ("9.3.23.128", address);
- address = getNetworkID(AF_INET6,"2001:db8:abcd:dd12::0",64);
- EXPECT_EQ("2001:db8:abcd:dd12::",address);
+ address = getNetworkID(AF_INET6, "2001:db8:abcd:dd12::0", 64);
+ EXPECT_EQ("2001:db8:abcd:dd12::", address);
- address = getNetworkID(AF_INET,"a.b.c.d",25);
- EXPECT_EQ("",address);
+ address = getNetworkID(AF_INET, "a.b.c.d", 25);
+ EXPECT_EQ("", address);
- address = getNetworkID(AF_INET6,"2001:db8:gghh:dd12::0",64);
- EXPECT_EQ("",address);
+ address = getNetworkID(AF_INET6, "2001:db8:gghh:dd12::0", 64);
+ EXPECT_EQ("", address);
- address = getNetworkID(AF_INET6,"fe80::201:6cff:fe80:228",64);
- EXPECT_EQ("fe80::",address);
+ address = getNetworkID(AF_INET6, "fe80::201:6cff:fe80:228", 64);
+ EXPECT_EQ("fe80::", address);
}
-}// namespce network
-}// namespace phosphor
+} // namespace network
+} // namespace phosphor