[format utils] create singleton format utils class in order to mock functions

Author: sharder996

include/multipass/cli/format_utils.h

@@ -28,6 +28,8 @@
 #include <algorithm>
 #include <string>
 
+#define MP_FORMAT_UTILS multipass::FormatUtils::instance()
+
 namespace multipass
 {
 class Formatter;
@@ -43,8 +45,6 @@ Formatter* formatter_for(const std::string& format);
 template <typename Container>
 Container sorted(const Container& items);
 
-std::string convert_to_localtime(const google::protobuf::Timestamp& timestamp);
-
 void filter_aliases(google::protobuf::RepeatedPtrField<multipass::FindReply_AliasInfo>& aliases);
 
 // Computes the column width needed to display all the elements of a range [begin, end). get_width is a function
@@ -59,6 +59,14 @@ static constexpr auto column_width = [](const auto begin, const auto end, const
     return std::max({get_width(*max_width) + col_buffer, header_width + col_buffer, minimum_width});
 };
 } // namespace format
+
+class FormatUtils : public Singleton<FormatUtils>
+{
+public:
+    FormatUtils(const Singleton<FormatUtils>::PrivatePass&) noexcept;
+
+    virtual std::string convert_to_localtime(const google::protobuf::Timestamp& timestamp) const;
+};
 } // namespace multipass
 
 template <typename Container>

src/client/cli/formatter/csv_formatter.cpp

@@ -79,7 +79,7 @@ std::string generate_snapshot_details(const mp::InfoReply reply)
         fmt::format_to(std::back_inserter(buf), format_mounts(info.mount_info()));
 
         fmt::format_to(std::back_inserter(buf), ",{},{},{},\"{}\"\n",
-                       mp::format::convert_to_localtime(fundamentals.creation_timestamp()), fundamentals.parent(),
+                       MP_FORMAT_UTILS.convert_to_localtime(fundamentals.creation_timestamp()), fundamentals.parent(),
                        fmt::join(info.snapshot_info().children(), ";"), fundamentals.comment());
     }
 

src/client/cli/formatter/format_utils.cpp

@@ -111,7 +111,12 @@ void mp::format::filter_aliases(google::protobuf::RepeatedPtrField<multipass::Fi
     }
 }
 
-std::string mp::format::convert_to_localtime(const google::protobuf::Timestamp& timestamp) const
+mp::FormatUtils::FormatUtils(const Singleton<FormatUtils>::PrivatePass& pass) noexcept
+    : Singleton<FormatUtils>::Singleton{pass}
+{
+}
+
+std::string mp::FormatUtils::convert_to_localtime(const google::protobuf::Timestamp& timestamp) const
 {
     std::ostringstream oss;
     std::time_t t = google::protobuf::util::TimeUtil::TimestampToTimeT(timestamp);

src/client/cli/formatter/json_formatter.cpp

@@ -76,8 +76,8 @@ QJsonObject generate_snapshot_details(const mp::DetailedInfoItem& item)
     }
     snapshot_info.insert("mounts", mounts);
 
-    snapshot_info.insert("created",
-                         QString::fromStdString(mp::format::convert_to_localtime(fundamentals.creation_timestamp())));
+    snapshot_info.insert(
+        "created", QString::fromStdString(MP_FORMAT_UTILS.convert_to_localtime(fundamentals.creation_timestamp())));
     snapshot_info.insert("parent", QString::fromStdString(fundamentals.parent()));
 
     QJsonArray children;

src/client/cli/formatter/table_formatter.cpp

@@ -83,7 +83,7 @@ std::string generate_snapshot_details(const mp::DetailedInfoItem& item)
     }
 
     fmt::format_to(std::back_inserter(buf), "{:<16}{}\n",
-                   "Created:", mp::format::convert_to_localtime(fundamentals.creation_timestamp()));
+                   "Created:", MP_FORMAT_UTILS.convert_to_localtime(fundamentals.creation_timestamp()));
     fmt::format_to(std::back_inserter(buf), "{:<16}{}\n",
                    "Parent:", fundamentals.parent().empty() ? "--" : fundamentals.parent());
 

src/client/cli/formatter/yaml_formatter.cpp

@@ -78,7 +78,7 @@ YAML::Node generate_snapshot_details(const mp::DetailedInfoItem& item)
     }
     snapshot_node["mounts"] = mounts;
 
-    snapshot_node["created"] = mp::format::convert_to_localtime(fundamentals.creation_timestamp());
+    snapshot_node["created"] = MP_FORMAT_UTILS.convert_to_localtime(fundamentals.creation_timestamp());
     snapshot_node["parent"] = fundamentals.parent().empty() ? YAML::Node() : YAML::Node(fundamentals.parent());
 
     snapshot_node["children"] = YAML::Node(YAML::NodeType::Sequence);