lia pr comments

viamrobotics · Sep 20, 2024 · fbb0c75 · fbb0c75
1 parent ca8039b
commit fbb0c75
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/src/viam/sdk/common/version_metadata.cpp b/src/viam/sdk/common/version_metadata.cpp
@@ -1,5 +1,6 @@
 #include <viam/sdk/common/version_metadata.hpp>
 
+#include <array>
 #include <sstream>
 
 #include <viam/sdk/common/private/version_metadata.hpp>
@@ -8,22 +9,33 @@ namespace viam {
 namespace sdk {
 
 std::string sdk_version() {
-    std::string version_metadata(impl::k_version);
-    version_metadata.erase(0, version_metadata.find(';') + 1);
-    return version_metadata.substr(0, version_metadata.find(';'));
+    static std::string result = [] {
+        std::string version_metadata(impl::k_version);
+        version_metadata.erase(0, version_metadata.find(';') + 1);
+        return version_metadata.substr(0, version_metadata.find(';'));
+    }();
+
+    return result;
 }
 
 int get_sub_version(int which) {
-    auto version = sdk_version();
-    version.erase(0, version.find_first_not_of('v'));
+    static const std::array<int, 3> components = [] {
+        std::array<int, 3> result;
+        auto version = sdk_version();
+        version.erase(0, version.find_first_not_of('v'));
+
+        std::string substr;
+        std::stringstream ss(version);
+
+        for (int i = 0; i < 3; ++i) {
+            getline(ss, substr, '.');
+            result[i] = std::stoi(substr);
+        }
 
-    std::string substr;
-    std::stringstream ss(version);
+        return result;
+    }();
 
-    for (int i = 0; i <= which; ++i) {
-        getline(ss, substr, '.');
-    }
-    return std::stoi(substr);
+    return components[which];
 }
 
 int sdk_major_version() {

diff --git a/src/viam/sdk/tests/test_common.cpp b/src/viam/sdk/tests/test_common.cpp
@@ -123,7 +123,11 @@ BOOST_AUTO_TEST_CASE(test_version_metadata) {
     int minor = sdk_minor_version();
     int patch = sdk_patch_version();
 
-    BOOST_CHECK(true);
+    std::string version_constructed =
+        "v" + std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(patch);
+    std::string version = sdk_version();
+
+    BOOST_CHECK_EQUAL(version_constructed, version);
 }
 
 BOOST_AUTO_TEST_SUITE_END()