hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix test cases

Browse Source
This commit is contained in:
Sebastian Messmer 2019-02-15 22:27:15 -10:00
parent 5a5f8f7324
commit a8aeec2f75
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/cryfs/config/CryConfigLoaderTest.cpp
View File

@ -137,7 +137,7 @@ public:
auto versionInfo = gitversion::Parser::parse(CryConfig::FilesystemFormatVersion); auto versionInfo = gitversion::Parser::parse(CryConfig::FilesystemFormatVersion);
string olderVersion; string olderVersion;
if (std::stol(versionInfo.minorVersion) > 0) { 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 { } else {
olderVersion = std::to_string(std::stol(versionInfo.majorVersion) - 1) + "." + versionInfo.minorVersion; 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) { TEST_F(CryConfigLoaderTest, Version_Load) {
CreateWithVersion("0.9.2", "0.9.2"); CreateWithVersion("0.9.4", "0.9.4");
auto loaded = Load().value(); auto loaded = Load().value();
EXPECT_EQ(CryConfig::FilesystemFormatVersion, loaded.config()->Version()); EXPECT_EQ(CryConfig::FilesystemFormatVersion, loaded.config()->Version());
EXPECT_EQ(gitversion::VersionString(), loaded.config()->LastOpenedWithVersion()); 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) { TEST_F(CryConfigLoaderTest, Version_Load_IsStoredAndNotOnlyOverwrittenInMemoryOnLoad) {
CreateWithVersion("0.9.2", "0.9.2", "mypassword"); CreateWithVersion("0.9.4", "0.9.4", "mypassword");
Load().value(); Load().value();
auto configFile = CryConfigFile::load(file.path(), keyProvider("mypassword").get()).value(); auto configFile = CryConfigFile::load(file.path(), keyProvider("mypassword").get()).value();
EXPECT_EQ(CryConfig::FilesystemFormatVersion, configFile.config()->Version()); EXPECT_EQ(CryConfig::FilesystemFormatVersion, configFile.config()->Version());
EXPECT_EQ(gitversion::VersionString(), configFile.config()->LastOpenedWithVersion()); 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) { TEST_F(CryConfigLoaderTest, Version_Create) {