Remove use of ASSERT_THAT

This commit is contained in:
Eelke Klein 2017-08-26 19:07:01 +02:00
parent 4c658d7811
commit 78a4c6d730
5 changed files with 53 additions and 54 deletions

View file

@ -11,7 +11,7 @@ TEST(PasswordManager, initial_changeMasterPassword_returns_true)
auto res = pwm.changeMasterPassword("", "my test passphrase");
ASSERT_NO_THROW( res.get() );
ASSERT_THAT( res.get(), Eq(true) );
ASSERT_TRUE(res.get());
}
TEST(PasswordManager, unlock_succeeds)
@ -22,11 +22,11 @@ TEST(PasswordManager, unlock_succeeds)
auto res = pwm.changeMasterPassword("", passphrase);
ASSERT_NO_THROW( res.get() );
ASSERT_THAT( res.get(), Eq(true) );
ASSERT_TRUE(res.get());
auto res2 = pwm.unlock(passphrase);
ASSERT_NO_THROW( res2.get() );
ASSERT_THAT( res2.get(), Eq(true) );
ASSERT_TRUE(res2.get());
}
TEST(PasswordManager, unlock_fails)
@ -36,12 +36,12 @@ TEST(PasswordManager, unlock_fails)
std::string passphrase = "my test passphrase";
auto res = pwm.changeMasterPassword("", passphrase);
ASSERT_NO_THROW( res.get() );
ASSERT_THAT( res.get(), Eq(true) );
ASSERT_NO_THROW(res.get());
ASSERT_TRUE(res.get());
auto res2 = pwm.unlock(passphrase + "2");
ASSERT_NO_THROW( res2.get() );
ASSERT_THAT( res2.get(), Eq(false) );
ASSERT_NO_THROW(res2.get());
ASSERT_FALSE(res2.get());
}
TEST(PasswordManager, test_save_get)
@ -52,7 +52,7 @@ TEST(PasswordManager, test_save_get)
auto res = pwm.changeMasterPassword("", passphrase);
ASSERT_NO_THROW( res.get() );
ASSERT_THAT( res.get(), Eq(true) );
ASSERT_TRUE(res.get());
// auto res2 = pwm.unlock(passphrase + "2");
// ASSERT_NO_THROW( res2.get() );
@ -62,12 +62,11 @@ TEST(PasswordManager, test_save_get)
const std::string key = "abc";
auto res2 = pwm.savePassword(key, password);
ASSERT_THAT( res2.valid(), Eq(true) );
ASSERT_TRUE(res2.valid());
std::string result;
auto res3 = pwm.getPassword(key, result);
ASSERT_THAT( res3.valid(), Eq(true) );
ASSERT_THAT( res3.get(), Eq(true) );
ASSERT_THAT( result, Eq(password) );
ASSERT_TRUE(res3.valid());
ASSERT_TRUE(res3.get());
ASSERT_EQ(result, password);
}