Update patch version handling

uweseimet · Dec 7, 2023 · 84e7930 · 84e7930
1 parent 2786ee1
commit 84e7930
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cpp/s2pctl/s2pctl_display.cpp b/cpp/s2pctl/s2pctl_display.cpp
@@ -106,6 +106,9 @@ string S2pCtlDisplay::DisplayVersionInfo(const PbVersionInfo& version_info) cons
 	}
 	else {
 	    version += fmt::format(" {0}.{1}", version_info.major_version(), version_info.minor_version());
+	    if (version_info.patch_version() > 0) {
+	        version += fmt::format(".{}", version_info.patch_version());
+	    }
 	}
 
 	version += version_info.suffix() + "\n";

diff --git a/cpp/test/s2pctl_display_test.cpp b/cpp/test/s2pctl_display_test.cpp
@@ -75,16 +75,20 @@ TEST(S2pCtlDisplayTest, DisplayVersionInfo)
 	info.set_major_version(1);
 	info.set_minor_version(2);
 	info.set_patch_version(3);
+	info.set_identifier("identifier");
 	string s = display.DisplayVersionInfo(info);
 	EXPECT_FALSE(s.empty());
-	EXPECT_EQ(string::npos, s.find("development version"));
 	EXPECT_NE(string::npos, s.find("1.2.3"));
 
 	info.set_patch_version(-1);
 	s = display.DisplayVersionInfo(info);
 	EXPECT_FALSE(s.empty());
-	EXPECT_NE(string::npos, s.find("development version"));
 	EXPECT_NE(string::npos, s.find("1.2"));
+
+	info.set_suffix("rc");
+    s = display.DisplayVersionInfo(info);
+    EXPECT_FALSE(s.empty());
+    EXPECT_NE(string::npos, s.find("rc"));
 }
 
 TEST(S2pCtlDisplayTest, DisplayLogLevelInfo)