From 37dfa492dcce979178473692bcab528d95a4a3b8 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 29 Aug 2016 09:04:27 +0200 Subject: [PATCH] ProjectVersion tests, fix mixleading comment --- src/core/ProjectVersion.cpp | 3 ++- tests/src/core/ProjectVersionTest.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/ProjectVersion.cpp b/src/core/ProjectVersion.cpp index 111e014a841..045368343e7 100644 --- a/src/core/ProjectVersion.cpp +++ b/src/core/ProjectVersion.cpp @@ -111,7 +111,7 @@ int ProjectVersion::compare(const ProjectVersion & a, const ProjectVersion & b, return 0; } - // make sure 0.x.y > 0.x.y-patch + // make sure 0.x.y > 0.x.y-alpha if(a.getBuild().isEmpty()) { return 1; @@ -121,6 +121,7 @@ int ProjectVersion::compare(const ProjectVersion & a, const ProjectVersion & b, return -1; } + // 0.x.y-beta > 0.x.y-alpha return QString::compare(a.getBuild(), b.getBuild()); } diff --git a/tests/src/core/ProjectVersionTest.cpp b/tests/src/core/ProjectVersionTest.cpp index f0198ff5e89..b27b1cc46f6 100644 --- a/tests/src/core/ProjectVersionTest.cpp +++ b/tests/src/core/ProjectVersionTest.cpp @@ -39,6 +39,8 @@ private slots: QVERIFY(ProjectVersion("1.1.0", CompareType::Minor) == "1.1.5"); QVERIFY( ! ( ProjectVersion("3.1.0", CompareType::Minor) < "2.2.5" ) ); QVERIFY( ! ( ProjectVersion("2.5.0", CompareType::Release) < "2.2.5" ) ); + QVERIFY(ProjectVersion("1.1.0") > "1.1.0-alpha"); + QVERIFY(ProjectVersion("1.1.0-alpha") < "1.1.0-beta"); } } ProjectVersionTests;