From 8c90550c6340738ce4eadeec144c6e42428a68c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sun, 21 Aug 2016 13:39:35 +0200 Subject: [PATCH] bump api and fix all tests --- server/rest/rulesresource.cpp | 2 +- tests/auto/api.json | 15 ++++++++------- tests/auto/restrules/testrestrules.cpp | 13 ++++++------- tests/auto/rules/testrules.cpp | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/server/rest/rulesresource.cpp b/server/rest/rulesresource.cpp index 9e40df17..203190da 100644 --- a/server/rest/rulesresource.cpp +++ b/server/rest/rulesresource.cpp @@ -321,7 +321,7 @@ HttpReply *RulesResource::editRule(const RuleId &ruleId, const QByteArray &paylo return createRuleErrorReply(HttpReply::Ok, status); } - qCWarning(dcRest) << "Edit rule finished with error" << status; + qCWarning(dcRest) << "Edit rule finished with error" << JsonTypes::ruleErrorToString(status); return createRuleErrorReply(HttpReply::BadRequest, status); } diff --git a/tests/auto/api.json b/tests/auto/api.json index 5f3b3858..0c3d6eb4 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -978,15 +978,16 @@ "LoggingSourceRules" ], "Param": { - "name": "String", + "paramTypeId": "Uuid", "value": "$ref:BasicType" }, "ParamDescriptor": { - "name": "String", "operator": "$ref:ValueOperator", + "paramTypeId": "Uuid", "value": "$ref:BasicType" }, "ParamType": { + "id": "Uuid", "index": "Int", "name": "String", "o:allowedValues": [ @@ -1003,8 +1004,8 @@ "Plugin": { "id": "Uuid", "name": "String", - "params": [ - "$ref:Param" + "paramTypes": [ + "$ref:ParamType" ] }, "RemovePolicy": [ @@ -1054,10 +1055,10 @@ ] }, "RuleActionParam": { - "name": "String", - "o:eventParamName": "String", + "o:eventParamTypeId": "Uuid", "o:eventTypeId": "Uuid", - "o:value": "$ref:BasicType" + "o:value": "$ref:BasicType", + "paramTypeId": "Uuid" }, "RuleDescription": { "active": "Bool", diff --git a/tests/auto/restrules/testrestrules.cpp b/tests/auto/restrules/testrestrules.cpp index fd805624..e009c952 100644 --- a/tests/auto/restrules/testrestrules.cpp +++ b/tests/auto/restrules/testrestrules.cpp @@ -346,7 +346,7 @@ void TestRestRules::addRemoveRules_data() stateDescriptor.insert("stateTypeId", mockIntStateId); stateDescriptor.insert("deviceId", m_mockDeviceId); stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess)); - stateDescriptor.insert("value", "20"); + stateDescriptor.insert("value", 20); // StateEvaluator QVariantMap validStateEvaluator; @@ -396,7 +396,7 @@ void TestRestRules::addRemoveRules_data() QVariantMap validActionEventBasedParam1; validActionEventBasedParam1.insert("paramTypeId", mockActionParam1ParamTypeId); validActionEventBasedParam1.insert("eventTypeId", mockEvent2Id); - validActionEventBasedParam1.insert("eventParamTypeId", mockEvent2Id); + validActionEventBasedParam1.insert("eventParamTypeId", mockParamIntParamTypeId); QVariantMap validActionEventBasedParam2; validActionEventBasedParam2.insert("paramTypeId", mockActionParam2ParamTypeId); validActionEventBasedParam2.insert("value", false); @@ -414,7 +414,7 @@ void TestRestRules::addRemoveRules_data() QVariantMap invalidActionEventBasedParam2; invalidActionEventBasedParam2.insert("paramTypeId", mockActionParam1ParamTypeId); invalidActionEventBasedParam2.insert("eventTypeId", mockEvent1Id); - invalidActionEventBasedParam2.insert("eventParamTypeId", mockEvent1Id); + invalidActionEventBasedParam2.insert("eventParamTypeId", ParamTypeId::createParamTypeId()); QVariantMap invalidActionEventBasedParam3; invalidActionEventBasedParam3.insert("paramTypeId", mockActionParam2ParamTypeId); invalidActionEventBasedParam3.insert("value", 2); @@ -426,7 +426,7 @@ void TestRestRules::addRemoveRules_data() QVariantMap invalidActionEventBasedParam4; invalidActionEventBasedParam4.insert("paramTypeId", mockActionParam1ParamTypeId); invalidActionEventBasedParam4.insert("eventTypeId", mockEvent1Id); - invalidActionEventBasedParam4.insert("eventParamTypeId", mockEvent1Id); + invalidActionEventBasedParam4.insert("eventParamTypeId", mockParamIntParamTypeId); invalidActionEventBased3.insert("ruleActionParams", QVariantList() << invalidActionEventBasedParam4); QTest::addColumn("enabled"); @@ -602,7 +602,7 @@ void TestRestRules::editRules_data() validEventDescriptor2.insert("deviceId", m_mockDeviceId); QVariantList params; QVariantMap param1; - param1.insert("name", "mockParamInt"); + param1.insert("paramTypeId", mockParamIntParamTypeId); param1.insert("value", 3); param1.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorEquals)); params.append(param1); @@ -630,7 +630,7 @@ void TestRestRules::editRules_data() QVariantMap validActionEventBasedParam1; validActionEventBasedParam1.insert("paramTypeId", mockActionParam1ParamTypeId); validActionEventBasedParam1.insert("eventTypeId", mockEvent2Id); - validActionEventBasedParam1.insert("eventParamTypeId", mockEvent2Id); + validActionEventBasedParam1.insert("eventParamTypeId", mockParamIntParamTypeId); QVariantMap validActionEventBasedParam2; validActionEventBasedParam2.insert("paramTypeId", mockActionParam2ParamTypeId); validActionEventBasedParam2.insert("value", false); @@ -756,7 +756,6 @@ void TestRestRules::editRules() action1.insert("ruleActionParams", QVariantList()); QVariantMap action2; action2.insert("actionTypeId", mockActionIdWithParams); - qDebug() << "got action id" << mockActionIdWithParams; action2.insert("deviceId", m_mockDeviceId); QVariantList action2Params; QVariantMap action2Param1; diff --git a/tests/auto/rules/testrules.cpp b/tests/auto/rules/testrules.cpp index 7e7fe8c6..440d728d 100644 --- a/tests/auto/rules/testrules.cpp +++ b/tests/auto/rules/testrules.cpp @@ -269,7 +269,7 @@ void TestRules::addRemoveRules_data() stateDescriptor.insert("stateTypeId", mockIntStateId); stateDescriptor.insert("deviceId", m_mockDeviceId); stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess)); - stateDescriptor.insert("value", "20"); + stateDescriptor.insert("value", 20); // StateEvaluator QVariantMap validStateEvaluator; @@ -512,7 +512,7 @@ void TestRules::editRules_data() stateDescriptor.insert("stateTypeId", mockIntStateId); stateDescriptor.insert("deviceId", m_mockDeviceId); stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess)); - stateDescriptor.insert("value", "20"); + stateDescriptor.insert("value", 20); // StateEvaluator QVariantMap validStateEvaluator;