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_watch.cpp b/test/test_watch.cpp
index 3ab3e22..167c903 100644
--- a/test/test_watch.cpp
+++ b/test/test_watch.cpp
@@ -1,63 +1,61 @@
-#include "watch.hpp"
#include "types.hpp"
+#include "watch.hpp"
+
+#include <experimental/filesystem>
+#include <fstream>
#include <gtest/gtest.h>
-#include <fstream>
-#include <experimental/filesystem>
-
static constexpr auto TRIGGER_FILE = "/tmp/" __BASE_FILE__ "netif_state";
namespace fs = std::experimental::filesystem;
class WatchTest : public ::testing::Test
{
- public:
- // systemd event handler
- sd_event* events;
+ public:
+ // systemd event handler
+ sd_event* events;
- // Need this so that events can be initialized.
- int rc;
+ // Need this so that events can be initialized.
+ int rc;
- // Gets called as part of each TEST_F construction
- WatchTest()
- : rc(sd_event_default(&events)),
- eventPtr(events)
+ // Gets called as part of each TEST_F construction
+ WatchTest() : rc(sd_event_default(&events)), eventPtr(events)
+ {
+ // Create a file containing DNS entries like in netif/state
+ std::ofstream file(TRIGGER_FILE);
+ file << "";
+
+ // Check for successful creation of
+ // event handler
+ EXPECT_GE(rc, 0);
+ }
+
+ // Gets called as part of each TEST_F destruction
+ ~WatchTest()
+ {
+ if (fs::exists(TRIGGER_FILE))
{
- // Create a file containing DNS entries like in netif/state
- std::ofstream file(TRIGGER_FILE);
- file << "";
-
- // Check for successful creation of
- // event handler
- EXPECT_GE(rc, 0);
+ fs::remove(TRIGGER_FILE);
}
+ }
- // Gets called as part of each TEST_F destruction
- ~WatchTest()
- {
- if (fs::exists(TRIGGER_FILE))
- {
- fs::remove(TRIGGER_FILE);
- }
- }
+ // unique_ptr for sd_event
+ phosphor::network::EventPtr eventPtr;
- // unique_ptr for sd_event
- phosphor::network::EventPtr eventPtr;
+ // Count of callback invocation
+ int count = 0;
- // Count of callback invocation
- int count = 0;
+ // This is supposed to get hit twice
+ // Once at the beginning to see if there is anything
+ // and the second time when the data is fired.
+ void callBackHandler(const fs::path& file)
+ {
+ count++;
- // This is supposed to get hit twice
- // Once at the beginning to see if there is anything
- // and the second time when the data is fired.
- void callBackHandler(const fs::path& file)
- {
- count++;
-
- // Expect that the file is what we wanted
- EXPECT_EQ(file, TRIGGER_FILE);
- }
+ // Expect that the file is what we wanted
+ EXPECT_EQ(file, TRIGGER_FILE);
+ }
};
/** @brief Makes sure that the inotify event is fired
@@ -65,9 +63,9 @@
TEST_F(WatchTest, validateEventNotification)
{
// Create a watch object and register the handler
- phosphor::network::inotify::Watch watch(eventPtr, TRIGGER_FILE,
- std::bind(&WatchTest::callBackHandler, this,
- std::placeholders::_1));
+ phosphor::network::inotify::Watch watch(
+ eventPtr, TRIGGER_FILE,
+ std::bind(&WatchTest::callBackHandler, this, std::placeholders::_1));
// Reading the event post subscription
callBackHandler(TRIGGER_FILE);
@@ -82,7 +80,7 @@
// Pump the data and get notification
{
std::ofstream file(TRIGGER_FILE);
- file <<"DNS=1.2.3.4\n";
+ file << "DNS=1.2.3.4\n";
}
sd_event_run(eventPtr.get(), 10);