From a8aeec2f750483bdb8d5c6257ed0bcb2392d7e46 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 15 Feb 2019 22:27:15 -1000 Subject: [PATCH] Fix test cases --- test/cryfs/config/CryConfigLoaderTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/cryfs/config/CryConfigLoaderTest.cpp b/test/cryfs/config/CryConfigLoaderTest.cpp index 1c2b4197..4f9268c0 100644 --- a/test/cryfs/config/CryConfigLoaderTest.cpp +++ b/test/cryfs/config/CryConfigLoaderTest.cpp @@ -137,7 +137,7 @@ public: auto versionInfo = gitversion::Parser::parse(CryConfig::FilesystemFormatVersion); string olderVersion; if (std::stol(versionInfo.minorVersion) > 0) { - olderVersion = versionInfo.majorVersion + "." + std::to_string(std::stol(versionInfo.minorVersion) - 1); + olderVersion = versionInfo.majorVersion + "." + std::to_string(std::stol(versionInfo.minorVersion) - 1) + ".9"; } else { olderVersion = std::to_string(std::stol(versionInfo.majorVersion) - 1) + "." + versionInfo.minorVersion; } @@ -250,20 +250,20 @@ TEST_F(CryConfigLoaderTest, Cipher_Create) { } TEST_F(CryConfigLoaderTest, Version_Load) { - CreateWithVersion("0.9.2", "0.9.2"); + CreateWithVersion("0.9.4", "0.9.4"); auto loaded = Load().value(); EXPECT_EQ(CryConfig::FilesystemFormatVersion, loaded.config()->Version()); EXPECT_EQ(gitversion::VersionString(), loaded.config()->LastOpenedWithVersion()); - EXPECT_EQ("0.9.2", loaded.config()->CreatedWithVersion()); + EXPECT_EQ("0.9.4", loaded.config()->CreatedWithVersion()); } TEST_F(CryConfigLoaderTest, Version_Load_IsStoredAndNotOnlyOverwrittenInMemoryOnLoad) { - CreateWithVersion("0.9.2", "0.9.2", "mypassword"); + CreateWithVersion("0.9.4", "0.9.4", "mypassword"); Load().value(); auto configFile = CryConfigFile::load(file.path(), keyProvider("mypassword").get()).value(); EXPECT_EQ(CryConfig::FilesystemFormatVersion, configFile.config()->Version()); EXPECT_EQ(gitversion::VersionString(), configFile.config()->LastOpenedWithVersion()); - EXPECT_EQ("0.9.2", configFile.config()->CreatedWithVersion()); + EXPECT_EQ("0.9.4", configFile.config()->CreatedWithVersion()); } TEST_F(CryConfigLoaderTest, Version_Create) {