From f5488102d05a53e1290dc29de2431a8e9e643f67 Mon Sep 17 00:00:00 2001 From: Matteo Piccina Date: Thu, 30 Jul 2020 19:25:42 +0200 Subject: [PATCH] Fix tests --- MTMRTests/ParseConfigTests.swift | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/MTMRTests/ParseConfigTests.swift b/MTMRTests/ParseConfigTests.swift index 22f3ee5..46a0a39 100644 --- a/MTMRTests/ParseConfigTests.swift +++ b/MTMRTests/ParseConfigTests.swift @@ -10,7 +10,7 @@ class ParseConfig: XCTestCase { XCTFail() return } - guard case .none? = result?.first?.action else { + guard result?.first?.actions.count == 0 else { XCTFail() return } @@ -18,14 +18,14 @@ class ParseConfig: XCTestCase { func testButtonKeyCodeAction() { let buttonKeycodeFixture = """ - [ { "type": "staticButton", "title": "Pew", "action": "hidKey", "keycode": 123} ] + [ { "type": "staticButton", "title": "Pew", "actions": [ { "trigger": "singleTap", "action": "hidKey", "keycode": 123 } ] } ] """.data(using: .utf8)! let result = try? JSONDecoder().decode([BarItemDefinition].self, from: buttonKeycodeFixture) guard case .staticButton("Pew")? = result?.first?.type else { XCTFail() return } - guard case .hidKey(keycode: 123)? = result?.first?.action else { + guard case .hidKey(keycode: 123)? = result?.first?.actions.filter({ $0.trigger == .singleTap }).first?.value else { XCTFail() return } @@ -40,8 +40,7 @@ class ParseConfig: XCTestCase { XCTFail() return } - let parameter = result?.first?.additionalParameters[.actions] - guard case .actions(let actions) = parameter, case .keyPress(keycode: 53)? = actions.filter({ $0.trigger == .singleTap }).first?.value else { + guard case .keyPress(keycode: 53)? = result?.first?.actions.filter({ $0.trigger == .singleTap }).first?.value else { XCTFail() return } @@ -56,8 +55,7 @@ class ParseConfig: XCTestCase { XCTFail() return } - let parameter = result?.first?.additionalParameters[.actions] - guard case .actions(let actions) = parameter, case .keyPress(keycode: 53)? = actions.filter({ $0.trigger == .singleTap }).first?.value else { + guard case .keyPress(keycode: 53)? = result?.first?.actions.filter({ $0.trigger == .singleTap }).first?.value else { XCTFail() return }