Proper error handling for reading databases.

This commit is contained in:
Felix Geyer
2012-01-06 20:03:13 +01:00
parent fea148803c
commit 007a901dba
9 changed files with 62 additions and 48 deletions

View File

@@ -41,7 +41,7 @@ void TestKeePass2Reader::testNonAscii()
KeePass2Reader* reader = new KeePass2Reader();
Database* db = reader->readDatabase(filename, key);
QVERIFY(db);
QVERIFY(!reader->error());
QVERIFY(!reader->hasError());
QCOMPARE(db->metadata()->name(), QString("NonAsciiTest"));
delete db;
@@ -56,7 +56,7 @@ void TestKeePass2Reader::testCompressed()
KeePass2Reader* reader = new KeePass2Reader();
Database* db = reader->readDatabase(filename, key);
QVERIFY(db);
QVERIFY(!reader->error());
QVERIFY(!reader->hasError());
QCOMPARE(db->metadata()->name(), QString("Compressed"));
delete db;
@@ -71,7 +71,7 @@ void TestKeePass2Reader::testProtectedStrings()
KeePass2Reader* reader = new KeePass2Reader();
Database* db = reader->readDatabase(filename, key);
QVERIFY(db);
QVERIFY(!reader->error());
QVERIFY(!reader->hasError());
QCOMPARE(db->metadata()->name(), QString("Protected Strings Test"));
Entry* entry = db->rootGroup()->entries().at(0);

View File

@@ -60,7 +60,7 @@ void TestKeePass2Writer::initTestCase()
buffer.seek(0);
KeePass2Reader reader;
m_dbTest = reader.readDatabase(&buffer, key);
QVERIFY(!reader.error());
QVERIFY(!reader.hasError());
QVERIFY(m_dbTest);
}

View File

@@ -71,7 +71,7 @@ void TestKeePass2XmlReader::initTestCase()
QString xmlFile = QString(KEEPASSX_TEST_DATA_DIR).append("/NewDatabase.xml");
m_db = reader->readDatabase(xmlFile);
QVERIFY(m_db);
QVERIFY(!reader->error());
QVERIFY(!reader->hasError());
}
void TestKeePass2XmlReader::testMetadata()

View File

@@ -77,7 +77,7 @@ void TestKeys::testFileKey()
Database* db = reader.readDatabase(dbFilename, compositeKey);
QVERIFY(db);
QVERIFY(!reader.error());
QVERIFY(!reader.hasError());
QCOMPARE(db->metadata()->name(), QString("%1 Database").arg(name));
delete db;
@@ -122,7 +122,7 @@ void TestKeys::testCreateFileKey()
KeePass2Reader reader;
Database* dbRead = reader.readDatabase(&dbBuffer, compositeKey);
QVERIFY(dbRead);
QVERIFY(!reader.error());
QVERIFY(!reader.hasError());
QCOMPARE(dbRead->metadata()->name(), dbName);
delete dbRead;
}