clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: I8c81e5e5b6bd1ec4bdd52aa9039ef1c4bbef088d
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/test/handler_unittest.cpp b/test/handler_unittest.cpp
index 2fb470e..5d01b73 100644
--- a/test/handler_unittest.cpp
+++ b/test/handler_unittest.cpp
@@ -142,8 +142,7 @@
public:
MockDbusHandler(sdbusplus::SdBusMock& mock,
const std::string& config = "") :
- Handler(config),
- mock_(&mock)
+ Handler(config), mock_(&mock)
{}
protected:
@@ -305,11 +304,11 @@
const std::string& service, const std::string& objPath,
const std::string& interface, const std::string& function)
{
- EXPECT_CALL(
- mock, sd_bus_message_new_method_call(_, // sd_bus *bus,
- NotNull(), // sd_bus_message **m
- StrEq(service), StrEq(objPath),
- StrEq(interface), StrEq(function)))
+ EXPECT_CALL(mock, sd_bus_message_new_method_call(
+ _, // sd_bus *bus,
+ NotNull(), // sd_bus_message **m
+ StrEq(service), StrEq(objPath), StrEq(interface),
+ StrEq(function)))
.WillOnce(Return(-ENOTCONN));
}
@@ -383,11 +382,11 @@
StrEq("com.google.custom_accel.BAR"), StrEq("Read")))
.WillOnce(DoAll(SetArgPointee<1>(method), Return(0)));
- EXPECT_CALL(
- mock, sd_bus_message_append_basic(
- method, SD_BUS_TYPE_UINT64,
- MatcherCast<const void*>(
- SafeMatcherCast<const uint64_t*>(Pointee(Eq(address))))))
+ EXPECT_CALL(mock,
+ sd_bus_message_append_basic(
+ method, SD_BUS_TYPE_UINT64,
+ MatcherCast<const void*>(SafeMatcherCast<const uint64_t*>(
+ Pointee(Eq(address))))))
.WillOnce(Return(1));
EXPECT_CALL(mock,
@@ -515,11 +514,11 @@
.WillOnce(DoAll(TraceDbus("sd_bus_message_new_method_call"),
SetArgPointee<1>(method), Return(0)));
- EXPECT_CALL(
- mock, sd_bus_message_append_basic(
- method, SD_BUS_TYPE_UINT64,
- MatcherCast<const void*>(
- SafeMatcherCast<const uint64_t*>(Pointee(Eq(address))))))
+ EXPECT_CALL(mock,
+ sd_bus_message_append_basic(
+ method, SD_BUS_TYPE_UINT64,
+ MatcherCast<const void*>(SafeMatcherCast<const uint64_t*>(
+ Pointee(Eq(address))))))
.WillOnce(DoAll(TraceDbus("sd_bus_message_append_basic(address) -> 1"),
Return(1)));