philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add OperationBase::newOperation() to avoid duplicated code

Browse Source
This commit is contained in:
Sergio Martins
2019-10-13 18:41:27 +01:00
parent ae439e0dad
commit e278d0108a
3 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/fuzzer/Operations.cpp
View File

@@ -64,17 +64,37 @@ QVariantMap OperationBase::toVariantMap() const
OperationBase::Ptr OperationBase::fromVariantMap(Fuzzer *fuzzer, const QVariantMap &map)
{
OperationBase::Ptr ptr;
if (!map.contains("type") || !map.contains("params")) {
qDebug() << Q_FUNC_INFO << "Invalid map";
return {};
}
auto operationType = OperationType(map["type"].toInt());
switch (operationType) {
OperationBase::Ptr ptr = OperationBase::newOperation(fuzzer, operationType);
if (ptr) {
const QVariantMap params = map["params"].toMap();
if (params.isEmpty()) {
qDebug() << Q_FUNC_INFO << "Invalid params";
} else {
ptr->fillParamsFromVariantMap(params);
}
} else {
qDebug() << Q_FUNC_INFO << "Failed to fill params";
}
return ptr;
}
OperationBase::Ptr OperationBase::newOperation(Fuzzer *fuzzer, OperationType type)
{
OperationBase::Ptr ptr;
switch (type) {
case OperationType_Count:
case OperationType_None:
qDebug() << Q_FUNC_INFO << "Invalid type";
break;
case OperationType_CloseViaDockWidgetAPI:
ptr = OperationBase::Ptr(new CloseViaDockWidgetAPI(fuzzer));
@@ -93,18 +113,6 @@ OperationBase::Ptr OperationBase::fromVariantMap(Fuzzer *fuzzer, const QVariantM
break;
}
if (ptr) {
const QVariantMap params = map["params"].toMap();
if (params.isEmpty()) {
qDebug() << Q_FUNC_INFO << "Invalid params";
} else {
ptr->fillParamsFromVariantMap(params);
}
} else {
qDebug() << Q_FUNC_INFO << "Failed to fill params";
}
return ptr;
}