Martchus
/
passwordfile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use CPPUNIT_ASSERT_EQUAL with C++14 string literal

This commit is contained in:
Martchus 2017-02-06 18:38:02 +01:00
parent 94bddabd36
commit 2b28fbcc66
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/passwordfiletests.cpp
View File

@ -71,26 +71,26 @@ void PasswordFileTests::testReading(const string &testfile1path, const string &t
file.load();
// test root entry
const NodeEntry *rootEntry = file.rootEntry();
CPPUNIT_ASSERT(rootEntry->label() == "testfile1");
CPPUNIT_ASSERT(rootEntry->children().size() == 4);
CPPUNIT_ASSERT_EQUAL("testfile1"s, rootEntry->label());
CPPUNIT_ASSERT_EQUAL(4ul, rootEntry->children().size());
// test testaccount1
CPPUNIT_ASSERT(rootEntry->children()[0]->label() == "testaccount1");
CPPUNIT_ASSERT_EQUAL("testaccount1"s, rootEntry->children()[0]->label());
CPPUNIT_ASSERT(rootEntry->children()[0]->type() == EntryType::Account);
CPPUNIT_ASSERT(static_cast<AccountEntry *>(rootEntry->children()[0])->fields().at(0).name() == "pin");
CPPUNIT_ASSERT(static_cast<AccountEntry *>(rootEntry->children()[0])->fields().at(0).value() == "123456");
CPPUNIT_ASSERT_EQUAL("pin"s, static_cast<AccountEntry *>(rootEntry->children()[0])->fields().at(0).name());
CPPUNIT_ASSERT_EQUAL("123456"s, static_cast<AccountEntry *>(rootEntry->children()[0])->fields().at(0).value());
CPPUNIT_ASSERT(static_cast<AccountEntry *>(rootEntry->children()[0])->fields().at(0).type() == FieldType::Password);
CPPUNIT_ASSERT(static_cast<AccountEntry *>(rootEntry->children()[0])->fields().at(0).tiedAccount() == static_cast<AccountEntry *>(rootEntry->children()[0]));
CPPUNIT_ASSERT(static_cast<AccountEntry *>(rootEntry->children()[0])->fields().at(1).type() == FieldType::Normal);
CPPUNIT_ASSERT_THROW(static_cast<AccountEntry *>(rootEntry->children()[0])->fields().at(2), out_of_range);
// test testaccount2
CPPUNIT_ASSERT(rootEntry->children()[1]->label() == "testaccount2");
CPPUNIT_ASSERT_EQUAL("testaccount2"s, rootEntry->children()[1]->label());
CPPUNIT_ASSERT(rootEntry->children()[1]->type() == EntryType::Account);
CPPUNIT_ASSERT(static_cast<AccountEntry *>(rootEntry->children()[1])->fields().empty());
// test testcategory1
CPPUNIT_ASSERT(rootEntry->children()[2]->label() == "testcategory1");
CPPUNIT_ASSERT_EQUAL("testcategory1"s, rootEntry->children()[2]->label());
CPPUNIT_ASSERT(rootEntry->children()[2]->type() == EntryType::Node);
const NodeEntry *category = static_cast<NodeEntry *>(rootEntry->children()[2]);
CPPUNIT_ASSERT(category->children().size() == 3);
@ -98,7 +98,7 @@ void PasswordFileTests::testReading(const string &testfile1path, const string &t
CPPUNIT_ASSERT(static_cast<NodeEntry *>(category->children()[2])->children().size() == 2);
// test testaccount3
CPPUNIT_ASSERT(rootEntry->children()[3]->label() == "testaccount3");
CPPUNIT_ASSERT_EQUAL("testaccount3"s, rootEntry->children()[3]->label());
// open testfile 2
file.setPath(testfile2);

2
util/opensslrandomdevice.cpp
View File

@ -41,7 +41,7 @@ uint32 OpenSslRandomDevice::operator ()() const {
unsigned long errorCode = ERR_get_error();
while(errorCode != 0) {
if(!msg.empty()) {
msg += "\n";
msg += '\n';
}
msg += ERR_error_string(errorCode, 0);
errorCode = ERR_get_error();