Use QCOMPARE instead of QVERIFY where possible.

This commit is contained in:
Felix Geyer 2010-08-18 11:05:46 +02:00
parent 623b325fa1
commit 48c498890f
3 changed files with 32 additions and 32 deletions

View file

@ -54,12 +54,12 @@ void TestParser::initTestCase()
void TestParser::testMetadata()
{
QCOMPARE(m_db->metadata()->generator(), QLatin1String("KeePass"));
QCOMPARE(m_db->metadata()->name(), QLatin1String("ANAME"));
QCOMPARE(m_db->metadata()->generator(), QString("KeePass"));
QCOMPARE(m_db->metadata()->name(), QString("ANAME"));
QCOMPARE(m_db->metadata()->nameChanged(), genDT(2010, 8, 8, 17, 24, 53));
QCOMPARE(m_db->metadata()->description(), QLatin1String("ADESC"));
QCOMPARE(m_db->metadata()->description(), QString("ADESC"));
QCOMPARE(m_db->metadata()->descriptionChanged(), genDT(2010, 8, 8, 17, 27, 12));
QCOMPARE(m_db->metadata()->defaultUserName(), QLatin1String("DEFUSERNAME"));
QCOMPARE(m_db->metadata()->defaultUserName(), QString("DEFUSERNAME"));
QCOMPARE(m_db->metadata()->defaultUserNameChanged(), genDT(2010, 8, 8, 17, 27, 45));
QCOMPARE(m_db->metadata()->maintenanceHistoryDays(), 127);
QCOMPARE(m_db->metadata()->protectTitle(), false);
@ -70,34 +70,34 @@ void TestParser::testMetadata()
QCOMPARE(m_db->metadata()->autoEnableVisualHiding(), true);
QCOMPARE(m_db->metadata()->recycleBinEnabled(), true);
QVERIFY(m_db->metadata()->recycleBin() != 0);
QCOMPARE(m_db->metadata()->recycleBin()->name(), QLatin1String("Recycle Bin"));
QCOMPARE(m_db->metadata()->recycleBin()->name(), QString("Recycle Bin"));
QCOMPARE(m_db->metadata()->recycleBinChanged(), genDT(2010, 8, 8, 17, 24, 17));
QVERIFY(m_db->metadata()->entryTemplatesGroup() == 0);
QCOMPARE(m_db->metadata()->entryTemplatesGroupChanged(), genDT(2010, 8, 8, 17, 24, 19));
QVERIFY(m_db->metadata()->lastSelectedGroup() != 0);
QCOMPARE(m_db->metadata()->lastSelectedGroup()->name(), QLatin1String("NewDatabase"));
QCOMPARE(m_db->metadata()->lastSelectedGroup()->name(), QString("NewDatabase"));
QVERIFY(m_db->metadata()->lastTopVisibleGroup() == m_db->metadata()->lastSelectedGroup());
}
void TestParser::testGroups()
{
QVERIFY(m_db->rootGroup() != 0);
QVERIFY(m_db->rootGroup()->name() == QLatin1String("NewDatabase"));
QVERIFY(m_db->rootGroup()->uuid().toBase64() == QLatin1String("zKuE27EWr0mlU75b2SRkTQ=="));
QVERIFY(m_db->rootGroup()->isExpanded() == true);
QCOMPARE(m_db->rootGroup()->name(), QString("NewDatabase"));
QCOMPARE(m_db->rootGroup()->uuid().toBase64(), QString("zKuE27EWr0mlU75b2SRkTQ=="));
QVERIFY(m_db->rootGroup()->isExpanded());
TimeInfo ti = m_db->rootGroup()->timeInfo();
QVERIFY(ti.lastModificationTime() == genDT(2010, 8, 8, 17, 24, 27));
QVERIFY(ti.creationTime() == genDT(2010, 8, 7, 17, 24, 27));
QVERIFY(ti.lastAccessTime() == genDT(2010, 8, 9, 9, 9, 44));
QVERIFY(ti.expiryTime() == genDT(2010, 8, 8, 17, 24, 17));
QVERIFY(ti.expires() == false);
QVERIFY(ti.usageCount() == 2);
QVERIFY(ti.locationChanged() == genDT(2010, 8, 8, 17, 24, 27));
QCOMPARE(ti.lastModificationTime(), genDT(2010, 8, 8, 17, 24, 27));
QCOMPARE(ti.creationTime(), genDT(2010, 8, 7, 17, 24, 27));
QCOMPARE(ti.lastAccessTime(), genDT(2010, 8, 9, 9, 9, 44));
QCOMPARE(ti.expiryTime(), genDT(2010, 8, 8, 17, 24, 17));
QVERIFY(!ti.expires());
QCOMPARE(ti.usageCount(), 2);
QCOMPARE(ti.locationChanged(), genDT(2010, 8, 8, 17, 24, 27));
QVERIFY(m_db->rootGroup()->children().size() == 3);
QVERIFY(m_db->rootGroup()->children().at(0)->uuid().toBase64() == "abLbFtNUfEi5TmbaxiW6yg==");
QVERIFY(m_db->rootGroup()->children().at(1)->uuid().toBase64() == "u1lTRAICOkWv5QSl2xyU8w==");
QVERIFY(m_db->rootGroup()->children().at(2)->uuid().toBase64() == "7PAwxNhPaE2klutz45i2xg==");
QCOMPARE(m_db->rootGroup()->children().size(), 3);
QCOMPARE(m_db->rootGroup()->children().at(0)->uuid().toBase64(), QString("abLbFtNUfEi5TmbaxiW6yg=="));
QCOMPARE(m_db->rootGroup()->children().at(1)->uuid().toBase64(), QString("u1lTRAICOkWv5QSl2xyU8w=="));
QCOMPARE(m_db->rootGroup()->children().at(2)->uuid().toBase64(), QString("7PAwxNhPaE2klutz45i2xg=="));
QVERIFY(m_db->metadata()->recycleBin() == m_db->rootGroup()->children().at(2));
}