From a3414c26732319480c1fbde07c385ac321f3b78e Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Thu, 5 Nov 2020 14:36:34 -0700 Subject: [PATCH 1/2] Update 65816kromTests.swift Only have one runTest method. --- OSBindings/Mac/Clock SignalTests/65816kromTests.swift | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/65816kromTests.swift b/OSBindings/Mac/Clock SignalTests/65816kromTests.swift index 7d96d13fd..86fc20a3d 100644 --- a/OSBindings/Mac/Clock SignalTests/65816kromTests.swift +++ b/OSBindings/Mac/Clock SignalTests/65816kromTests.swift @@ -20,11 +20,7 @@ class Krom65816Tests: XCTestCase { // MARK: - Test Runner - func runTest(_ name: String) { - runTest(name, pcLimit: nil) - } - - func runTest(_ name: String, pcLimit: UInt32?) { + func runTest(_ name: String, pcLimit: UInt32? = nil) { var testData: Data? if let filename = Bundle(for: type(of: self)).path(forResource: name, ofType: "sfc") { testData = try? Data(contentsOf: URL(fileURLWithPath: filename)) From 189a468ad46227818eed80b305db7a427b404c55 Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Thu, 5 Nov 2020 14:42:39 -0700 Subject: [PATCH 2/2] =?UTF-8?q?Use=20url(forResource:...=20instead=20of=20?= =?UTF-8?q?path(forResource:=E2=80=A6=20as=20it=20cuts=20down=20on=20creat?= =?UTF-8?q?ing=20a=20URL=20struct.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OSBindings/Mac/Clock SignalTests/65816kromTests.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/65816kromTests.swift b/OSBindings/Mac/Clock SignalTests/65816kromTests.swift index 7d96d13fd..eba5a00b7 100644 --- a/OSBindings/Mac/Clock SignalTests/65816kromTests.swift +++ b/OSBindings/Mac/Clock SignalTests/65816kromTests.swift @@ -26,13 +26,13 @@ class Krom65816Tests: XCTestCase { func runTest(_ name: String, pcLimit: UInt32?) { var testData: Data? - if let filename = Bundle(for: type(of: self)).path(forResource: name, ofType: "sfc") { - testData = try? Data(contentsOf: URL(fileURLWithPath: filename)) + if let filename = Bundle(for: type(of: self)).url(forResource: name, withExtension: "sfc") { + testData = try? Data(contentsOf: filename) } var testOutput: String? - if let filename = Bundle(for: type(of: self)).path(forResource: name + "-trace_compare", ofType: "log") { - testOutput = try? String(contentsOf: URL(fileURLWithPath: filename)) + if let filename = Bundle(for: type(of: self)).url(forResource: name + "-trace_compare", withExtension: "log") { + testOutput = try? String(contentsOf: filename) } XCTAssertNotNil(testData)