From ac1bc588dd9883291d8af8666116a9f872eed4dc Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 14 Jul 2016 07:12:02 -0400 Subject: [PATCH] Improved factoring and increased window of testing, causing both the fast and slow tests to show framing errors. --- .../Mac/Clock SignalTests/DPLLTests.swift | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/OSBindings/Mac/Clock SignalTests/DPLLTests.swift b/OSBindings/Mac/Clock SignalTests/DPLLTests.swift index 696d6706d..042f22940 100644 --- a/OSBindings/Mac/Clock SignalTests/DPLLTests.swift +++ b/OSBindings/Mac/Clock SignalTests/DPLLTests.swift @@ -10,19 +10,33 @@ import XCTest class DPLLTests: XCTestCase { - func testPerfectInput() { - let pll = DigitalPhaseLockedLoopBridge(clocksPerBit: 100, tolerance: 20, historyLength: 5) + func testRegularNibblesOnPLL(pll: DigitalPhaseLockedLoopBridge, bitLength: UInt) { + // clock in two 1s, a 0, and a 1, 200 times over + for _ in 0 ..< 200 { + pll.runForCycles(bitLength/2) + pll.addPulse() + pll.runForCycles(bitLength) + pll.addPulse() + pll.runForCycles(bitLength*2) + pll.addPulse() + pll.runForCycles(bitLength/2) + } - // clock in two 1s, a 0, and a 1 - pll.runForCycles(50) - pll.addPulse() - pll.runForCycles(100) - pll.addPulse() - pll.runForCycles(200) - pll.addPulse() - pll.runForCycles(50) - - XCTAssert(pll.stream == 0xd, "PLL should have clocked four bits") + XCTAssert((pll.stream&0xffffff) == 0xdddddd, "PLL should have synchronised and clocked repeating 0xd nibbles; got \(String(pll.stream, radix: 16, uppercase: false))") } + func testPerfectInput() { + let pll = DigitalPhaseLockedLoopBridge(clocksPerBit: 100, tolerance: 20, historyLength: 5) + testRegularNibblesOnPLL(pll, bitLength: 100) + } + + func testFastButRegular() { + let pll = DigitalPhaseLockedLoopBridge(clocksPerBit: 100, tolerance: 20, historyLength: 5) + testRegularNibblesOnPLL(pll, bitLength: 90) + } + + func testSlowButRegular() { + let pll = DigitalPhaseLockedLoopBridge(clocksPerBit: 100, tolerance: 20, historyLength: 5) + testRegularNibblesOnPLL(pll, bitLength: 110) + } }