]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
enhance: Add util::TextTable::TextTable(const char*)
authorJoel Rosdahl <joel@rosdahl.net>
Wed, 11 Aug 2021 10:36:46 +0000 (12:36 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Mon, 16 Aug 2021 18:12:01 +0000 (20:12 +0200)
src/util/TextTable.cpp
src/util/TextTable.hpp
unittest/test_util_TextTable.cpp

index cc4f9c09ef3991445114b35660d480762566be13..c4006da509c1a64ac9e8d17d128f04bd7044793f 100644 (file)
@@ -75,6 +75,10 @@ TextTable::Cell::Cell(const std::string& text)
 {
 }
 
+TextTable::Cell::Cell(const char* text) : Cell(std::string(text))
+{
+}
+
 TextTable::Cell::Cell(const uint64_t number)
   : m_text(fmt::format("{}", number)),
     m_right_align(true)
index 4c021ddd0fc6dd31507b84c39bb5d69646e62afc..8017a6250a3da2e1b4a02981bf0913d2f710dcb6 100644 (file)
@@ -31,6 +31,7 @@ public:
   {
   public:
     Cell(const std::string& text);
+    Cell(const char* text);
     Cell(uint64_t number);
 
     Cell& left_align();
index 1793e67c9714984cef3817717064eac06a1c9952..a504790f2944c1111eb06d0dbd3fb413bc7d05c8 100644 (file)
@@ -35,27 +35,27 @@ TEST_CASE("TextTable")
 
   SUBCASE("1x1")
   {
-    table.add_row({{"a"}});
+    table.add_row({"a"});
     CHECK(table.render() == "a\n");
   }
 
   SUBCASE("2x1 with space prefix/suffix")
   {
-    table.add_row({{" a "}, C(" b ")});
+    table.add_row({std::string(" a "), C(" b ")});
     CHECK(table.render() == " a   b\n");
   }
 
   SUBCASE("1x2")
   {
-    table.add_row({{"a"}});
+    table.add_row({"a"});
     table.add_row({1});
     CHECK(table.render() == "a\n1\n");
   }
 
   SUBCASE("3 + 2")
   {
-    table.add_row({{"a"}, {"b"}, {"c"}});
-    table.add_row({{"aa"}, {"bbb"}});
+    table.add_row({"a", "b", "c"});
+    table.add_row({"aa", "bbb"});
     CHECK(table.render()
           == ("a  b   c\n"
               "aa bbb\n"));
@@ -63,9 +63,9 @@ TEST_CASE("TextTable")
 
   SUBCASE("strings and numbers")
   {
-    table.add_row({{"a"}, 123, {"cc"}});
-    table.add_row({{"aa"}, 4, {"ccc"}});
-    table.add_row({{"aaa"}, 56, {"c"}});
+    table.add_row({"a", 123, "cc"});
+    table.add_row({"aa", 4, "ccc"});
+    table.add_row({"aaa", 56, "c"});
     CHECK(table.render()
           == ("a   123 cc\n"
               "aa    4 ccc\n"
@@ -74,9 +74,9 @@ TEST_CASE("TextTable")
 
   SUBCASE("left align")
   {
-    table.add_row({{"a"}, 123, {"cc"}});
-    table.add_row({{"aa"}, C(4).left_align(), {"ccc"}});
-    table.add_row({{"aaa"}, 56, {"c"}});
+    table.add_row({"a", 123, "cc"});
+    table.add_row({"aa", C(4).left_align(), "ccc"});
+    table.add_row({"aaa", 56, "c"});
     CHECK(table.render()
           == ("a   123 cc\n"
               "aa  4   ccc\n"
@@ -85,10 +85,10 @@ TEST_CASE("TextTable")
 
   SUBCASE("right align")
   {
-    table.add_row({{"a"}, {"bbb"}, {"cc"}});
+    table.add_row({"a", "bbb", "cc"});
     table.add_row(
       {C("aa").right_align(), C("b").right_align(), C("ccc").right_align()});
-    table.add_row({{"aaa"}, {"bb"}, {"c"}});
+    table.add_row({"aaa", "bb", "c"});
     CHECK(table.render()
           == ("a   bbb cc\n"
               " aa   b ccc\n"
@@ -97,9 +97,9 @@ TEST_CASE("TextTable")
 
   SUBCASE("heading")
   {
-    table.add_row({{"a"}, {"b"}, {"c"}});
+    table.add_row({"a", "b", "c"});
     table.add_heading("DDDDDD");
-    table.add_row({{"aaa"}, {"bbb"}, {"ccc"}});
+    table.add_row({"aaa", "bbb", "ccc"});
     CHECK(table.render()
           == ("a   b   c\n"
               "DDDDDD\n"