Skip to content
This repository has been archived by the owner on Sep 4, 2021. It is now read-only.

Commit

Permalink
[libcontacts] Fix tst_import unit test
Browse files Browse the repository at this point in the history
Commit 813eafc changed how formatted
name (FN) properties from vCards are imported, so that now an import
involving de-duplication can result in a single contact with multiple
nicknames (setNickname() actually adds nicknames if the new nickname
does not match a previously set nickname).
  • Loading branch information
Chris Adams committed Apr 8, 2015
1 parent 9673285 commit a80cc4f
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions tests/tst_seasideimport/tst_seasideimport.cpp
Expand Up @@ -468,10 +468,15 @@ void tst_SeasideImport::mergedUid()
QCOMPARE(name.isEmpty(), true);

const QList<QContactNickname> nicknames(c.details<QContactNickname>());
QCOMPARE(nicknames.count(), 1);
QCOMPARE(nicknames.count(), 2);

const QContactNickname nick(nicknames.at(0));
QCOMPARE(nick.nickname(), QString::fromLatin1("Jebediah Springfield"));
const QContactNickname nick1(nicknames.at(0));
const QContactNickname nick2(nicknames.at(1));
QVERIFY(nick1.nickname() == QString::fromLatin1("Jebediah Springfield")
|| nick1.nickname() == QString::fromLatin1("Obadiah Springfield"));
QVERIFY(nick2.nickname() == QString::fromLatin1("Jebediah Springfield")
|| nick2.nickname() == QString::fromLatin1("Obadiah Springfield"));
QVERIFY(nick1.nickname() != nick2.nickname());

const QList<QContactPhoneNumber> phoneNumbers(c.details<QContactPhoneNumber>());
QCOMPARE(phoneNumbers.count(), 2);
Expand All @@ -494,4 +499,4 @@ void tst_SeasideImport::mergedUid()
}

#include "tst_seasideimport.moc"
QTEST_APPLESS_MAIN(tst_SeasideImport)
QTEST_GUILESS_MAIN(tst_SeasideImport)

0 comments on commit a80cc4f

Please sign in to comment.