From 2dbd9ec3efae8a3814e6bece0f7ed45038c30380 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Thu, 18 Oct 2018 10:08:48 +0200 Subject: Fix version range not ending at next major version when not defining end --- tests/src/versionTest.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'tests/src/versionTest.cpp') diff --git a/tests/src/versionTest.cpp b/tests/src/versionTest.cpp index d5a492c..48a8838 100644 --- a/tests/src/versionTest.cpp +++ b/tests/src/versionTest.cpp @@ -7,16 +7,20 @@ TEST_CASE("parse package version") { VersionParser parser; { - Result parseResult = parser.parse("2.3.4", 5); + Result parseResult = parser.parse("17.3.4", 6); if(!parseResult) FAIL(parseResult.getErrMsg()); PackageVersionRange versionRange = parseResult.unwrap(); REQUIRE(versionRange.startDefined); - REQUIRE(!versionRange.endDefined); + REQUIRE(versionRange.endDefined); REQUIRE(versionRange.startOperation == VersionOperation::GREATER_EQUAL); - REQUIRE(versionRange.start.major == 2); + REQUIRE(versionRange.start.major == 17); REQUIRE(versionRange.start.minor == 3); REQUIRE(versionRange.start.patch == 4); + REQUIRE(versionRange.endOperation == VersionOperation::LESS); + REQUIRE(versionRange.end.major == 18); + REQUIRE(versionRange.end.minor == 0); + REQUIRE(versionRange.end.patch == 0); } { Result parseResult = parser.parse("2.3", 3); @@ -24,11 +28,15 @@ TEST_CASE("parse package version") FAIL(parseResult.getErrMsg()); PackageVersionRange versionRange = parseResult.unwrap(); REQUIRE(versionRange.startDefined); - REQUIRE(!versionRange.endDefined); + REQUIRE(versionRange.endDefined); REQUIRE(versionRange.startOperation == VersionOperation::GREATER_EQUAL); REQUIRE(versionRange.start.major == 2); REQUIRE(versionRange.start.minor == 3); REQUIRE(versionRange.start.patch == 0); + REQUIRE(versionRange.endOperation == VersionOperation::LESS); + REQUIRE(versionRange.end.major == 3); + REQUIRE(versionRange.end.minor == 0); + REQUIRE(versionRange.end.patch == 0); } { Result parseResult = parser.parse("2", 1); @@ -36,11 +44,15 @@ TEST_CASE("parse package version") FAIL(parseResult.getErrMsg()); PackageVersionRange versionRange = parseResult.unwrap(); REQUIRE(versionRange.startDefined); - REQUIRE(!versionRange.endDefined); + REQUIRE(versionRange.endDefined); REQUIRE(versionRange.startOperation == VersionOperation::GREATER_EQUAL); REQUIRE(versionRange.start.major == 2); REQUIRE(versionRange.start.minor == 0); REQUIRE(versionRange.start.patch == 0); + REQUIRE(versionRange.endOperation == VersionOperation::LESS); + REQUIRE(versionRange.end.major == 3); + REQUIRE(versionRange.end.minor == 0); + REQUIRE(versionRange.end.patch == 0); } { Result parseResult = parser.parse(">=2.3.4 and <5.6.7", 18); -- cgit v1.2.3