Clean up

core/autotests/mail/data/import/identities/references/identities/emailidentities

 [General]
-Default Identity=2
+Default Identity=1
 
 [Identity #0]
 Attach Vcard=false
 Autocorrection Language=fr_FR
-Bcc=dd@foo.com
-Default Domain=9td
-Dictionary=français (France)
+Bcc=foo@kde.org
+Default Domain=zym0
+Dictionary=American English (United States)
 Disable Fcc=false
 Drafts=3730
-Email Address=dd@foo.com
-Email Aliases=dde@foo.com
+Email Address=foo@kde.org
+Email Aliases=
 Fcc=3734
-Identity=Kolab
+Identity=Default
 Image Location=
-Inline Signature=OpenGL Experts\n
+Inline Signature=olutions\s
 Inlined Html=false
-Name=Bla Bli
+Name=kd
+Organization=kde
+PGP Encryption Key=CDF87D8A5BAA692D34B30D1065D31
+PGP Signing Key=F87D8A5BAA692D34B30D1065D31
 Pgp Auto Encrypt=false
 Pgp Auto Sign=false
-Preferred Crypto Message Format=s/mime
+Preferred Crypto Message Format=openpgp/mime
+Reply-To Address=foo@kde.org
 SMIME Encryption Key=E225DBF44009243D1F177F552D5397C
 SMIME Signing Key=9243D1F177F552D5397C
 Signature Enabled=true
 Signature Type=inline
 Templates=3735
-Transport=1960518839
-X-FaceEnabled=true
+Transport=1701481874
+X-FaceEnabled=false
 uoid=1
 
 [Identity #1]
 Attach Vcard=false
 Autocorrection Language=fr_FR
-Bcc=foo@kde.org
-Default Domain=zym0
-Dictionary=American English (United States)
+Bcc=dd@foo.com
+Default Domain=9td
+Dictionary=français (France)
 Disable Fcc=false
 Drafts=3730
-Email Address=foo@kde.org
-Email Aliases=
+Email Address=dd@foo.com
+Email Aliases=dde@foo.com
 Fcc=3734
-Identity=Default
+Identity=Kolab
 Image Location=
-Inline Signature=olutions\s
+Inline Signature=OpenGL Experts\n
 Inlined Html=false
-Name=kd
+Name=Bla Bli
 Organization=kde
 PGP Encryption Key=CDF87D8A5BAA692D34B30D1065D31
 PGP Signing Key=F87D8A5BAA692D34B30D1065D31
 Pgp Auto Encrypt=false
 Pgp Auto Sign=false
-Preferred Crypto Message Format=openpgp/mime
+Preferred Crypto Message Format=s/mime
 Reply-To Address=foo@kde.org
+SMIME Encryption Key=E225DBF44009243D1F177F552D5397C
+SMIME Signing Key=9243D1F177F552D5397C
 Signature Enabled=true
 Signature Type=inline
 Templates=3735
-Transport=1701481874
-X-FaceEnabled=false
+Transport=1960518839
+X-FaceEnabled=true
 uoid=2

core/autotests/mail/importmailjobinterfacetestimpl.cpp

@@ -40,7 +40,6 @@ ImportMailJobInterfaceTestImpl::~ImportMailJobInterfaceTestImpl()
 void ImportMailJobInterfaceTestImpl::start()
 {
     QDir().mkpath(extractPath());
-    //Create temporary file for identities
     ImportMailJobInterface::start();
 }
 
@@ -88,6 +87,7 @@ QString ImportMailJobInterfaceTestImpl::adaptNewResourceUrl(bool overwriteResour
 
 void ImportMailJobInterfaceTestImpl::addNewIdentity(const QString &name, KConfigGroup &group, int defaultIdentities, int oldUid)
 {
+    //TODO order ????
     //qDebug() << " void ImportMailJobInterfaceTestImpl::addNewIdentity(const QString &name, KConfigGroup &group, int defaultIdentities, int oldUid) not implemented yet" << oldUid << " name " << name;
     const QString uniqueName = uniqueIdentityName(name);
     KIdentityManagement::Identity identity;