rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

clang-tidy: use auto

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2022-04-11 17:06:50 -07:00
committed by Jonathan White
parent f3f1520f81
commit 7e1d980d08
32 changed files with 224 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/TestDeletedObjects.cpp
View File

@@ -37,7 +37,7 @@ void TestDeletedObjects::createAndDelete(QSharedPointer<Database> db, int delObj
Group* root = db->rootGroup();
int rootChildrenCount = root->children().size();
Group* g = new Group();
auto g = new Group();
g->setParent(root);
QUuid gUuid = QUuid::createUuid();
g->setUuid(gUuid);
@@ -46,19 +46,19 @@ void TestDeletedObjects::createAndDelete(QSharedPointer<Database> db, int delObj
QCOMPARE(db->deletedObjects().at(delObjectsSize - 1).uuid, gUuid);
QCOMPARE(rootChildrenCount, root->children().size());
Group* g1 = new Group();
auto g1 = new Group();
g1->setParent(root);
QUuid g1Uuid = QUuid::createUuid();
g1->setUuid(g1Uuid);
Entry* e1 = new Entry();
auto e1 = new Entry();
e1->setGroup(g1);
QUuid e1Uuid = QUuid::createUuid();
e1->setUuid(e1Uuid);
Group* g2 = new Group();
auto g2 = new Group();
g2->setParent(g1);
QUuid g2Uuid = QUuid::createUuid();
g2->setUuid(g2Uuid);
Entry* e2 = new Entry();
auto e2 = new Entry();
e2->setGroup(g2);
QUuid e2Uuid = QUuid::createUuid();
e2->setUuid(e2Uuid);
@@ -73,7 +73,7 @@ void TestDeletedObjects::createAndDelete(QSharedPointer<Database> db, int delObj
QCOMPARE(db->deletedObjects().at(delObjectsSize - 1).uuid, g1Uuid);
QCOMPARE(rootChildrenCount, root->children().size());
Entry* e3 = new Entry();
auto e3 = new Entry();
e3->setGroup(root);
QUuid e3Uuid = QUuid::createUuid();
e3->setUuid(e3Uuid);

14
tests/TestEntry.cpp
View File

@@ -591,7 +591,7 @@ void TestEntry::testResolveClonedEntry()
void TestEntry::testIsRecycled()
{
Entry* entry = new Entry();
auto entry = new Entry();
QVERIFY(!entry->isRecycled());
Database db;
@@ -604,10 +604,10 @@ void TestEntry::testIsRecycled()
db.recycleEntry(entry);
QVERIFY(entry->isRecycled());
Group* group1 = new Group();
auto group1 = new Group();
group1->setParent(root);
Entry* entry1 = new Entry();
auto entry1 = new Entry();
entry1->setGroup(group1);
QVERIFY(!entry1->isRecycled());
db.recycleGroup(group1);
@@ -620,16 +620,16 @@ void TestEntry::testMoveUpDown()
Group* root = db.rootGroup();
QVERIFY(root);
Entry* entry0 = new Entry();
auto entry0 = new Entry();
QVERIFY(entry0);
entry0->setGroup(root);
Entry* entry1 = new Entry();
auto entry1 = new Entry();
QVERIFY(entry1);
entry1->setGroup(root);
Entry* entry2 = new Entry();
auto entry2 = new Entry();
QVERIFY(entry2);
entry2->setGroup(root);
Entry* entry3 = new Entry();
auto entry3 = new Entry();
QVERIFY(entry3);
entry3->setGroup(root);
// default order, straight

64
tests/TestEntryModel.cpp
View File

@@ -42,23 +42,23 @@ void TestEntryModel::initTestCase()
void TestEntryModel::test()
{
Group* group1 = new Group();
Group* group2 = new Group();
auto group1 = new Group();
auto group2 = new Group();
Entry* entry1 = new Entry();
auto entry1 = new Entry();
entry1->setGroup(group1);
entry1->setTitle("testTitle1");
Entry* entry2 = new Entry();
auto entry2 = new Entry();
entry2->setGroup(group1);
entry2->setTitle("testTitle2");
EntryModel* model = new EntryModel(this);
auto model = new EntryModel(this);
QSignalSpy spyAboutToBeMoved(model, SIGNAL(rowsAboutToBeMoved(QModelIndex, int, int, QModelIndex, int)));
QSignalSpy spyMoved(model, SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)));
ModelTest* modelTest = new ModelTest(model, this);
auto modelTest = new ModelTest(model, this);
model->setGroup(group1);
@@ -79,7 +79,7 @@ void TestEntryModel::test()
QSignalSpy spyAboutToRemove(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)));
QSignalSpy spyRemoved(model, SIGNAL(rowsRemoved(QModelIndex, int, int)));
Entry* entry3 = new Entry();
auto entry3 = new Entry();
entry3->setGroup(group1);
QCOMPARE(spyAboutToBeMoved.count(), 0);
@@ -130,10 +130,10 @@ void TestEntryModel::test()
void TestEntryModel::testAttachmentsModel()
{
EntryAttachments* entryAttachments = new EntryAttachments(this);
auto entryAttachments = new EntryAttachments(this);
EntryAttachmentsModel* model = new EntryAttachmentsModel(this);
ModelTest* modelTest = new ModelTest(model, this);
auto model = new EntryAttachmentsModel(this);
auto modelTest = new ModelTest(model, this);
QCOMPARE(model->rowCount(), 0);
model->setEntryAttachments(entryAttachments);
@@ -175,10 +175,10 @@ void TestEntryModel::testAttachmentsModel()
void TestEntryModel::testAttributesModel()
{
EntryAttributes* entryAttributes = new EntryAttributes(this);
auto entryAttributes = new EntryAttributes(this);
EntryAttributesModel* model = new EntryAttributesModel(this);
ModelTest* modelTest = new ModelTest(model, this);
auto model = new EntryAttributesModel(this);
auto modelTest = new ModelTest(model, this);
QCOMPARE(model->rowCount(), 0);
model->setEntryAttributes(entryAttributes);
@@ -227,8 +227,8 @@ void TestEntryModel::testAttributesModel()
void TestEntryModel::testDefaultIconModel()
{
DefaultIconModel* model = new DefaultIconModel(this);
ModelTest* modelTest = new ModelTest(model, this);
auto model = new DefaultIconModel(this);
auto modelTest = new ModelTest(model, this);
QCOMPARE(model->rowCount(), databaseIcons()->count());
@@ -238,8 +238,8 @@ void TestEntryModel::testDefaultIconModel()
void TestEntryModel::testCustomIconModel()
{
CustomIconModel* model = new CustomIconModel(this);
ModelTest* modelTest = new ModelTest(model, this);
auto model = new CustomIconModel(this);
auto modelTest = new ModelTest(model, this);
QCOMPARE(model->rowCount(), 0);
@@ -264,12 +264,12 @@ void TestEntryModel::testCustomIconModel()
void TestEntryModel::testAutoTypeAssociationsModel()
{
AutoTypeAssociationsModel* model = new AutoTypeAssociationsModel(this);
ModelTest* modelTest = new ModelTest(model, this);
auto model = new AutoTypeAssociationsModel(this);
auto modelTest = new ModelTest(model, this);
QCOMPARE(model->rowCount(), 0);
AutoTypeAssociations* associations = new AutoTypeAssociations(this);
auto associations = new AutoTypeAssociations(this);
model->setAutoTypeAssociations(associations);
QCOMPARE(model->rowCount(), 0);
@@ -300,14 +300,14 @@ void TestEntryModel::testAutoTypeAssociationsModel()
void TestEntryModel::testProxyModel()
{
EntryModel* modelSource = new EntryModel(this);
SortFilterHideProxyModel* modelProxy = new SortFilterHideProxyModel(this);
auto modelSource = new EntryModel(this);
auto modelProxy = new SortFilterHideProxyModel(this);
modelProxy->setSourceModel(modelSource);
ModelTest* modelTest = new ModelTest(modelProxy, this);
auto modelTest = new ModelTest(modelProxy, this);
Database* db = new Database();
Entry* entry = new Entry();
auto db = new Database();
auto entry = new Entry();
entry->setTitle("Test Title");
entry->setGroup(db->rootGroup());
@@ -358,18 +358,18 @@ void TestEntryModel::testProxyModel()
void TestEntryModel::testDatabaseDelete()
{
EntryModel* model = new EntryModel(this);
ModelTest* modelTest = new ModelTest(model, this);
auto model = new EntryModel(this);
auto modelTest = new ModelTest(model, this);
Database* db1 = new Database();
Group* group1 = new Group();
auto db1 = new Database();
auto group1 = new Group();
group1->setParent(db1->rootGroup());
Entry* entry1 = new Entry();
auto entry1 = new Entry();
entry1->setGroup(group1);
Database* db2 = new Database();
Entry* entry2 = new Entry();
auto db2 = new Database();
auto entry2 = new Entry();
entry2->setGroup(db2->rootGroup());
model->setEntries(QList<Entry*>() << entry1 << entry2);

50
tests/TestEntrySearcher.cpp
View File

@@ -44,21 +44,21 @@ void TestEntrySearcher::testSearch()
* - group211
* - group2111
*/
Group* group1 = new Group();
Group* group2 = new Group();
Group* group3 = new Group();
auto group1 = new Group();
auto group2 = new Group();
auto group3 = new Group();
group1->setParent(m_rootGroup);
group2->setParent(m_rootGroup);
group3->setParent(m_rootGroup);
Group* group11 = new Group();
auto group11 = new Group();
group11->setParent(group1);
Group* group21 = new Group();
Group* group211 = new Group();
Group* group2111 = new Group();
auto group21 = new Group();
auto group211 = new Group();
auto group2111 = new Group();
group21->setParent(group2);
group211->setParent(group21);
@@ -66,39 +66,39 @@ void TestEntrySearcher::testSearch()
group1->setSearchingEnabled(Group::Disable);
Entry* eRoot = new Entry();
auto eRoot = new Entry();
eRoot->setTitle("test search term test");
eRoot->setGroup(m_rootGroup);
Entry* eRoot2 = new Entry();
auto eRoot2 = new Entry();
eRoot2->setNotes("test term test");
eRoot2->setGroup(m_rootGroup);
// Searching is disabled for these
Entry* e1 = new Entry();
auto e1 = new Entry();
e1->setUsername("test search term test");
e1->setGroup(group1);
Entry* e11 = new Entry();
auto e11 = new Entry();
e11->setNotes("test search term test");
e11->setGroup(group11);
// End searching disabled
Entry* e2111 = new Entry();
auto e2111 = new Entry();
e2111->setTitle("test search term test");
e2111->setGroup(group2111);
Entry* e2111b = new Entry();
auto e2111b = new Entry();
e2111b->setNotes("test search test");
e2111b->setUsername("user123");
e2111b->setPassword("testpass");
e2111b->setGroup(group2111);
Entry* e3 = new Entry();
auto e3 = new Entry();
e3->setUrl("test search term test");
e3->setGroup(group3);
Entry* e3b = new Entry();
auto e3b = new Entry();
e3b->setTitle("test search test 123");
e3b->setUsername("test@email.com");
e3b->setPassword("realpass");
@@ -153,7 +153,7 @@ void TestEntrySearcher::testSearch()
void TestEntrySearcher::testAndConcatenationInSearch()
{
Entry* entry = new Entry();
auto entry = new Entry();
entry->setNotes("abc def ghi");
entry->setTitle("jkl");
entry->setGroup(m_rootGroup);
@@ -179,7 +179,7 @@ void TestEntrySearcher::testAndConcatenationInSearch()
void TestEntrySearcher::testAllAttributesAreSearched()
{
Entry* entry = new Entry();
auto entry = new Entry();
entry->setGroup(m_rootGroup);
entry->setTitle("testTitle");
@@ -276,35 +276,35 @@ void TestEntrySearcher::testGroup()
* - group2
* - subgroup2 (1 entry)
*/
Group* group1 = new Group();
Group* group2 = new Group();
auto group1 = new Group();
auto group2 = new Group();
group1->setParent(m_rootGroup);
group1->setName("group1");
group2->setParent(m_rootGroup);
group2->setName("group2");
Group* subgroup1 = new Group();
auto subgroup1 = new Group();
subgroup1->setName("subgroup1");
subgroup1->setParent(group1);
Group* subgroup2 = new Group();
auto subgroup2 = new Group();
subgroup2->setName("subgroup2");
subgroup2->setParent(group2);
Entry* eGroup1 = new Entry();
auto eGroup1 = new Entry();
eGroup1->setTitle("Entry Group 1");
eGroup1->setGroup(group1);
Entry* eSub1 = new Entry();
auto eSub1 = new Entry();
eSub1->setTitle("test search term test");
eSub1->setGroup(subgroup1);
Entry* eSub2 = new Entry();
auto eSub2 = new Entry();
eSub2->setNotes("test test");
eSub2->setGroup(subgroup1);
Entry* eSub3 = new Entry();
auto eSub3 = new Entry();
eSub3->setNotes("test term test");
eSub3->setGroup(subgroup2);

128
tests/TestGroup.cpp
View File

@@ -56,9 +56,9 @@ void TestGroup::cleanup()
void TestGroup::testParenting()
{
Database* db = new Database();
auto db = new Database();
QPointer<Group> rootGroup = db->rootGroup();
Group* tmpRoot = new Group();
auto tmpRoot = new Group();
QPointer<Group> g1 = new Group();
QPointer<Group> g2 = new Group();
@@ -98,8 +98,8 @@ void TestGroup::testParenting()
QVERIFY(g1->children().at(1) == g3);
QVERIFY(g3->children().contains(g4));
Group* g5 = new Group();
Group* g6 = new Group();
auto g5 = new Group();
auto g6 = new Group();
g5->setParent(db->rootGroup());
g6->setParent(db->rootGroup());
QVERIFY(db->rootGroup()->children().at(1) == g5);
@@ -129,8 +129,8 @@ void TestGroup::testParenting()
void TestGroup::testSignals()
{
Database* db = new Database();
Database* db2 = new Database();
auto db = new Database();
auto db2 = new Database();
QPointer<Group> root = db->rootGroup();
QSignalSpy spyAboutToAdd(db, SIGNAL(groupAboutToAdd(Group*, int)));
@@ -147,8 +147,8 @@ void TestGroup::testSignals()
QSignalSpy spyAboutToMove2(db2, SIGNAL(groupAboutToMove(Group*, Group*, int)));
QSignalSpy spyMoved2(db2, SIGNAL(groupMoved()));
Group* g1 = new Group();
Group* g2 = new Group();
auto g1 = new Group();
auto g2 = new Group();
g1->setParent(root);
QCOMPARE(spyAboutToAdd.count(), 1);
@@ -212,8 +212,8 @@ void TestGroup::testSignals()
QCOMPARE(spyAboutToMove2.count(), 0);
QCOMPARE(spyMoved2.count(), 0);
Group* g3 = new Group();
Group* g4 = new Group();
auto g3 = new Group();
auto g4 = new Group();
g3->setParent(root);
QCOMPARE(spyAboutToAdd.count(), 3);
@@ -247,7 +247,7 @@ void TestGroup::testSignals()
void TestGroup::testEntries()
{
Group* group = new Group();
auto group = new Group();
QPointer<Entry> entry1 = new Entry();
entry1->setGroup(group);
@@ -269,8 +269,8 @@ void TestGroup::testDeleteSignals()
{
QScopedPointer<Database> db(new Database());
Group* groupRoot = db->rootGroup();
Group* groupChild = new Group();
Group* groupChildChild = new Group();
auto groupChild = new Group();
auto groupChildChild = new Group();
groupRoot->setObjectName("groupRoot");
groupChild->setObjectName("groupChild");
groupChildChild->setObjectName("groupChildChild");
@@ -284,8 +284,8 @@ void TestGroup::testDeleteSignals()
QCOMPARE(spyAboutToRemove.count(), 2);
QCOMPARE(spyRemoved.count(), 2);
Group* group = new Group();
Entry* entry = new Entry();
auto group = new Group();
auto entry = new Entry();
entry->setGroup(group);
QSignalSpy spyEntryAboutToRemove(group, SIGNAL(entryAboutToRemove(Entry*)));
QSignalSpy spyEntryRemoved(group, SIGNAL(entryRemoved(Entry*)));
@@ -298,9 +298,9 @@ void TestGroup::testDeleteSignals()
QScopedPointer<Database> db2(new Database());
Group* groupRoot2 = db2->rootGroup();
Group* group2 = new Group();
auto group2 = new Group();
group2->setParent(groupRoot2);
Entry* entry2 = new Entry();
auto entry2 = new Entry();
entry2->setGroup(group2);
QSignalSpy spyEntryAboutToRemove2(group2, SIGNAL(entryAboutToRemove(Entry*)));
QSignalSpy spyEntryRemoved2(group2, SIGNAL(entryRemoved(Entry*)));
@@ -476,15 +476,15 @@ void TestGroup::testFindEntry()
{
QScopedPointer<Database> db(new Database());
Entry* entry1 = new Entry();
auto entry1 = new Entry();
entry1->setTitle(QString("entry1"));
entry1->setGroup(db->rootGroup());
entry1->setUuid(QUuid::createUuid());
Group* group1 = new Group();
auto group1 = new Group();
group1->setName("group1");
Entry* entry2 = new Entry();
auto entry2 = new Entry();
entry2->setTitle(QString("entry2"));
entry2->setGroup(group1);
@@ -558,11 +558,11 @@ void TestGroup::testFindGroupByPath()
{
QScopedPointer<Database> db(new Database());
Group* group1 = new Group();
auto group1 = new Group();
group1->setName("group1");
group1->setParent(db->rootGroup());
Group* group2 = new Group();
auto group2 = new Group();
group2->setName("group2");
group2->setParent(group1);
@@ -626,7 +626,7 @@ void TestGroup::testPrint()
output = db->rootGroup()->print(true);
QCOMPARE(output, QString("[empty]\n"));
Entry* entry1 = new Entry();
auto entry1 = new Entry();
entry1->setTitle(QString("entry1"));
entry1->setGroup(db->rootGroup());
entry1->setUuid(QUuid::createUuid());
@@ -634,24 +634,24 @@ void TestGroup::testPrint()
output = db->rootGroup()->print();
QCOMPARE(output, QString("entry1\n"));
Group* group1 = new Group();
auto group1 = new Group();
group1->setName("group1");
group1->setParent(db->rootGroup());
Entry* entry2 = new Entry();
auto entry2 = new Entry();
entry2->setTitle(QString("entry2"));
entry2->setGroup(group1);
entry2->setUuid(QUuid::createUuid());
Group* group2 = new Group();
auto group2 = new Group();
group2->setName("group2");
group2->setParent(db->rootGroup());
Group* subGroup = new Group();
auto subGroup = new Group();
subGroup->setName("subgroup");
subGroup->setParent(group2);
Entry* entry3 = new Entry();
auto entry3 = new Entry();
entry3->setTitle(QString("entry3"));
entry3->setGroup(subGroup);
entry3->setUuid(QUuid::createUuid());
@@ -691,13 +691,13 @@ void TestGroup::testPrint()
void TestGroup::testAddEntryWithPath()
{
Database* db = new Database();
auto db = new Database();
Group* group1 = new Group();
auto group1 = new Group();
group1->setName("group1");
group1->setParent(db->rootGroup());
Group* group2 = new Group();
auto group2 = new Group();
group2->setName("group2");
group2->setParent(group1);
@@ -742,19 +742,19 @@ void TestGroup::testIsRecycled()
Database db;
db.metadata()->setRecycleBinEnabled(true);
Group* group1 = new Group();
auto group1 = new Group();
group1->setName("group1");
group1->setParent(db.rootGroup());
Group* group2 = new Group();
auto group2 = new Group();
group2->setName("group2");
group2->setParent(db.rootGroup());
Group* group3 = new Group();
auto group3 = new Group();
group3->setName("group3");
group3->setParent(group2);
Group* group4 = new Group();
auto group4 = new Group();
group4->setName("group4");
group4->setParent(db.rootGroup());
@@ -814,64 +814,64 @@ void TestGroup::testEquals()
void TestGroup::testChildrenSort()
{
auto createTestGroupWithUnorderedChildren = []() -> Group* {
Group* parent = new Group();
auto parent = new Group();
Group* group1 = new Group();
auto group1 = new Group();
group1->setName("B");
group1->setParent(parent);
Group* group2 = new Group();
auto group2 = new Group();
group2->setName("e");
group2->setParent(parent);
Group* group3 = new Group();
auto group3 = new Group();
group3->setName("Test999");
group3->setParent(parent);
Group* group4 = new Group();
auto group4 = new Group();
group4->setName("A");
group4->setParent(parent);
Group* group5 = new Group();
auto group5 = new Group();
group5->setName("z");
group5->setParent(parent);
Group* group6 = new Group();
auto group6 = new Group();
group6->setName("045");
group6->setParent(parent);
Group* group7 = new Group();
auto group7 = new Group();
group7->setName("60");
group7->setParent(parent);
Group* group8 = new Group();
auto group8 = new Group();
group8->setName("04test");
group8->setParent(parent);
Group* group9 = new Group();
auto group9 = new Group();
group9->setName("Test12");
group9->setParent(parent);
Group* group10 = new Group();
auto group10 = new Group();
group10->setName("i");
group10->setParent(parent);
Group* subGroup1 = new Group();
auto subGroup1 = new Group();
subGroup1->setName("sub_xte");
subGroup1->setParent(group10);
Group* subGroup2 = new Group();
auto subGroup2 = new Group();
subGroup2->setName("sub_010");
subGroup2->setParent(group10);
Group* subGroup3 = new Group();
auto subGroup3 = new Group();
subGroup3->setName("sub_000");
subGroup3->setParent(group10);
Group* subGroup4 = new Group();
auto subGroup4 = new Group();
subGroup4->setName("sub_M");
subGroup4->setParent(group10);
Group* subGroup5 = new Group();
auto subGroup5 = new Group();
subGroup5->setName("sub_p");
subGroup5->setParent(group10);
Group* subGroup6 = new Group();
auto subGroup6 = new Group();
subGroup6->setName("sub_45p");
subGroup6->setParent(group10);
Group* subGroup7 = new Group();
auto subGroup7 = new Group();
subGroup7->setName("sub_6p");
subGroup7->setParent(group10);
Group* subGroup8 = new Group();
auto subGroup8 = new Group();
subGroup8->setName("sub_tt");
subGroup8->setParent(group10);
Group* subGroup9 = new Group();
auto subGroup9 = new Group();
subGroup9->setName("sub_t0");
subGroup9->setParent(group10);
@@ -996,11 +996,11 @@ void TestGroup::testHierarchy()
Group group1;
group1.setName("group1");
Group* group2 = new Group();
auto group2 = new Group();
group2->setName("group2");
group2->setParent(&group1);
Group* group3 = new Group();
auto group3 = new Group();
group3->setName("group3");
group3->setParent(group2);
@@ -1028,12 +1028,12 @@ void TestGroup::testApplyGroupIconRecursively()
// Create a database with two nested groups with one entry each
Database database;
Group* subgroup = new Group();
auto subgroup = new Group();
subgroup->setName("Subgroup");
subgroup->setParent(database.rootGroup());
QVERIFY(subgroup);
Group* subsubgroup = new Group();
auto subsubgroup = new Group();
subsubgroup->setName("Subsubgroup");
subsubgroup->setParent(subgroup);
QVERIFY(subsubgroup);
@@ -1125,7 +1125,7 @@ void TestGroup::testUsernamesRecursive()
Database database;
// Create a subgroup
Group* subgroup = new Group();
auto subgroup = new Group();
subgroup->setName("Subgroup");
subgroup->setParent(database.rootGroup());
@@ -1152,16 +1152,16 @@ void TestGroup::testMoveUpDown()
Group* root = database.rootGroup();
QVERIFY(root);
Entry* entry0 = new Entry();
auto entry0 = new Entry();
QVERIFY(entry0);
entry0->setGroup(root);
Entry* entry1 = new Entry();
auto entry1 = new Entry();
QVERIFY(entry1);
entry1->setGroup(root);
Entry* entry2 = new Entry();
auto entry2 = new Entry();
QVERIFY(entry2);
entry2->setGroup(root);
Entry* entry3 = new Entry();
auto entry3 = new Entry();
QVERIFY(entry3);
entry3->setGroup(root);
// default order, straight

16
tests/TestGroupModel.cpp
View File

@@ -35,35 +35,35 @@ void TestGroupModel::initTestCase()
void TestGroupModel::test()
{
Database* db = new Database();
auto db = new Database();
Group* groupRoot = db->rootGroup();
groupRoot->setObjectName("groupRoot");
groupRoot->setName("groupRoot");
Group* group1 = new Group();
auto group1 = new Group();
group1->setObjectName("group1");
group1->setName("group1");
group1->setParent(groupRoot);
Group* group11 = new Group();
auto group11 = new Group();
group1->setObjectName("group11");
group11->setName("group11");
group11->setParent(group1);
Group* group12 = new Group();
auto group12 = new Group();
group1->setObjectName("group12");
group12->setName("group12");
group12->setParent(group1);
Group* group121 = new Group();
auto group121 = new Group();
group1->setObjectName("group121");
group121->setName("group121");
group121->setParent(group12);
GroupModel* model = new GroupModel(db, this);
auto model = new GroupModel(db, this);
ModelTest* modelTest = new ModelTest(model, this);
auto modelTest = new ModelTest(model, this);
QModelIndex indexRoot = model->index(0, 0);
QModelIndex index1 = model->index(0, 0, indexRoot);
@@ -90,7 +90,7 @@ void TestGroupModel::test()
QSignalSpy spyAboutToMove(model, SIGNAL(rowsAboutToBeMoved(QModelIndex, int, int, QModelIndex, int)));
QSignalSpy spyMoved(model, SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)));
Group* group2 = new Group();
auto group2 = new Group();
group2->setObjectName("group2");
group2->setName("group2");
group2->setParent(groupRoot);

10
tests/TestHibp.cpp
View File

@@ -89,22 +89,22 @@ void TestHibp::testPwned()
Group* root = m_db->rootGroup();
Entry* entry1 = new Entry();
auto entry1 = new Entry();
entry1->setPassword("foo");
entry1->setGroup(root);
Entry* entry2 = new Entry();
auto entry2 = new Entry();
entry2->setPassword("xyz");
entry2->setGroup(root);
Entry* entry3 = new Entry();
auto entry3 = new Entry();
entry3->setPassword("foo");
m_db->recycleEntry(entry3);
Group* group1 = new Group();
auto group1 = new Group();
group1->setParent(root);
Entry* entry4 = new Entry();
auto entry4 = new Entry();
entry4->setPassword("bar");
entry4->setGroup(group1);

34
tests/TestMerge.cpp
View File

@@ -310,7 +310,7 @@ void TestMerge::testResolveConflictTemplate(
timestamps["initialTime"] = m_clock->currentDateTimeUtc();
QScopedPointer<Database> dbDestination(createTestDatabase());
Entry* deletedEntry1 = new Entry();
auto deletedEntry1 = new Entry();
deletedEntry1->setUuid(QUuid::createUuid());
deletedEntry1->beginUpdate();
@@ -318,7 +318,7 @@ void TestMerge::testResolveConflictTemplate(
deletedEntry1->setTitle("deletedDestination");
deletedEntry1->endUpdate();
Entry* deletedEntry2 = new Entry();
auto deletedEntry2 = new Entry();
deletedEntry2->setUuid(QUuid::createUuid());
deletedEntry2->beginUpdate();
@@ -393,7 +393,7 @@ void TestMerge::testResolveConflictTemplate(
m_clock->advanceMinute(1);
Entry* destinationEntrySingle = new Entry();
auto destinationEntrySingle = new Entry();
destinationEntrySingle->setUuid(QUuid::createUuid());
destinationEntrySingle->beginUpdate();
@@ -401,7 +401,7 @@ void TestMerge::testResolveConflictTemplate(
destinationEntrySingle->setTitle("entryDestination");
destinationEntrySingle->endUpdate();
Entry* sourceEntrySingle = new Entry();
auto sourceEntrySingle = new Entry();
sourceEntrySingle->setUuid(QUuid::createUuid());
sourceEntrySingle->beginUpdate();
@@ -455,7 +455,7 @@ void TestMerge::testDeletionConflictTemplate(int mergeMode,
// entry indirectly deleted in target after updated in source
auto createGroup = [&](const char* name, Group* parent) {
Group* group = new Group();
auto group = new Group();
group->setUuid(QUuid::createUuid());
group->setName(name);
group->setParent(parent, 0);
@@ -463,7 +463,7 @@ void TestMerge::testDeletionConflictTemplate(int mergeMode,
return group;
};
auto createEntry = [&](const char* title, Group* parent) {
Entry* entry = new Entry();
auto entry = new Entry();
entry->setUuid(QUuid::createUuid());
entry->setTitle(title);
entry->setGroup(parent);
@@ -883,7 +883,7 @@ void TestMerge::testCreateNewGroups()
m_clock->advanceSecond(1);
Group* groupSourceCreated = new Group();
auto groupSourceCreated = new Group();
groupSourceCreated->setName("group3");
groupSourceCreated->setUuid(QUuid::createUuid());
groupSourceCreated->setParent(dbSource->rootGroup());
@@ -906,7 +906,7 @@ void TestMerge::testMoveEntryIntoNewGroup()
m_clock->advanceSecond(1);
Group* groupSourceCreated = new Group();
auto groupSourceCreated = new Group();
groupSourceCreated->setName("group3");
groupSourceCreated->setUuid(QUuid::createUuid());
groupSourceCreated->setParent(dbSource->rootGroup());
@@ -941,7 +941,7 @@ void TestMerge::testUpdateEntryDifferentLocation()
QScopedPointer<Database> dbSource(
createTestDatabaseStructureClone(dbDestination.data(), Entry::CloneNoFlags, Group::CloneIncludeEntries));
Group* groupDestinationCreated = new Group();
auto groupDestinationCreated = new Group();
groupDestinationCreated->setName("group3");
groupDestinationCreated->setUuid(QUuid::createUuid());
groupDestinationCreated->setParent(dbDestination->rootGroup());
@@ -1028,7 +1028,7 @@ void TestMerge::testUpdateGroup()
void TestMerge::testUpdateGroupLocation()
{
QScopedPointer<Database> dbDestination(createTestDatabase());
Group* group3DestinationCreated = new Group();
auto group3DestinationCreated = new Group();
QUuid group3Uuid = QUuid::createUuid();
group3DestinationCreated->setUuid(group3Uuid);
group3DestinationCreated->setName("group3");
@@ -1284,7 +1284,7 @@ void TestMerge::testDeletedGroup()
QPointer<Group> group2DestinationInitial = dbDestination->rootGroup()->findChildByName("group2");
QVERIFY(group2DestinationInitial != nullptr);
Entry* entry3DestinationCreated = new Entry();
auto entry3DestinationCreated = new Entry();
entry3DestinationCreated->beginUpdate();
entry3DestinationCreated->setUuid(QUuid::createUuid());
entry3DestinationCreated->setGroup(group2DestinationInitial);
@@ -1507,19 +1507,19 @@ void TestMerge::testMergeModified()
Database* TestMerge::createTestDatabase()
{
Database* db = new Database();
auto db = new Database();
Group* group1 = new Group();
auto group1 = new Group();
group1->setName("group1");
group1->setUuid(QUuid::createUuid());
Group* group2 = new Group();
auto group2 = new Group();
group2->setName("group2");
group2->setUuid(QUuid::createUuid());
Entry* entry1 = new Entry();
auto entry1 = new Entry();
entry1->setUuid(QUuid::createUuid());
Entry* entry2 = new Entry();
auto entry2 = new Entry();
entry2->setUuid(QUuid::createUuid());
m_clock->advanceYear(1);
@@ -1544,7 +1544,7 @@ Database* TestMerge::createTestDatabase()
Database* TestMerge::createTestDatabaseStructureClone(Database* source, int entryFlags, int groupFlags)
{
Database* db = new Database();
auto db = new Database();
// the old root group is deleted by QObject::parent relationship
db->setRootGroup(source->rootGroup()->clone(static_cast<Entry::CloneFlag>(entryFlags),
static_cast<Group::CloneFlag>(groupFlags)));