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: I0f105c3310e87172c65a09a8787a2db5a4041cc0
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/test/pid_zone_unittest.cpp b/test/pid_zone_unittest.cpp
index 1f6e672..3e8077c 100644
--- a/test/pid_zone_unittest.cpp
+++ b/test/pid_zone_unittest.cpp
@@ -68,8 +68,8 @@
properties, &d);
std::string sensorname = "temp1";
- std::string pidsensorpath = "/xyz/openbmc_project/settings/fanctrl/zone1/" +
- sensorname;
+ std::string pidsensorpath =
+ "/xyz/openbmc_project/settings/fanctrl/zone1/" + sensorname;
double de;
std::vector<std::string> propertiesenable;
@@ -154,8 +154,8 @@
std::string sensorname = "temp1";
std::string sensorType = "temp";
- std::string pidsensorpath = "/xyz/openbmc_project/settings/fanctrl/zone1/" +
- sensorname;
+ std::string pidsensorpath =
+ "/xyz/openbmc_project/settings/fanctrl/zone1/" + sensorname;
std::unique_ptr<DbusPidZone> zone;
};
@@ -190,9 +190,9 @@
.WillOnce(Invoke(
[&]([[maybe_unused]] sd_bus* bus, [[maybe_unused]] const char* path,
[[maybe_unused]] const char* interface, const char** names) {
- EXPECT_STREQ("Enable", names[0]);
- return 0;
- }));
+ EXPECT_STREQ("Enable", names[0]);
+ return 0;
+ }));
zone->addPidControlProcess(sensorname, sensorType, setpoint,
bus_mock_enable, pidsensorpath.c_str(), defer);
@@ -248,9 +248,9 @@
.WillOnce(Invoke(
[&]([[maybe_unused]] sd_bus* bus, [[maybe_unused]] const char* path,
[[maybe_unused]] const char* interface, const char** names) {
- EXPECT_STREQ("Enable", names[0]);
- return 0;
- }));
+ EXPECT_STREQ("Enable", names[0]);
+ return 0;
+ }));
zone->addPidControlProcess(sensorname, sensorType, setpoint,
bus_mock_enable, pidsensorpath.c_str(), defer);
@@ -292,9 +292,9 @@
.WillOnce(Invoke(
[&]([[maybe_unused]] sd_bus* bus, [[maybe_unused]] const char* path,
[[maybe_unused]] const char* interface, const char** names) {
- EXPECT_STREQ("Enable", names[0]);
- return 0;
- }));
+ EXPECT_STREQ("Enable", names[0]);
+ return 0;
+ }));
zone->addPidControlProcess(sensorname, sensorType, setpoint,
bus_mock_enable, pidsensorpath.c_str(), defer);
@@ -362,13 +362,13 @@
std::string name1 = "temp1";
int64_t timeout = 1;
- std::unique_ptr<Sensor> sensor1 = std::make_unique<SensorMock>(name1,
- timeout);
+ std::unique_ptr<Sensor> sensor1 =
+ std::make_unique<SensorMock>(name1, timeout);
SensorMock* sensor_ptr1 = reinterpret_cast<SensorMock*>(sensor1.get());
std::string name2 = "temp2";
- std::unique_ptr<Sensor> sensor2 = std::make_unique<SensorMock>(name2,
- timeout);
+ std::unique_ptr<Sensor> sensor2 =
+ std::make_unique<SensorMock>(name2, timeout);
SensorMock* sensor_ptr2 = reinterpret_cast<SensorMock*>(sensor2.get());
std::string type = "unchecked";
@@ -414,13 +414,13 @@
std::string name1 = "fan1";
int64_t timeout = 2;
- std::unique_ptr<Sensor> sensor1 = std::make_unique<SensorMock>(name1,
- timeout);
+ std::unique_ptr<Sensor> sensor1 =
+ std::make_unique<SensorMock>(name1, timeout);
SensorMock* sensor_ptr1 = reinterpret_cast<SensorMock*>(sensor1.get());
std::string name2 = "fan2";
- std::unique_ptr<Sensor> sensor2 = std::make_unique<SensorMock>(name2,
- timeout);
+ std::unique_ptr<Sensor> sensor2 =
+ std::make_unique<SensorMock>(name2, timeout);
SensorMock* sensor_ptr2 = reinterpret_cast<SensorMock*>(sensor2.get());
std::string type = "unchecked";
@@ -462,13 +462,13 @@
int64_t timeout = 1;
std::string name1 = "temp1";
- std::unique_ptr<Sensor> sensor1 = std::make_unique<SensorMock>(name1,
- timeout);
+ std::unique_ptr<Sensor> sensor1 =
+ std::make_unique<SensorMock>(name1, timeout);
SensorMock* sensor_ptr1 = reinterpret_cast<SensorMock*>(sensor1.get());
std::string name2 = "temp2";
- std::unique_ptr<Sensor> sensor2 = std::make_unique<SensorMock>(name2,
- timeout);
+ std::unique_ptr<Sensor> sensor2 =
+ std::make_unique<SensorMock>(name2, timeout);
SensorMock* sensor_ptr2 = reinterpret_cast<SensorMock*>(sensor2.get());
std::string type = "unchecked";
@@ -524,13 +524,13 @@
int64_t timeout = 1;
std::string name1 = "temp1";
- std::unique_ptr<Sensor> sensor1 = std::make_unique<SensorMock>(name1,
- timeout);
+ std::unique_ptr<Sensor> sensor1 =
+ std::make_unique<SensorMock>(name1, timeout);
SensorMock* sensor_ptr1 = reinterpret_cast<SensorMock*>(sensor1.get());
std::string name2 = "temp2";
- std::unique_ptr<Sensor> sensor2 = std::make_unique<SensorMock>(name2,
- timeout);
+ std::unique_ptr<Sensor> sensor2 =
+ std::make_unique<SensorMock>(name2, timeout);
SensorMock* sensor_ptr2 = reinterpret_cast<SensorMock*>(sensor2.get());
std::string type = "unchecked";
@@ -620,13 +620,13 @@
std::string name1 = "fan1";
int64_t timeout = 2;
- std::unique_ptr<Sensor> sensor1 = std::make_unique<SensorMock>(name1,
- timeout);
+ std::unique_ptr<Sensor> sensor1 =
+ std::make_unique<SensorMock>(name1, timeout);
SensorMock* sensor_ptr1 = reinterpret_cast<SensorMock*>(sensor1.get());
std::string name2 = "fan2";
- std::unique_ptr<Sensor> sensor2 = std::make_unique<SensorMock>(name2,
- timeout);
+ std::unique_ptr<Sensor> sensor2 =
+ std::make_unique<SensorMock>(name2, timeout);
SensorMock* sensor_ptr2 = reinterpret_cast<SensorMock*>(sensor2.get());
std::string type = "unchecked";
@@ -673,13 +673,13 @@
std::string name1 = "fan1";
int64_t timeout = 2;
- std::unique_ptr<Sensor> sensor1 = std::make_unique<SensorMock>(name1,
- timeout);
+ std::unique_ptr<Sensor> sensor1 =
+ std::make_unique<SensorMock>(name1, timeout);
SensorMock* sensor_ptr1 = reinterpret_cast<SensorMock*>(sensor1.get());
std::string name2 = "fan2";
- std::unique_ptr<Sensor> sensor2 = std::make_unique<SensorMock>(name2,
- timeout);
+ std::unique_ptr<Sensor> sensor2 =
+ std::make_unique<SensorMock>(name2, timeout);
SensorMock* sensor_ptr2 = reinterpret_cast<SensorMock*>(sensor2.get());
std::string type = "unchecked";
@@ -732,8 +732,8 @@
int64_t timeout = 1;
std::string name1 = "temp1";
- std::unique_ptr<Sensor> sensor1 = std::make_unique<SensorMock>(name1,
- timeout);
+ std::unique_ptr<Sensor> sensor1 =
+ std::make_unique<SensorMock>(name1, timeout);
SensorMock* sensor_ptr1 = reinterpret_cast<SensorMock*>(sensor1.get());
std::string type = "unchecked";
@@ -807,9 +807,9 @@
.WillOnce(Invoke(
[&]([[maybe_unused]] sd_bus* bus, [[maybe_unused]] const char* path,
[[maybe_unused]] const char* interface, const char** names) {
- EXPECT_STREQ("Manual", names[0]);
- return 0;
- }));
+ EXPECT_STREQ("Manual", names[0]);
+ return 0;
+ }));
// Method under test will set the manual mode to true and broadcast this
// change on dbus.