From 354f72443e80fa8799b5098fcdadac95c0018fab Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Tue, 7 Jun 2016 12:52:06 -0700 Subject: [PATCH] Adapt test cases to new behavior from commit 26425073441d57dc873d600e67206b63c7fb3233 --- test/cryfs/config/CryConfigLoaderTest.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/cryfs/config/CryConfigLoaderTest.cpp b/test/cryfs/config/CryConfigLoaderTest.cpp index 6f934a66..fe10d460 100644 --- a/test/cryfs/config/CryConfigLoaderTest.cpp +++ b/test/cryfs/config/CryConfigLoaderTest.cpp @@ -199,14 +199,24 @@ TEST_F(CryConfigLoaderTest, Version_Create) { EXPECT_EQ(gitversion::VersionString(), created.config()->CreatedWithVersion()); } -TEST_F(CryConfigLoaderTest, RefusesToLoadNewerFilesystem) { +TEST_F(CryConfigLoaderTest, AsksWhenLoadingNewerFilesystem_AnswerYes) { + EXPECT_CALL(*console, askYesNo(HasSubstr("should not be opened with older versions"))).Times(1).WillOnce(Return(true)); + + string version = newerVersion(); + CreateWithVersion(version); + EXPECT_NE(boost::none, Load()); +} + +TEST_F(CryConfigLoaderTest, AsksWhenLoadingNewerFilesystem_AnswerNo) { + EXPECT_CALL(*console, askYesNo(HasSubstr("should not be opened with older versions"))).Times(1).WillOnce(Return(false)); + string version = newerVersion(); CreateWithVersion(version); try { Load(); EXPECT_TRUE(false); // expect throw } catch (const std::runtime_error &e) { - EXPECT_THAT(e.what(), HasSubstr("Please update your CryFS version")); + EXPECT_THAT(e.what(), HasSubstr("Not trying to load file system")); } }