#2310 Add isProjectFileVersionEqualOrOlderThan to RimProject and use from summary plot

This commit is contained in:
Magne Sjaastad
2018-01-04 13:12:07 +01:00
parent dbc1061a59
commit 96a900fe0f
4 changed files with 24 additions and 60 deletions

View File

@@ -1,66 +1,9 @@
#include "gtest/gtest.h"
#include "RiaProjectFileVersionTools.h"
#include <QStringList>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RiaProjectFileVersionTools, BasicUsage)
{
/*
{
QString projectFileVersionString = "2017.05.1";
int majorVersion = 2017;
int minorVersion = 5;
int patchNumber = 0;
int developmentId = 0;
bool isNewer = RiaProjectFileVersionTools::isProjectFileVersionNewerThan(projectFileVersionString, majorVersion,
minorVersion, patchNumber, developmentId);
EXPECT_TRUE(isNewer);
}
{
QString projectFileVersionString = "2017.05.1.text.13";
{
int majorVersion = 2017;
int minorVersion = 5;
int patchNumber = 1;
int developmentId = 14;
bool isNewer = RiaProjectFileVersionTools::isProjectFileVersionNewerThan(projectFileVersionString, majorVersion,
minorVersion, patchNumber,
developmentId); EXPECT_FALSE(isNewer);
}
{
int majorVersion = 2017;
int minorVersion = 5;
int patchNumber = 1;
int developmentId = 13;
bool isNewer = RiaProjectFileVersionTools::isProjectFileVersionNewerThan(projectFileVersionString, majorVersion,
minorVersion, patchNumber,
developmentId); EXPECT_TRUE(isNewer);
}
{
int majorVersion = 2017;
int minorVersion = 5;
int patchNumber = 1;
int developmentId = 12;
bool isNewer = RiaProjectFileVersionTools::isProjectFileVersionNewerThan(projectFileVersionString, majorVersion,
minorVersion, patchNumber,
developmentId); EXPECT_TRUE(isNewer);
}
}
*/
}
TEST(RiaProjectFileVersionTools, DecodeProjectVersionString)
{
{
@@ -202,8 +145,7 @@ TEST(RiaProjectFileVersionTools, OrderKnownVersionStrings)
QStringList sortedVersionList = versionStrings;
{
qSort(sortedVersionList.begin(), sortedVersionList.end(),
RiaProjectFileVersionTools::isCandidateVersionNewerThanOther);
qSort(sortedVersionList.begin(), sortedVersionList.end(), RiaProjectFileVersionTools::isCandidateVersionNewerThanOther);
}
for (const auto& s : sortedVersionList)