From 0fafbd5d0aa4c24e36af81afe92c8ea592c7d364 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sun, 2 Oct 2016 16:44:56 +0100 Subject: [PATCH] Repair FormatSubVersion tests. refs #1138 Signed-off-by: Daira Hopwood --- src/test/util_tests.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 3309e2e3..46114c06 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -351,8 +351,16 @@ BOOST_AUTO_TEST_CASE(test_FormatSubVersion) std::vector comments2; comments2.push_back(std::string("comment1")); comments2.push_back(std::string("comment2")); - BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, std::vector()),std::string("/Test:0.9.99/")); - BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments),std::string("/Test:0.9.99(comment1)/")); - BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments2),std::string("/Test:0.9.99(comment1; comment2)/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, std::vector()), std::string("/Test:0.9.99-beta1/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99924, std::vector()), std::string("/Test:0.9.99-beta25/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99925, std::vector()), std::string("/Test:0.9.99-rc1/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99949, std::vector()), std::string("/Test:0.9.99-rc25/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99950, std::vector()), std::string("/Test:0.9.99/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99951, std::vector()), std::string("/Test:0.9.99-1/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99999, std::vector()), std::string("/Test:0.9.99-49/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments), std::string("/Test:0.9.99-beta1(comment1)/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99950, comments), std::string("/Test:0.9.99(comment1)/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments2), std::string("/Test:0.9.99-beta1(comment1; comment2)/")); + BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99950, comments2), std::string("/Test:0.9.99(comment1; comment2)/")); } BOOST_AUTO_TEST_SUITE_END()