This commit is contained in:
Simon Stürz 2016-03-01 18:52:29 +01:00 committed by Michael Zanetti
parent 4d5429cb2b
commit 7b3348168b

View File

@ -746,7 +746,8 @@ void TestDevices::editDevices_data()
QTest::addColumn<QString>("name"); QTest::addColumn<QString>("name");
QTest::newRow("change name") << "New device name"; QTest::newRow("change name") << "New device name";
QTest::newRow("change name") << "Blub device"; QTest::newRow("change name") << "Foo device";
QTest::newRow("change name") << "Bar device";
} }
void TestDevices::editDevices() void TestDevices::editDevices()
@ -771,13 +772,14 @@ void TestDevices::editDevices()
response = injectAndWait("Devices.EditDevice", params); response = injectAndWait("Devices.EditDevice", params);
verifyDeviceError(response); verifyDeviceError(response);
// verify changed
QString newName; QString newName;
response = injectAndWait("Devices.GetConfiguredDevices"); response = injectAndWait("Devices.GetConfiguredDevices");
devices = response.toMap().value("params").toMap().value("devices").toList(); QVariantList devices = response.toMap().value("params").toMap().value("devices").toList();
foreach (const QVariant &deviceVariant, devices) { foreach (const QVariant &deviceVariant, devices) {
QVariantMap device = deviceVariant.toMap(); QVariantMap device = deviceVariant.toMap();
if (DeviceId(device.value("deviceId").toString()) == m_mockDeviceId) { if (DeviceId(device.value("id").toString()) == deviceId) {
qDebug() << device.value("name").toString();
newName = device.value("name").toString(); newName = device.value("name").toString();
} }
} }
@ -785,16 +787,22 @@ void TestDevices::editDevices()
restartServer(); restartServer();
// check if the changed name is still there after loading
response = injectAndWait("Devices.GetConfiguredDevices"); response = injectAndWait("Devices.GetConfiguredDevices");
devices = response.toMap().value("params").toMap().value("devices").toList(); devices = response.toMap().value("params").toMap().value("devices").toList();
foreach (const QVariant &deviceVariant, devices) { foreach (const QVariant &deviceVariant, devices) {
QVariantMap device = deviceVariant.toMap(); QVariantMap device = deviceVariant.toMap();
if (DeviceId(device.value("deviceId").toString()) == m_mockDeviceId) { if (DeviceId(device.value("id").toString()) == deviceId) {
newName = device.value("name").toString(); newName = device.value("name").toString();
break;
} }
} }
QCOMPARE(newName, name); QCOMPARE(newName, name);
params.clear();
params.insert("deviceId", deviceId.toString());
response = injectAndWait("Devices.RemoveConfiguredDevice", params);
verifyDeviceError(response);
} }
void TestDevices::reconfigureDevices_data() void TestDevices::reconfigureDevices_data()