2 files changed, 66 insertions, 0 deletions
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 9f85e77e..9a8e253c 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -4,6 +4,7 @@
 
 #include "testolmaccount.h"
 #include "olm/qolmaccount.h"
+#include "csapi/definitions/device_keys.h"
 
 using namespace Quotient;
 
@@ -67,4 +68,68 @@ void TestOlmAccount::oneTimeKeysValid()
     QCOMPARE(20, oneTimeKeysFilled.curve25519().count());
 }
 
+void TestOlmAccount::deviceKeys()
+{
+    // copied from mtxclient
+    DeviceKeys device1;
+    device1.userId   = "@alice:example.com";
+    device1.deviceId = "JLAFKJWSCS";
+    device1.keys = {{"curve25519:JLAFKJWSCS", "3C5BFWi2Y8MaVvjM8M22DBmh24PmgR0nPvJOIArzgyI"},
+                    {"ed25519:JLAFKJWSCS", "lEuiRJBit0IG6nUf5pUzWTUEsRVVe/HJkoKuEww9ULI"}};
+
+    // TODO that should be the default value
+    device1.algorithms = QStringList {"m.olm.v1.curve25519-aes-sha2",
+                           "m.megolm.v1.aes-sha2"};
+
+    device1.signatures = {
+      {"@alice:example.com",
+       {{"ed25519:JLAFKJWSCS",
+         "dSO80A01XiigH3uBiDVx/EjzaoycHcjq9lfQX0uWsqxl2giMIiSPR8a4d291W1ihKJL/"
+         "a+myXS367WT6NAIcBA"}}}};
+
+    QJsonObject j;
+    JsonObjectConverter<DeviceKeys>::dumpTo(j, device1);
+    QJsonDocument doc(j);
+    QCOMPARE(doc.toJson(QJsonDocument::Compact), "{\"algorithms\":[\"m.olm.v1.curve25519-aes-sha2\",\"m.megolm.v1.aes-sha2\"],"
+              "\"device_id\":\"JLAFKJWSCS\",\"keys\":{\"curve25519:JLAFKJWSCS\":"
+              "\"3C5BFWi2Y8MaVvjM8M22DBmh24PmgR0nPvJOIArzgyI\",\"ed25519:JLAFKJWSCS\":"
+              "\"lEuiRJBit0IG6nUf5pUzWTUEsRVVe/"
+              "HJkoKuEww9ULI\"},\"signatures\":{\"@alice:example.com\":{\"ed25519:JLAFKJWSCS\":"
+              "\"dSO80A01XiigH3uBiDVx/EjzaoycHcjq9lfQX0uWsqxl2giMIiSPR8a4d291W1ihKJL/"
+              "a+myXS367WT6NAIcBA\"}},\"user_id\":\"@alice:example.com\"}");
+
+    auto doc2 = QJsonDocument::fromJson(R"({
+      "user_id": "@alice:example.com",
+      "device_id": "JLAFKJWSCS",
+      "algorithms": [
+        "m.olm.v1.curve25519-aes-sha2",
+        "m.megolm.v1.aes-sha2"
+      ],
+      "keys": {
+        "curve25519:JLAFKJWSCS": "3C5BFWi2Y8MaVvjM8M22DBmh24PmgR0nPvJOIArzgyI",
+        "ed25519:JLAFKJWSCS": "lEuiRJBit0IG6nUf5pUzWTUEsRVVe/HJkoKuEww9ULI"
+      },
+      "signatures": {
+        "@alice:example.com": {
+          "ed25519:JLAFKJWSCS": "dSO80A01XiigH3uBiDVx/EjzaoycHcjq9lfQX0uWsqxl2giMIiSPR8a4d291W1ihKJL/a+myXS367WT6NAIcBA"
+        }
+      },
+      "unsigned": {
+        "device_display_name": "Alice's mobile phone"
+      }
+    })");
+
+    DeviceKeys device2;
+    JsonObjectConverter<DeviceKeys>::fillFrom(doc2.object(), device2);
+
+    QCOMPARE(device2.userId, device1.userId);
+    QCOMPARE(device2.deviceId, device1.deviceId);
+    QCOMPARE(device2.keys, device1.keys);
+    QCOMPARE(device2.algorithms, device1.algorithms);
+    QCOMPARE(device2.signatures, device1.signatures);
+
+    // UnsignedDeviceInfo is missing from the generated DeviceKeys object :(
+    // QCOMPARE(device2.unsignedInfo.deviceDisplayName, "Alice's mobile phone");
+}
+
 QTEST_MAIN(TestOlmAccount)
diff --git a/autotests/testolmaccount.h b/autotests/testolmaccount.h
index e7b32b8b..547c25c1 100644
--- a/autotests/testolmaccount.h
+++ b/autotests/testolmaccount.h
@@ -14,4 +14,5 @@ private Q_SLOTS:
     void signatureValid();
     void oneTimeKeysValid();
     //void removeOneTimeKeys();
+    void deviceKeys();
 };