[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=9799c62

The following commit has been merged in the master branch:
commit 9799c629d271b0d94ede3688334eee12e2c0cdbf
Author: Vineet Garg <grgvineet at gmail.com>
Date:   Thu Aug 20 23:15:12 2015 +0530

    Added device test
---
 tests/CMakeLists.txt |   3 +-
 tests/devicetest.cpp | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ba25567..20ddb67 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -33,7 +33,6 @@ set(kdeconnectconfigtest_sources
 ecm_add_test(kdeconnectconfigtest.cpp ${kdeconnectconfigtest_sources} TEST_NAME kdeconnectconfgtest LINK_LIBRARIES ${kdeconnect_libraries})
 
 set(lanlinkprovidertest_sources
-    ../core/core_debug.h
     ../core/backends/devicelink.cpp
     ../core/backends/lan/downloadjob.cpp
     ../core/backends/lan/landevicelink.cpp
@@ -48,3 +47,5 @@ set(lanlinkprovidertest_sources
     ../core/pluginloader.cpp
 )
 ecm_add_test(lanlinkprovidertest.cpp  ${lanlinkprovidertest_sources}  TEST_NAME lanlinkprovidertest LINK_LIBRARIES ${kdeconnect_libraries})
+
+ecm_add_test(devicetest.cpp ${lanlinkprovidertest_sources} TEST_NAME devicetest LINK_LIBRARIES ${kdeconnect_libraries})
diff --git a/tests/devicetest.cpp b/tests/devicetest.cpp
new file mode 100644
index 0000000..b976ead
--- /dev/null
+++ b/tests/devicetest.cpp
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2015 Vineet Garg <grgvineet at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../core/backends/lan/lanlinkprovider.h"
+#include "../core/kdeconnectconfig.h"
+
+#include <QtTest>
+
+/**
+ * This class tests the working of device class
+ */
+class DeviceTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void initTestCase();
+    void testUnpairedDevice();
+    void testPairedDevice();
+    void cleanupTestCase();
+
+private:
+    QString deviceId;
+    QString deviceName;
+    QString deviceType;
+    NetworkPackage* identityPackage;
+
+};
+
+void DeviceTest::initTestCase()
+{
+    deviceId = QString("testdevice");
+    deviceName = QString("Test Device");
+    deviceType = QString("smartphone");
+    QString stringPackage = QString("{\"id\":1439365924847,\"type\":\"kdeconnect.identity\",\"body\":{\"deviceId\":\"testdevice\",\"deviceName\":\"Test Device\",\"protocolVersion\":6,\"deviceType\":\"phone\"}}");
+    identityPackage = new NetworkPackage("kdeconnect.identity");
+    NetworkPackage::unserialize(stringPackage.toLatin1(), identityPackage);
+}
+
+void DeviceTest::testPairedDevice()
+{
+    KdeConnectConfig* kcc = KdeConnectConfig::instance();
+    kcc->addTrustedDevice(deviceId, deviceName, deviceType);
+    kcc->setDeviceProperty(deviceId, QString("publicKey"), kcc->publicKey().toPEM()); // Using same public key from kcc, instead of creating new one
+    kcc->setDeviceProperty(deviceId, QString("certificate"), QString::fromLatin1(kcc->certificate().toPem())); // Using same certificate from kcc, instead of generating one
+
+    Device device(this, deviceId);
+
+    QCOMPARE(device.id(), deviceId);
+    QCOMPARE(device.name(), deviceName);
+    QCOMPARE(device.type(), deviceType);
+
+    QVERIFY2(!device.publicKey().isNull(), "Public key for device is null");
+    QCOMPARE(device.publicKey(), kcc->publicKey());
+
+    QVERIFY2(device.certificate().isNull(), "Certificate should be null before initialisation");
+
+    // TODO : Set certificate via identity package
+
+    QCOMPARE(device.isPaired(), true);
+    QCOMPARE(device.pairRequested(), false);
+
+    QCOMPARE(device.isReachable(), false);
+
+    // Add link
+    LanLinkProvider linkProvider;
+    QSslSocket socket;
+    LanDeviceLink* link = new LanDeviceLink(deviceId, &linkProvider, &socket);
+    device.addLink(*identityPackage, link);
+
+    QCOMPARE(device.isReachable(), true);
+    QCOMPARE(device.availableLinks().contains(linkProvider.name()), true);
+
+    // Remove link
+    device.removeLink(link);
+
+    QCOMPARE(device.isReachable(), false);
+    QCOMPARE(device.availableLinks().contains(linkProvider.name()), false);
+
+    device.unpair();
+    QCOMPARE(device.isPaired(), false);
+
+}
+
+void DeviceTest::testUnpairedDevice()
+{
+    LanLinkProvider linkProvider;
+    QSslSocket socket;
+    LanDeviceLink* link = new LanDeviceLink(deviceId, &linkProvider, &socket);
+
+    Device device(this, *identityPackage, link);
+
+    QCOMPARE(device.id(), deviceId);
+    QCOMPARE(device.name(), deviceName);
+    QCOMPARE(device.type(), deviceType);
+
+    QVERIFY2(device.publicKey().isNull(), "Public key for unpaired device should be null");
+    QVERIFY2(device.certificate().isNull(), "Certificate for unpaired device should be null");
+
+    QCOMPARE(device.isPaired(), false);
+    QCOMPARE(device.pairRequested(), false);
+
+    QCOMPARE(device.isReachable(), true);
+    QCOMPARE(device.availableLinks().contains(linkProvider.name()), true);
+
+    // Remove link
+    device.removeLink(link);
+
+    QCOMPARE(device.isReachable(), false);
+    QCOMPARE(device.availableLinks().contains(linkProvider.name()), false);
+}
+
+void DeviceTest::cleanupTestCase()
+{
+    delete identityPackage;
+}
+QTEST_GUILESS_MAIN(DeviceTest)
+
+#include "devicetest.moc"

-- 
kdeconnect packaging