marko/semver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement relational operators on Basic_version class; Improve documentation; Fix bug in parser regarding prerelease token treatment on transition between prerelease and build parsing; Add unit tests for missing cases

Browse Source
This commit is contained in:
Marko Zivanovic
2015-10-08 23:27:01 +02:00
parent 1cc5568547
commit 284aa77e13
10 changed files with 155 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/CMakeLists.txt
+6 -1
View File
@@ -2,7 +2,6 @@ set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREADED ON)
find_package(Boost COMPONENTS unit_test_framework)
#find_package(Threads)
include_directories(../include)
@@ -21,3 +20,9 @@ target_link_libraries(semver200_comparator_tests
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
semver
)
add_executable(semver200_version_tests semver200_version_tests.cpp)
target_link_libraries(semver200_version_tests
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
semver
)
test/semver200_comparator_tests.cpp
+2 -2
View File
@@ -38,9 +38,9 @@ inline int compare(const std::string& l, const std::string& r) {
return c.compare(lv, rv);
}
#define GT(L, R) BOOST_CHECK(compare(L, R) > 0)
#define GT(L, R) BOOST_CHECK(compare(L, R) > 0)
#define GE(L, R) BOOST_CHECK(compare(L, R) >= 0)
#define LT(L, R) BOOST_CHECK(compare(L, R) < 0)
#define LT(L, R) BOOST_CHECK(compare(L, R) < 0)
#define LE(L, R) BOOST_CHECK(compare(L, R) <= 0)
#define EQ(L, R) BOOST_CHECK(compare(L, R) == 0)
test/semver200_parser_tests.cpp
+5 -1
View File
@@ -122,11 +122,15 @@ BOOST_AUTO_TEST_CASE(parse_build_empty_ids) {
// optional prerel must come after patch and build after prerel
BOOST_AUTO_TEST_CASE(parse_prerel_build_order) {
CHECK_PREREL_BUILD("1.2.3-r4+b5", 1, 2, 3, Prerelease_identifiers({ {"r4",A} }), Build_identifiers({ "b5" }));
CHECK_PREREL_BUILD("1.2.3+b4-r5",1,2,3, no_rel_ids, Build_identifiers({ "b4-r5" }));
CHECK_PREREL_BUILD("1.2.3+b4-r5", 1, 2, 3, no_rel_ids, Build_identifiers({ "b4-r5" }));
}
// check some corner cases
BOOST_AUTO_TEST_CASE(parse_corner_cases) {
CHECK_PARSE_ERROR("1.2.3-r4.+b5");
CHECK_PARSE_ERROR("1.2.3-r4+b5.");
CHECK_PREREL_BUILD("1.2.3-alpha+build.314", 1, 2, 3, Prerelease_identifiers({ {"alpha", A} }),
Build_identifiers({ "build","314" }));
}
test/semver200_validator_tests.cpp
-31
View File
@@ -1,31 +0,0 @@
/*
The MIT License (MIT)
Copyright (c) 2015 Marko Zivanovic
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#define BOOST_TEST_MODULE semver200_validator_tests
#include <boost/test/unit_test.hpp>
#include "version.h"
using namespace version;
test/semver200_version_tests.cpp
+67
View File
@@ -0,0 +1,67 @@
/*
The MIT License (MIT)
Copyright (c) 2015 Marko Zivanovic
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#define BOOST_TEST_MODULE semver200_version_tests
#include <boost/test/unit_test.hpp>
#include "version.h"
using namespace version;
using v = Semver200_version;
/// Check parsing logic by performing roundtrip - parse string to version object, then
/// generate string from that object and check if it's identical to source.
#define CHECK_RT(SRC) { \
std::stringstream ss; \
ss << v(SRC); \
BOOST_CHECK_EQUAL(ss.str(), SRC); \
}
BOOST_AUTO_TEST_CASE(test_relational_operators) {
BOOST_CHECK(v("1.0.0-alpha") < v("1.0.0-alpha.1"));
BOOST_CHECK(v("1.0.0-alpha.1") < v("1.0.0-alpha.beta"));
BOOST_CHECK(v("1.0.0-alpha.beta") < v("1.0.0-beta"));
BOOST_CHECK(v("1.0.0-beta") < v("1.0.0-beta.2"));
BOOST_CHECK(v("1.0.0-beta.2") < v("1.0.0-beta.11"));
BOOST_CHECK(v("1.0.0-beta.11") < v("1.0.0-rc.1"));
BOOST_CHECK(v("1.0.0-rc.1") < v("1.0.0"));
BOOST_CHECK(v("1.0.0+rc.1") == v("1.0.0+rc22"));
BOOST_CHECK(v("1.0.0+rc.1") != v("1.0.0-rc22"));
BOOST_CHECK(v("1.0.0") >= v("1.0.0"));
BOOST_CHECK(v("1.0.0") >= v("0.0.9"));
}
BOOST_AUTO_TEST_CASE(test_ostream_output) {
CHECK_RT("1.2.3");
CHECK_RT("1.2.3-alpha");
CHECK_RT("1.2.3-alpha.1.2.3");
CHECK_RT("1.2.3+build.1.2.3");
CHECK_RT("1.2.3-alpha+build.314");
CHECK_RT("1.2.3-alpha.1+build.314");
CHECK_RT("1.2.3-alpha.1.2.3+build.314");
}