From 1fd2cac9cdc78c83d1ce5ff50983911c5833c9c3 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sat, 13 Feb 2016 11:38:56 +0100 Subject: [PATCH] Adapt test cases to the removal of --extpass parameter --- test/cryfs/cli/program_options/ParserTest.cpp | 5 --- .../program_options/ProgramOptionsTest.cpp | 38 +++++++------------ 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/test/cryfs/cli/program_options/ParserTest.cpp b/test/cryfs/cli/program_options/ParserTest.cpp index 60854e51..13e62da0 100644 --- a/test/cryfs/cli/program_options/ParserTest.cpp +++ b/test/cryfs/cli/program_options/ParserTest.cpp @@ -114,11 +114,6 @@ TEST_F(ProgramOptionsParserTest, InvalidCipher) { ); } -TEST_F(ProgramOptionsParserTest, ExtPassGiven) { - ProgramOptions options = parse({"./myExecutable", "/home/user/baseDir", "--extpass", "echo mypassword", "/home/user/mountDir"}); - EXPECT_EQ("echo mypassword", options.extPass().value()); -} - TEST_F(ProgramOptionsParserTest, FuseOptionGiven) { ProgramOptions options = parse({"./myExecutable", "/home/user/baseDir", "/home/user/mountDir", "--", "-f"}); EXPECT_EQ("/home/user/baseDir", options.baseDir()); diff --git a/test/cryfs/cli/program_options/ProgramOptionsTest.cpp b/test/cryfs/cli/program_options/ProgramOptionsTest.cpp index 4036930b..17ed1bb8 100644 --- a/test/cryfs/cli/program_options/ProgramOptionsTest.cpp +++ b/test/cryfs/cli/program_options/ProgramOptionsTest.cpp @@ -23,83 +23,73 @@ namespace boost { class ProgramOptionsTest: public ProgramOptionsTestBase {}; TEST_F(ProgramOptionsTest, BaseDir) { - ProgramOptions testobj("/home/user/mydir", "", none, false, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("/home/user/mydir", "", none, false, none, none, none, options({"./myExecutable"})); EXPECT_EQ("/home/user/mydir", testobj.baseDir()); } TEST_F(ProgramOptionsTest, MountDir) { - ProgramOptions testobj("", "/home/user/mydir", none, false, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "/home/user/mydir", none, false, none, none, none, options({"./myExecutable"})); EXPECT_EQ("/home/user/mydir", testobj.mountDir()); } TEST_F(ProgramOptionsTest, ConfigfileNone) { - ProgramOptions testobj("", "", none, true, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "", none, true, none, none, none, options({"./myExecutable"})); EXPECT_EQ(none, testobj.configFile()); } TEST_F(ProgramOptionsTest, ConfigfileSome) { - ProgramOptions testobj("", "", bf::path("/home/user/configfile"), true, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "", bf::path("/home/user/configfile"), true, none, none, none, options({"./myExecutable"})); EXPECT_EQ("/home/user/configfile", testobj.configFile().get()); } TEST_F(ProgramOptionsTest, ForegroundFalse) { - ProgramOptions testobj("", "", none, false, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "", none, false, none, none, none, options({"./myExecutable"})); EXPECT_FALSE(testobj.foreground()); } TEST_F(ProgramOptionsTest, ForegroundTrue) { - ProgramOptions testobj("", "", none, true, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "", none, true, none, none, none, options({"./myExecutable"})); EXPECT_TRUE(testobj.foreground()); } TEST_F(ProgramOptionsTest, LogfileNone) { - ProgramOptions testobj("", "", none, true, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "", none, true, none, none, none, options({"./myExecutable"})); EXPECT_EQ(none, testobj.logFile()); } TEST_F(ProgramOptionsTest, LogfileSome) { - ProgramOptions testobj("", "", none, true, none, bf::path("logfile"), none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "", none, true, none, bf::path("logfile"), none, options({"./myExecutable"})); EXPECT_EQ("logfile", testobj.logFile().get()); } TEST_F(ProgramOptionsTest, UnmountAfterIdleMinutesNone) { -ProgramOptions testobj("", "", none, true, none, none, none, none, options({"./myExecutable"})); +ProgramOptions testobj("", "", none, true, none, none, none, options({"./myExecutable"})); EXPECT_EQ(none, testobj.unmountAfterIdleMinutes()); } TEST_F(ProgramOptionsTest, UnmountAfterIdleMinutesSome) { - ProgramOptions testobj("", "", none, true, 10, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "", none, true, 10, none, none, options({"./myExecutable"})); EXPECT_EQ(10, testobj.unmountAfterIdleMinutes().get()); } TEST_F(ProgramOptionsTest, CipherNone) { - ProgramOptions testobj("", "", none, true, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("", "", none, true, none, none, none, options({"./myExecutable"})); EXPECT_EQ(none, testobj.cipher()); } TEST_F(ProgramOptionsTest, CipherSome) { - ProgramOptions testobj("", "", none, true, none, none, string("aes-256-gcm"), none, options({"./myExecutable"})); + ProgramOptions testobj("", "", none, true, none, none, string("aes-256-gcm"), options({"./myExecutable"})); EXPECT_EQ("aes-256-gcm", testobj.cipher().get()); } -TEST_F(ProgramOptionsTest, ExtPassNone) { - ProgramOptions testobj("", "", none, true, none, none, none, none, options({"./myExecutable"})); - EXPECT_EQ(none, testobj.extPass()); -} - -TEST_F(ProgramOptionsTest, ExtPassSome) { - ProgramOptions testobj("", "", none, true, none, none, none, string("echo mypassword"), options({"./myExecutable"})); - EXPECT_EQ("echo mypassword", testobj.extPass().get()); -} - TEST_F(ProgramOptionsTest, EmptyFuseOptions) { - ProgramOptions testobj("/rootDir", "/home/user/mydir", none, false, none, none, none, none, options({"./myExecutable"})); + ProgramOptions testobj("/rootDir", "/home/user/mydir", none, false, none, none, none, options({"./myExecutable"})); //Fuse should have the mount dir as first parameter EXPECT_VECTOR_EQ({"./myExecutable", "/home/user/mydir"}, testobj.fuseOptions()); } TEST_F(ProgramOptionsTest, SomeFuseOptions) { - ProgramOptions testobj("/rootDir", "/home/user/mydir", none, false, none, none, none, none, options({"./myExecutable", "-f", "--longoption"})); + ProgramOptions testobj("/rootDir", "/home/user/mydir", none, false, none, none, none, options({"./myExecutable", "-f", "--longoption"})); //Fuse should have the mount dir as first parameter EXPECT_VECTOR_EQ({"./myExecutable", "/home/user/mydir", "-f", "--longoption"}, testobj.fuseOptions()); }