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

Merge branch 'release/0.10' into develop

Browse Source
This commit is contained in:
Sebastian Messmer 2019-02-15 22:38:24 -10:00
commit 811584d800
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/impl/config/CryConfigLoaderTest.cpp
View File

@ -140,7 +140,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;
}
@ -253,20 +253,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 = std::move(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()).right_opt().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) {