From efcecb0dd14e34ab47b8df8cc39faab5091f8bb6 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 31 Dec 2013 02:33:14 +0100 Subject: [PATCH] add test scripts and fix some mistakes --- server/jsonrpcserver.cpp | 1 + tests/addconfigureddevice.sh | 4 ++++ tests/getconfigureddevices.sh | 3 +++ tests/getsupporteddevices.sh | 3 +++ 4 files changed, 11 insertions(+) create mode 100755 tests/addconfigureddevice.sh create mode 100755 tests/getconfigureddevices.sh create mode 100755 tests/getsupporteddevices.sh diff --git a/server/jsonrpcserver.cpp b/server/jsonrpcserver.cpp index 18fea371..255583e1 100644 --- a/server/jsonrpcserver.cpp +++ b/server/jsonrpcserver.cpp @@ -120,6 +120,7 @@ QVariantMap JsonRPCServer::packDevice(Device *device) triggers.append(trigger.id()); } variant.insert("triggers", triggers); + variant.insert("params", device->params()); return variant; } diff --git a/tests/addconfigureddevice.sh b/tests/addconfigureddevice.sh new file mode 100755 index 00000000..c22cb204 --- /dev/null +++ b/tests/addconfigureddevice.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +# Creates a Mumbi remote +(echo '{"id":1, "method":"Devices.AddConfiguredDevice", "params":{"deviceClass": "{d85c1ef4-197c-4053-8e40-707aa671d302}", "deviceParams": {"channel1":"true", "channel2":"false", "channel3":"false", "channel4": "false", "channel5":"false" }}}'; sleep 1) | nc localhost 1234 diff --git a/tests/getconfigureddevices.sh b/tests/getconfigureddevices.sh new file mode 100755 index 00000000..05b823b0 --- /dev/null +++ b/tests/getconfigureddevices.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +(echo '{"id":1, "method":"Devices.GetConfiguredDevices"}'; sleep 1) | nc localhost 1234 diff --git a/tests/getsupporteddevices.sh b/tests/getsupporteddevices.sh new file mode 100755 index 00000000..4211f95f --- /dev/null +++ b/tests/getsupporteddevices.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +(echo '{"id":1, "method":"Devices.GetSupportedDevices"}'; sleep 1) | nc localhost 1234