Commit 3d06acd0 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Add resource

parent c6ff4e87
[General]
IsConfigured=true
Path[$e]=[TEST_PATH]/resources/akonadi_contacts_resource_1/
[General]
IsConfigured=true
Path[$e]=[TEST_PATH]/resources/akonadi_vcard_resource_1/
[General]
IsConfigured=true
Path[$e]=[TEST_PATH]/resources/akonadi_vcarddir_resource_1/
......@@ -118,11 +118,11 @@ void ExportAddressbookJobInterfaceTest::exportAddressBookConfigAndResource()
QVector<Utils::AkonadiInstanceInfo> lstInfo;
Utils::AkonadiInstanceInfo info;
info.identifier = QLatin1String("akonadi_vcarddir_resource_1");
info.identifier = QStringLiteral("akonadi_vcarddir_resource_1");
lstInfo << info;
info.identifier = QLatin1String("akonadi_contacts_resource_1");
info.identifier = QStringLiteral("akonadi_contacts_resource_1");
lstInfo << info;
info.identifier = QLatin1String("akonadi_vcard_resource_1");
info.identifier = QStringLiteral("akonadi_vcard_resource_1");
lstInfo << info;
//Add extra resource.
info.identifier = QStringLiteral("akonadi_kolab_resource_2");
......
......@@ -47,6 +47,7 @@ void SaveResoureConfigTest::exportResourceToArchive(const QString &archivePath,
}
}
QVERIFY(typeIdentifierFound);
//qDebug() << "url " << url + identifier + QLatin1String(".zip");
QVERIFY(mArchive->addLocalFile(url + identifier + QLatin1String(".zip"), archivePath + resourceArchiveName));
ResourceConverterTest converter;
const QString errorStr = converter.storeResources(mArchive, identifier, archivePath);
......
......@@ -75,7 +75,11 @@ void TestExportFile::start()
QSignalSpy error(mAbstractImportExportJob, &AbstractImportExportJob::error);
mAbstractImportExportJob->start();
QVERIFY(finish.wait());
QCOMPARE(error.count(), 0);
const bool hasError = error.count() > 0;
if (hasError) {
qDebug() << " error " << error.at(0);
}
QVERIFY(!hasError);
delete mArchiveStorage;
mArchiveStorage = nullptr;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment