ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump api and fix all tests

Browse Source
This commit is contained in:
Simon Stürz 2016-08-21 13:39:35 +02:00 committed by Michael Zanetti
parent 859c5b0df8
commit 8c90550c63
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/rest/rulesresource.cpp
View File

@ -321,7 +321,7 @@ HttpReply *RulesResource::editRule(const RuleId &ruleId, const QByteArray &paylo
return createRuleErrorReply(HttpReply::Ok, status); 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); return createRuleErrorReply(HttpReply::BadRequest, status);
} }

15
tests/auto/api.json
View File

@ -978,15 +978,16 @@
"LoggingSourceRules" "LoggingSourceRules"
], ],
"Param": { "Param": {
"name": "String", "paramTypeId": "Uuid",
"value": "$ref:BasicType" "value": "$ref:BasicType"
}, },
"ParamDescriptor": { "ParamDescriptor": {
"name": "String",
"operator": "$ref:ValueOperator", "operator": "$ref:ValueOperator",
"paramTypeId": "Uuid",
"value": "$ref:BasicType" "value": "$ref:BasicType"
}, },
"ParamType": { "ParamType": {
"id": "Uuid",
"index": "Int", "index": "Int",
"name": "String", "name": "String",
"o:allowedValues": [ "o:allowedValues": [
@ -1003,8 +1004,8 @@
"Plugin": { "Plugin": {
"id": "Uuid", "id": "Uuid",
"name": "String", "name": "String",
"params": [ "paramTypes": [
"$ref:Param" "$ref:ParamType"
] ]
}, },
"RemovePolicy": [ "RemovePolicy": [
@ -1054,10 +1055,10 @@
] ]
}, },
"RuleActionParam": { "RuleActionParam": {
"name": "String", "o:eventParamTypeId": "Uuid",
"o:eventParamName": "String",
"o:eventTypeId": "Uuid", "o:eventTypeId": "Uuid",
"o:value": "$ref:BasicType" "o:value": "$ref:BasicType",
"paramTypeId": "Uuid"
}, },
"RuleDescription": { "RuleDescription": {
"active": "Bool", "active": "Bool",

13
tests/auto/restrules/testrestrules.cpp
View File

@ -346,7 +346,7 @@ void TestRestRules::addRemoveRules_data()
stateDescriptor.insert("stateTypeId", mockIntStateId); stateDescriptor.insert("stateTypeId", mockIntStateId);
stateDescriptor.insert("deviceId", m_mockDeviceId); stateDescriptor.insert("deviceId", m_mockDeviceId);
stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess)); stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess));
stateDescriptor.insert("value", "20"); stateDescriptor.insert("value", 20);
// StateEvaluator // StateEvaluator
QVariantMap validStateEvaluator; QVariantMap validStateEvaluator;
@ -396,7 +396,7 @@ void TestRestRules::addRemoveRules_data()
QVariantMap validActionEventBasedParam1; QVariantMap validActionEventBasedParam1;
validActionEventBasedParam1.insert("paramTypeId", mockActionParam1ParamTypeId); validActionEventBasedParam1.insert("paramTypeId", mockActionParam1ParamTypeId);
validActionEventBasedParam1.insert("eventTypeId", mockEvent2Id); validActionEventBasedParam1.insert("eventTypeId", mockEvent2Id);
validActionEventBasedParam1.insert("eventParamTypeId", mockEvent2Id); validActionEventBasedParam1.insert("eventParamTypeId", mockParamIntParamTypeId);
QVariantMap validActionEventBasedParam2; QVariantMap validActionEventBasedParam2;
validActionEventBasedParam2.insert("paramTypeId", mockActionParam2ParamTypeId); validActionEventBasedParam2.insert("paramTypeId", mockActionParam2ParamTypeId);
validActionEventBasedParam2.insert("value", false); validActionEventBasedParam2.insert("value", false);
@ -414,7 +414,7 @@ void TestRestRules::addRemoveRules_data()
QVariantMap invalidActionEventBasedParam2; QVariantMap invalidActionEventBasedParam2;
invalidActionEventBasedParam2.insert("paramTypeId", mockActionParam1ParamTypeId); invalidActionEventBasedParam2.insert("paramTypeId", mockActionParam1ParamTypeId);
invalidActionEventBasedParam2.insert("eventTypeId", mockEvent1Id); invalidActionEventBasedParam2.insert("eventTypeId", mockEvent1Id);
invalidActionEventBasedParam2.insert("eventParamTypeId", mockEvent1Id); invalidActionEventBasedParam2.insert("eventParamTypeId", ParamTypeId::createParamTypeId());
QVariantMap invalidActionEventBasedParam3; QVariantMap invalidActionEventBasedParam3;
invalidActionEventBasedParam3.insert("paramTypeId", mockActionParam2ParamTypeId); invalidActionEventBasedParam3.insert("paramTypeId", mockActionParam2ParamTypeId);
invalidActionEventBasedParam3.insert("value", 2); invalidActionEventBasedParam3.insert("value", 2);
@ -426,7 +426,7 @@ void TestRestRules::addRemoveRules_data()
QVariantMap invalidActionEventBasedParam4; QVariantMap invalidActionEventBasedParam4;
invalidActionEventBasedParam4.insert("paramTypeId", mockActionParam1ParamTypeId); invalidActionEventBasedParam4.insert("paramTypeId", mockActionParam1ParamTypeId);
invalidActionEventBasedParam4.insert("eventTypeId", mockEvent1Id); invalidActionEventBasedParam4.insert("eventTypeId", mockEvent1Id);
invalidActionEventBasedParam4.insert("eventParamTypeId", mockEvent1Id); invalidActionEventBasedParam4.insert("eventParamTypeId", mockParamIntParamTypeId);
invalidActionEventBased3.insert("ruleActionParams", QVariantList() << invalidActionEventBasedParam4); invalidActionEventBased3.insert("ruleActionParams", QVariantList() << invalidActionEventBasedParam4);
QTest::addColumn<bool>("enabled"); QTest::addColumn<bool>("enabled");
@ -602,7 +602,7 @@ void TestRestRules::editRules_data()
validEventDescriptor2.insert("deviceId", m_mockDeviceId); validEventDescriptor2.insert("deviceId", m_mockDeviceId);
QVariantList params; QVariantList params;
QVariantMap param1; QVariantMap param1;
param1.insert("name", "mockParamInt"); param1.insert("paramTypeId", mockParamIntParamTypeId);
param1.insert("value", 3); param1.insert("value", 3);
param1.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorEquals)); param1.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorEquals));
params.append(param1); params.append(param1);
@ -630,7 +630,7 @@ void TestRestRules::editRules_data()
QVariantMap validActionEventBasedParam1; QVariantMap validActionEventBasedParam1;
validActionEventBasedParam1.insert("paramTypeId", mockActionParam1ParamTypeId); validActionEventBasedParam1.insert("paramTypeId", mockActionParam1ParamTypeId);
validActionEventBasedParam1.insert("eventTypeId", mockEvent2Id); validActionEventBasedParam1.insert("eventTypeId", mockEvent2Id);
validActionEventBasedParam1.insert("eventParamTypeId", mockEvent2Id); validActionEventBasedParam1.insert("eventParamTypeId", mockParamIntParamTypeId);
QVariantMap validActionEventBasedParam2; QVariantMap validActionEventBasedParam2;
validActionEventBasedParam2.insert("paramTypeId", mockActionParam2ParamTypeId); validActionEventBasedParam2.insert("paramTypeId", mockActionParam2ParamTypeId);
validActionEventBasedParam2.insert("value", false); validActionEventBasedParam2.insert("value", false);
@ -756,7 +756,6 @@ void TestRestRules::editRules()
action1.insert("ruleActionParams", QVariantList()); action1.insert("ruleActionParams", QVariantList());
QVariantMap action2; QVariantMap action2;
action2.insert("actionTypeId", mockActionIdWithParams); action2.insert("actionTypeId", mockActionIdWithParams);
qDebug() << "got action id" << mockActionIdWithParams;
action2.insert("deviceId", m_mockDeviceId); action2.insert("deviceId", m_mockDeviceId);
QVariantList action2Params; QVariantList action2Params;
QVariantMap action2Param1; QVariantMap action2Param1;

4
tests/auto/rules/testrules.cpp
View File

@ -269,7 +269,7 @@ void TestRules::addRemoveRules_data()
stateDescriptor.insert("stateTypeId", mockIntStateId); stateDescriptor.insert("stateTypeId", mockIntStateId);
stateDescriptor.insert("deviceId", m_mockDeviceId); stateDescriptor.insert("deviceId", m_mockDeviceId);
stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess)); stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess));
stateDescriptor.insert("value", "20"); stateDescriptor.insert("value", 20);
// StateEvaluator // StateEvaluator
QVariantMap validStateEvaluator; QVariantMap validStateEvaluator;
@ -512,7 +512,7 @@ void TestRules::editRules_data()
stateDescriptor.insert("stateTypeId", mockIntStateId); stateDescriptor.insert("stateTypeId", mockIntStateId);
stateDescriptor.insert("deviceId", m_mockDeviceId); stateDescriptor.insert("deviceId", m_mockDeviceId);
stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess)); stateDescriptor.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorLess));
stateDescriptor.insert("value", "20"); stateDescriptor.insert("value", 20);
// StateEvaluator // StateEvaluator
QVariantMap validStateEvaluator; QVariantMap validStateEvaluator;