From 64d6ee1be53fbf67ebfb9b041a4849aaa9fb2a7f Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 17 May 2017 07:49:48 -0400 Subject: [PATCH] Adjusted slightly to adapt to latest Swift warnings. --- OSBindings/Mac/Clock SignalTests/AllSuiteATests.swift | 1 - .../Bridges/Clock SignalTests-Bridging-Header.h | 2 ++ OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/AllSuiteATests.swift b/OSBindings/Mac/Clock SignalTests/AllSuiteATests.swift index 259b4198a..ca6034d1e 100644 --- a/OSBindings/Mac/Clock SignalTests/AllSuiteATests.swift +++ b/OSBindings/Mac/Clock SignalTests/AllSuiteATests.swift @@ -7,7 +7,6 @@ // import XCTest -@testable import Clock_Signal class AllSuiteATests: XCTestCase { diff --git a/OSBindings/Mac/Clock SignalTests/Bridges/Clock SignalTests-Bridging-Header.h b/OSBindings/Mac/Clock SignalTests/Bridges/Clock SignalTests-Bridging-Header.h index ae515ce6a..dfa64818c 100644 --- a/OSBindings/Mac/Clock SignalTests/Bridges/Clock SignalTests-Bridging-Header.h +++ b/OSBindings/Mac/Clock SignalTests/Bridges/Clock SignalTests-Bridging-Header.h @@ -2,6 +2,8 @@ // Use this file to import your target's public headers that you would like to expose to Swift. // +#import "ClockSignal-Bridging-Header.h" + #import "TestMachine6502.h" #import "TestMachineZ80.h" #import "MOS6522Bridge.h" diff --git a/OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift b/OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift index 9236fab10..ad649e01b 100644 --- a/OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift +++ b/OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift @@ -37,16 +37,16 @@ class KlausDormannTests: XCTestCase { let machine = CSTestMachine6502() machine.setData(functionalTest, atAddress: 0) - machine.setValue(0x400, for: CSTestMachine6502Register.programCounter) + machine.setValue(0x400, for: .programCounter) while true { - let oldPC = machine.value(for: CSTestMachine6502Register.lastOperationAddress) + let oldPC = machine.value(for: .lastOperationAddress) machine.runForNumber(ofCycles: 1000) - let newPC = machine.value(for: CSTestMachine6502Register.lastOperationAddress) + let newPC = machine.value(for: .lastOperationAddress) if newPC == oldPC { let error = errorForTrapAddress(oldPC) - XCTAssert(error == nil, "Failed with error \(error)") + XCTAssert(error == nil, "Failed with error \(error!)") return } }