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

improve autotest

parent 7da72e98
Pipeline #22395 passed with stage
in 12 minutes and 31 seconds
......@@ -33,6 +33,7 @@ ImportAddressbookJobInterfaceTestImpl::~ImportAddressbookJobInterfaceTestImpl()
{
//Clean up temp repo
QVERIFY(QDir(extractPath()).removeRecursively());
QVERIFY(QDir(QDir::tempPath() + QLatin1Char('/') + Utils::storeAddressbook()).removeRecursively());
}
Akonadi::Collection::Id ImportAddressbookJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path)
......
information/VERSION_2
information/exportdatatype.xml
alarm/akonadi_kalarm_dir_resource_2/agent_config_akonadi_kalarm_dir_resource_2
alarm/akonadi_kalarm_dir_resource_2/akonadi_kalarm_dir_resource_2rc
alarm/akonadi_kalarm_dir_resource_2/alarm.zip
configs/kalarmrc
[$Version]
update_info=kalarm.upd:1.9.5,kalarm.upd:1.9.9,kalarm.upd:1.9.12,kalarm.upd:2.0.0,kalarm.upd:2.0.2,kalarm.upd:2.1.5,kalarm.upd:2.3.2
[AgentTypeDialog]
Size=460,320
[Collections]
FavoriteCollectionIds=2645,2644,2642
FavoriteCollectionLabels=Active Alarms,Alarm Templates,Archived Alarms
[General]
AutoStart=true
Backend=Akonadi
Version=3.0.0A
[MainWindow]
Splitter 1920=143
State=AAAA/wAAAAD9AAAAAAAAAoAAAAGdAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
ToolBarsMovable=Disabled
[Migratekde4]
Version=1
[Notification Messages]
AskAutoStart=
ConfirmAlarmDeletion=true
EmailQueuedNotify=false
QuitWarn=
noWritableCal=false
[View]
ShowArchivedAlarms=true
ShowResources=true
akonadi_kalarm_dir_resource
Active Alarms2
Path /tmp/backupalarm//calendar.ics
1
--------------------------
akonadi_kalarm_dir_resource_new_resource_0
--------------------------
......@@ -33,6 +33,7 @@ ImportAlarmJobInterfaceTestImpl::~ImportAlarmJobInterfaceTestImpl()
{
//Clean up temp repo
QVERIFY(QDir(extractPath()).removeRecursively());
QVERIFY(QDir(QDir::tempPath() + QLatin1Char('/') + Utils::storeAlarm()).removeRecursively());
}
Akonadi::Collection::Id ImportAlarmJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path)
......
......@@ -31,6 +31,7 @@ ImportCalendarJobInterfaceTestImpl::~ImportCalendarJobInterfaceTestImpl()
{
//Clean up temp repo
QVERIFY(QDir(extractPath()).removeRecursively());
QVERIFY(QDir(QDir::tempPath() + QLatin1Char('/') + Utils::storeCalendar()).removeRecursively());
}
Akonadi::Collection::Id ImportCalendarJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path)
......
......@@ -35,6 +35,7 @@ ImportMailJobInterfaceTestImpl::ImportMailJobInterfaceTestImpl(QObject *parent,
ImportMailJobInterfaceTestImpl::~ImportMailJobInterfaceTestImpl()
{
QVERIFY(QDir(extractPath()).removeRecursively());
QVERIFY(QDir(QDir::tempPath() + QLatin1Char('/') + Utils::storeMails()).removeRecursively());
}
void ImportMailJobInterfaceTestImpl::start()
......@@ -68,8 +69,10 @@ void ImportMailJobInterfaceTestImpl::registerSpecialCollection(Akonadi::SpecialM
void ImportMailJobInterfaceTestImpl::importFilters(const QString &filename)
{
qDebug() << " void ImportMailJobInterfaceTestImpl::importFilters(const QString &filename)" << filename;
//qDebug() << " void ImportMailJobInterfaceTestImpl::importFilters(const QString &filename)" << filename << " extractpath " << extractPath();
QFile f(filename);
QDir dir(extractPath());
QVERIFY(dir.mkpath(QStringLiteral("config")));
QVERIFY(f.copy(extractPath() + QStringLiteral("/config/filters")));
}
......@@ -89,7 +92,6 @@ 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;
......@@ -99,7 +101,6 @@ void ImportMailJobInterfaceTestImpl::addNewIdentity(const QString &name, KConfig
group.writeEntry(QStringLiteral("Name"), uniqueName);
group.sync();
//TODO ????
KConfig config(extractPath() + QStringLiteral("/identities/emailidentities"));
identity.readConfig(group);
......
......@@ -33,6 +33,9 @@ struct ResourceFiles {
{
qDebug() << " akonadiconfigfile :" << akonadiConfigFile << " akonadiResources:" << akonadiResources << " akonadiAgentConfigFile:" << akonadiAgentConfigFile;
}
bool operator<(const ResourceFiles &other) const {
return other.akonadiConfigFile < akonadiConfigFile;
}
};
namespace Utils {
......
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