ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Browser icon definition in introspect

pull/220/head
Michael Zanetti 2019-10-08 15:51:10 +02:00
parent 6aa624c261
commit 1f68389a85
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/jsonrpc/jsontypes.cpp
View File

@ -490,8 +490,8 @@ QVariantMap JsonTypes::allTypes()
allTypes.insert("UserError", userError());
allTypes.insert("TagError", tagError());
allTypes.insert("CloudConnectionState", cloudConnectionState());
allTypes.insert("BrowserIcon", browserIconRef());
allTypes.insert("MediaBrowserIcon", mediaBrowserIconRef());
allTypes.insert("BrowserIcon", browserIcon());
allTypes.insert("MediaBrowserIcon", mediaBrowserIcon());
allTypes.insert("StateType", stateTypeDescription());
allTypes.insert("StateDescriptor", stateDescriptorDescription());

34
tests/auto/api.json
View File

@ -1399,7 +1399,18 @@
"Time",
"Object"
],
"BrowserIcon": "$ref:BrowserIcon",
"BrowserIcon": [
"BrowserIconNone",
"BrowserIconFolder",
"BrowserIconFile",
"BrowserIconMusic",
"BrowserIconVideo",
"BrowserIconPictures",
"BrowserIconApplication",
"BrowserIconDocument",
"BrowserIconPackage",
"BrowserIconFavorites"
],
"BrowserItem": {
"actionTypeIds": [
"Uuid"
@ -1607,7 +1618,26 @@
"LoggingSourceRules",
"LoggingSourceBrowserActions"
],
"MediaBrowserIcon": "$ref:MediaBrowserIcon",
"MediaBrowserIcon": [
"MediaBrowserIconNone",
"MediaBrowserIconPlaylist",
"MediaBrowserIconRecentlyPlayed",
"MediaBrowserIconLibrary",
"MediaBrowserIconMusicLibrary",
"MediaBrowserIconVideoLibrary",
"MediaBrowserIconPictureLibrary",
"MediaBrowserIconDisk",
"MediaBrowserIconUSB",
"MediaBrowserIconNetwork",
"MediaBrowserIconAux",
"MediaBrowserIconSpotify",
"MediaBrowserIconAmazon",
"MediaBrowserIconTuneIn",
"MediaBrowserIconSiriusXM",
"MediaBrowserIconVTuner",
"MediaBrowserIconTidal",
"MediaBrowserIconAirable"
],
"MqttPolicy": {
"allowedPublishTopicFilters": "StringList",
"allowedSubscribeTopicFilters": "StringList",

1
tests/auto/jsonrpc/testjsonrpc.cpp
View File

@ -616,6 +616,7 @@ void TestJSONRPC::introspect()
QString typeId = ref;
typeId.remove("$ref:");
QVERIFY2(types.contains(typeId), QString("Undefined ref: %1. Did you forget to add it to JsonTypes::allTypes()?").arg(ref).toLatin1().data());
QVERIFY2(!types.value(typeId).toString().startsWith("$ref:"), QString("Definition for %1 must not be a reference itself").arg(ref).toLatin1().data());
}
}
}