Merge pull request #327 from tangem/IOS-4927_fix_tests

IOS-4927 Try to make tests locale independent
tangem · Nov 1, 2023 · 18af3a9 · 18af3a9
2 parents d73f7ae + 1836e08
commit 18af3a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/TangemSdk/TangemSdk/Common/JSON/JSONStringConvertible.swift b/TangemSdk/TangemSdk/Common/JSON/JSONStringConvertible.swift
@@ -20,7 +20,12 @@ public extension JSONStringConvertible {
         let data = (try? JSONEncoder.tangemSdkEncoder.encode(self)) ?? Data()
         return String(data: data, encoding: .utf8)!
     }
-
+
+    var testJson: String {
+        let data = (try? JSONEncoder.tangemSdkTestEncoder.encode(self)) ?? Data()
+        return String(data: data, encoding: .utf8)!
+    }
+
     func eraseToAnyResponse() -> AnyJSONRPCResponse {
         AnyJSONRPCResponse(self)
     }

diff --git a/TangemSdk/TangemSdkTests/JSONRPCTests.swift b/TangemSdk/TangemSdkTests/JSONRPCTests.swift
@@ -92,17 +92,8 @@ class JSONRPCTests: XCTestCase {
     func testJsonResponse() {
         let response = SuccessResponse(cardId: "c000111122223333")
         let result: Result<SuccessResponse, TangemSdkError> = .success(response)
-        let jsonResponse = result.toJsonResponse(id: 1).json
-        let testResponse =
-            """
-            {
-              "jsonrpc" : "2.0",
-              "result" : {
-                "cardId" : "c000111122223333"
-              },
-              "id" : 1
-            }
-            """
+        let jsonResponse = result.toJsonResponse(id: 1).testJson
+        let testResponse = "{\"id\":1,\"jsonrpc\":\"2.0\",\"result\":{\"cardId\":\"c000111122223333\"}}"
         XCTAssertEqual(jsonResponse, testResponse)
     }
 

diff --git a/TangemSdk/TangemSdkTests/TlvTests.swift b/TangemSdk/TangemSdkTests/TlvTests.swift
@@ -177,7 +177,7 @@ class TlvTests: XCTestCase {
 
         //test dateTime
         let date: Date = try! cardDataDecoder.decode(.manufactureDateTime)
-        let dateString =  date.toString(style: .short)
+        let dateString =  date.toString(style: .short, locale: Locale(identifier: "en_US"))
         XCTAssertEqual(dateString, "7/27/18")
 
         let dateWrong: Int? = try? cardDataDecoder.decode(.manufactureDateTime)