commit bd79bce8c3f1deb1fb2773868b9ece25233cf27b
author Patrick Williams <patrick@stwcx.xyz> Fri Aug 16 15:22:20 2024 -0400
committer Patrick Williams <patrick@stwcx.xyz> Sat Aug 17 00:19:54 2024 +0000
tree 93a2ae6921c756650182885f1215aae2923a1169
parent cdf25ffb6b2d99c829094c9a4c4907aec46e3a2e

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: Iceec1dc95b6c908ec6c21fb40093de9dd18bf11a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

test/include/human_sort_test.cpp

diff --git a/test/include/human_sort_test.cpp b/test/include/human_sort_test.cpp
index 78d2d22..741fb3d 100644
--- a/test/include/human_sort_test.cpp
+++ b/test/include/human_sort_test.cpp
@@ -51,8 +51,8 @@
 
 TEST(AlphaNum, LessTest)
 {
-    std::set<std::string, AlphanumLess<std::string>> sorted{"Alpha 10",
-                                                            "Alpha 2"};
+    std::set<std::string, AlphanumLess<std::string>> sorted{
+        "Alpha 10", "Alpha 2"};
     EXPECT_THAT(sorted, ElementsAreArray({"Alpha 2", "Alpha 10"}));
 }
 } // namespace

test/include/json_html_serializer.cpp

diff --git a/test/include/json_html_serializer.cpp b/test/include/json_html_serializer.cpp
index 69ac51a..82e21b9 100644
--- a/test/include/json_html_serializer.cpp
+++ b/test/include/json_html_serializer.cpp
@@ -25,9 +25,10 @@
     "<div class=\"container\">\n"
     "<img src=\"/images/DMTF_Redfish_logo_2017.svg\" alt=\"redfish\" height=\"406px\" width=\"576px\">\n";
 
-const std::string boilerplateEnd = "</div>\n"
-                                   "</body>\n"
-                                   "</html>\n";
+const std::string boilerplateEnd =
+    "</div>\n"
+    "</body>\n"
+    "</html>\n";
 
 TEST(JsonHtmlSerializer, dumpHtmlLink)
 {
@@ -57,9 +58,9 @@
     std::string out;
     nlohmann::json j = "foobar";
     dumpHtml(out, j);
-    EXPECT_EQ(out, boilerplateStart +
-                       "<div class=\"content\">\n\"foobar\"</div>\n" +
-                       boilerplateEnd);
+    EXPECT_EQ(out,
+              boilerplateStart + "<div class=\"content\">\n\"foobar\"</div>\n" +
+                  boilerplateEnd);
 }
 } // namespace
 } // namespace json_html_util

test/include/multipart_test.cpp

diff --git a/test/include/multipart_test.cpp b/test/include/multipart_test.cpp
index 59e8345..9e79dbd 100644
--- a/test/include/multipart_test.cpp
+++ b/test/include/multipart_test.cpp
@@ -265,12 +265,13 @@
 
 TEST_F(MultipartTest, TestGoodMultipartParserMultipleHeaders)
 {
-    std::string_view body = "-----------------------------d74496d66958873e\r\n"
-                            "Content-Disposition: form-data; name=\"Test1\"\r\n"
-                            "Other-Header: value=\"v1\"\r\n"
-                            "\r\n"
-                            "Data1\r\n"
-                            "-----------------------------d74496d66958873e--";
+    std::string_view body =
+        "-----------------------------d74496d66958873e\r\n"
+        "Content-Disposition: form-data; name=\"Test1\"\r\n"
+        "Other-Header: value=\"v1\"\r\n"
+        "\r\n"
+        "Data1\r\n"
+        "-----------------------------d74496d66958873e--";
 
     crow::Request reqIn(body, ec);
 
@@ -293,11 +294,12 @@
 
 TEST_F(MultipartTest, TestErrorHeaderWithoutColon)
 {
-    std::string_view body = "----end\r\n"
-                            "abc\r\n"
-                            "\r\n"
-                            "Data1\r\n"
-                            "----end--\r\n";
+    std::string_view body =
+        "----end\r\n"
+        "abc\r\n"
+        "\r\n"
+        "Data1\r\n"
+        "----end--\r\n";
     crow::Request reqIn(body, ec);
 
     reqIn.addHeader("Content-Type", "multipart/form-data; "
@@ -353,10 +355,11 @@
 
 TEST_F(MultipartTest, TestDataWithoutMimeFields)
 {
-    std::string_view body = "-----------------------------d74496d66958873e\r\n"
-                            "\r\n"
-                            "Data1\r\n"
-                            "-----------------------------d74496d66958873e--";
+    std::string_view body =
+        "-----------------------------d74496d66958873e\r\n"
+        "\r\n"
+        "Data1\r\n"
+        "-----------------------------d74496d66958873e--";
 
     crow::Request reqIn(body, ec);
 
@@ -445,9 +448,10 @@
 
     EXPECT_EQ(parser.mime_fields[0].fields.at("Content-Disposition"),
               "form-data; name=\"Test1\"");
-    EXPECT_EQ(parser.mime_fields[0].content, "Data1\r\n"
-                                             "----XX-abc-\r\n"
-                                             "StillData1");
+    EXPECT_EQ(parser.mime_fields[0].content,
+              "Data1\r\n"
+              "----XX-abc-\r\n"
+              "StillData1");
 }
 
 } // namespace