tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-22 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Utility::ParseVersion() and unit tests

Browse Source 
This now uses a regex to extract the short version
similar to how Icinga Web 2 does it.

Additional unit tests prove the rule.
This commit is contained in:
Michael Friedrich 2019-08-14 11:22:55 +02:00
parent fcca9643bc
commit 96f62d2d34
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/base/utility.cpp
View File

@ -20,6 +20,7 @@
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
#include <boost/uuid/uuid_io.hpp> #include <boost/uuid/uuid_io.hpp>
#include <boost/uuid/uuid_generators.hpp> #include <boost/uuid/uuid_generators.hpp>
#include <boost/regex.hpp>
#include <ios> #include <ios>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
@ -1172,6 +1173,26 @@ unsigned long Utility::SDBM(const String& str, size_t len)
return hash; return hash;
} }
String Utility::ParseVersion(const String& v)
{
/*
* 2.11.0-0.rc1.1
* v2.10.5
* r2.10.3
* v2.11.0-rc1-58-g7c1f716da
*/
boost::regex pattern("^[vr]?(2\\.\\d+\\.\\d+).*$");
boost::smatch result;
if (boost::regex_search(v.GetData(), result, pattern)) {
String res(result[1].first, result[1].second);
return res;
}
// Couldn't not extract anything, return unparsed version
return v;
}
int Utility::CompareVersion(const String& v1, const String& v2) int Utility::CompareVersion(const String& v1, const String& v2)
{ {
std::vector<String> tokensv1 = v1.Split("."); std::vector<String> tokensv1 = v1.Split(".");

1
lib/base/utility.hpp
View File

@ -100,6 +100,7 @@ public:
static unsigned long SDBM(const String& str, size_t len = String::NPos); static unsigned long SDBM(const String& str, size_t len = String::NPos);
static String ParseVersion(const String& v);
static int CompareVersion(const String& v1, const String& v2); static int CompareVersion(const String& v1, const String& v2);
static int Random(); static int Random();

1
test/CMakeLists.txt
View File

@ -108,6 +108,7 @@ add_boost_test(base
base_type/assign base_type/assign
base_type/byname base_type/byname
base_type/instantiate base_type/instantiate
base_utility/parse_version
base_utility/comparepasswords_works base_utility/comparepasswords_works
base_utility/comparepasswords_issafe base_utility/comparepasswords_issafe
base_utility/validateutf8 base_utility/validateutf8

10
test/base-utility.cpp
View File

@ -8,6 +8,16 @@ using namespace icinga;
BOOST_AUTO_TEST_SUITE(base_utility) BOOST_AUTO_TEST_SUITE(base_utility)
BOOST_AUTO_TEST_CASE(parse_version)
{
BOOST_CHECK(Utility::ParseVersion("2.11.0-0.rc1.1") == "2.11.0");
BOOST_CHECK(Utility::ParseVersion("v2.10.5") == "2.10.5");
BOOST_CHECK(Utility::ParseVersion("r2.11.1") == "2.11.1");
BOOST_CHECK(Utility::ParseVersion("v2.11.0-rc1-58-g7c1f716da") == "2.11.0");
BOOST_CHECK(Utility::ParseVersion("v2.11butactually3.0") == "v2.11butactually3.0");
}
BOOST_AUTO_TEST_CASE(comparepasswords_works) BOOST_AUTO_TEST_CASE(comparepasswords_works)
{ {
BOOST_CHECK(Utility::ComparePasswords("", "")); BOOST_CHECK(Utility::ComparePasswords("", ""));