Dariusz Rybicki
--- a/Tests/ElixxirDAppsSDKTests/MessageTests.swift

+ 30

− 24
+++ b/Tests/ElixxirDAppsSDKTests/MessageTests.swift

+ 30

− 24
 @@ -4,40 +4,46 @@ import XCTest
 @@ -4,40 +4,46 @@ import XCTest
 final class MessageTests: XCTestCase {
  func testCoding() throws {
+    let type: Int = 1
+    let idString = "EB/70R5HYEw5htZ4Hg9ondrn3+cAc/lH2G0mjQMja3w="
+    let payloadString = "7TzZKgNphT5UooNM7mDSwtVcIs8AIu4vMKm4ld6GSR8YX5GrHirixUBAejmsgdroRJyo06TkIVef7UM9FN8YfQ=="
+    let senderString = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
+    let recipientIdString = "amFrZXh4MzYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
+    let ephemeralId: Int = 17
+    let timestamp: Int = 1_653_580_439_357_351_000
+    let encrypted = false
+    let roundId: Int = 19
    let jsonString = """
    {
-      "MessageType": 1,
+      "MessageType": \(type),
-      "ID": "EB/70R5HYEw5htZ4Hg9ondrn3+cAc/lH2G0mjQMja3w=",
+      "ID": "\(idString)",
-      "Payload": "7TzZKgNphT5UooNM7mDSwtVcIs8AIu4vMKm4ld6GSR8YX5GrHirixUBAejmsgdroRJyo06TkIVef7UM9FN8YfQ==",
+      "Payload": "\(payloadString)",
-      "Sender": "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD",
+      "Sender": "\(senderString)",
-      "RecipientID": "amFrZXh4MzYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD",
+      "RecipientID": "\(recipientIdString)",
-      "EphemeralID": 17,
+      "EphemeralID": \(ephemeralId),
-      "Timestamp": 1653580439357351000,
+      "Timestamp": \(timestamp),
-      "Encrypted": false,
+      "Encrypted": \(encrypted),
-      "RoundId": 19
+      "RoundId": \(roundId)
    }
    """
    let jsonData = jsonString.data(using: .utf8)!
-    let decoder = JSONDecoder()
-    decoder.dataDecodingStrategy = .base64
+    let message = try Message.decode(jsonData)
-    let message = try decoder.decode(Message.self, from: jsonData)
    XCTAssertNoDifference(message, Message(
      messageType: 1,
-      id: Data(base64Encoded: "EB/70R5HYEw5htZ4Hg9ondrn3+cAc/lH2G0mjQMja3w=")!,
+      id: Data(base64Encoded: idString)!,
-      payload: Data(base64Encoded: "7TzZKgNphT5UooNM7mDSwtVcIs8AIu4vMKm4ld6GSR8YX5GrHirixUBAejmsgdroRJyo06TkIVef7UM9FN8YfQ==")!,
+      payload: Data(base64Encoded: payloadString)!,
-      sender: Data(base64Encoded: "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD")!,
+      sender: Data(base64Encoded: senderString)!,
-      recipientId: Data(base64Encoded: "amFrZXh4MzYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD")!,
+      recipientId: Data(base64Encoded: recipientIdString)!,
-      ephemeralId: 17,
+      ephemeralId: ephemeralId,
-      timestamp: 1_653_580_439_357_351_000,
+      timestamp: timestamp,
-      encrypted: false,
+      encrypted: encrypted,
-      roundId: 19
+      roundId: roundId
    ))
-    let encoder = JSONEncoder()
+    let encodedMessage = try message.encode()
-    encoder.dataEncodingStrategy = .base64
+    let decodedMessage = try Message.decode(encodedMessage)
-    let encodedMessage = try encoder.encode(message)
-    let decodedMessage = try decoder.decode(Message.self, from: encodedMessage)
    XCTAssertNoDifference(decodedMessage, message)
  }