diff --git a/Tests/DunneAudioKitTests/GenericNodeTests.swift b/Tests/DunneAudioKitTests/GenericNodeTests.swift index c846083..94a0d58 100644 --- a/Tests/DunneAudioKitTests/GenericNodeTests.swift +++ b/Tests/DunneAudioKitTests/GenericNodeTests.swift @@ -55,7 +55,8 @@ class GenericNodeTests: XCTestCase { } func testEffects() { - nodeParameterTest(md5: "b09c41cdef96fb4cfe89c34c5262e9d2", factory: { input in Flanger(input) }) - nodeParameterTest(md5: "7006860de2e4a726fd53c7f583f44c75", factory: { input in StereoDelay(input) }) + nodeParameterTest(md5: "2e7735fd2751c87661351b16f0c247d8", factory: { input in Flanger(input) }) + nodeParameterTest(md5: "481005e568c7c0a0763044451f1ba588", factory: { input in StereoDelay(input) }) + nodeParameterTest(md5: "c5729e47c78ce86a7480eaa0ca0b10c0", factory: { input in TransientShaper(input) }) } } diff --git a/Tests/DunneAudioKitTests/SamplerTests.swift b/Tests/DunneAudioKitTests/SamplerTests.swift index 8239c01..58deac3 100644 --- a/Tests/DunneAudioKitTests/SamplerTests.swift +++ b/Tests/DunneAudioKitTests/SamplerTests.swift @@ -13,7 +13,7 @@ class SamplerTests: XCTestCase { let sampleURL = Bundle.module.url(forResource: "TestResources/12345", withExtension: "wav")! let file = try! AVAudioFile(forReading: sampleURL) let sampler = Sampler() - let data = SamplerData(sampleDescriptor: SampleDescriptor(noteNumber: 64, noteFrequency: 440, minimumNoteNumber: 0, maximumNoteNumber: 127, minimumVelocity: 0, maximumVelocity: 127, isLooping: false, loopStartPoint: 0, loopEndPoint: 1000.0, startPoint: 0.0, endPoint: 44100.0 * 5.0), file: file) + let data = SamplerData(sampleDescriptor: SampleDescriptor(noteNumber: 64, noteFrequency: 440, minimumNoteNumber: 0, maximumNoteNumber: 127, minimumVelocity: 0, maximumVelocity: 127, isLooping: false, loopStartPoint: 0, loopEndPoint: 1000.0, startPoint: 0.0, endPoint: Float(Settings.sampleRate * 5.0)), file: file) data.buildKeyMap() sampler.update(data: data) sampler.masterVolume = 0.1 @@ -46,13 +46,13 @@ class SamplerTests: XCTestCase { sampler.load(avAudioFile: file) sampler.masterVolume = 1 engine.output = sampler - let audio = engine.startTest(totalDuration: 8.0) + let audio = engine.startTest(totalDuration: 9.0) audio.append(engine.render(duration: 1.0)) // run test for a second before setting parameters sampler.attackDuration = 1.0 sampler.load(avAudioFile: file) audio.append(engine.render(duration: 1.0)) // run test to give time to load sampler.play(noteNumber: 65, velocity: 127) - audio.append(engine.render(duration: 6.0)) + audio.append(engine.render(duration: 7.0)) sampler.stop(noteNumber: 65) testMD5(audio) } diff --git a/Tests/DunneAudioKitTests/TransientShaperTests.swift b/Tests/DunneAudioKitTests/TransientShaperTests.swift deleted file mode 100644 index 50266fd..0000000 --- a/Tests/DunneAudioKitTests/TransientShaperTests.swift +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright AudioKit. All Rights Reserved. - -import AudioKit -import DunneAudioKit -import XCTest - -class TransientShaperTests: XCTestCase { - - func testDefault() { - let engine = AudioEngine() - let url = Bundle.module.url(forResource: "12345", withExtension: "wav", subdirectory: "TestResources")! - let player = AudioPlayer(url: url)! - engine.output = TransientShaper(player) - let audio = engine.startTest(totalDuration: 1.0) - player.play() - audio.append(engine.render(duration: 1.0)) - testMD5(audio) - } - - func testplayerAmount() { - let engine = AudioEngine() - let url = Bundle.module.url(forResource: "12345", withExtension: "wav", subdirectory: "TestResources")! - let player = AudioPlayer(url: url)! - engine.output = TransientShaper(player, inputAmount: -20.0) - let audio = engine.startTest(totalDuration: 1.0) - player.play() - audio.append(engine.render(duration: 1.0)) - testMD5(audio) - } - - func testOutputAmount() { - let engine = AudioEngine() - let url = Bundle.module.url(forResource: "12345", withExtension: "wav", subdirectory: "TestResources")! - let player = AudioPlayer(url: url)! - engine.output = TransientShaper(player, outputAmount: -20.0) - let audio = engine.startTest(totalDuration: 1.0) - player.play() - audio.append(engine.render(duration: 1.0)) - testMD5(audio) - } - - /* Intermittent Tests - - func testAttackAmount() { - let engine = AudioEngine() - let url = Bundle.module.url(forResource: "12345", withExtension: "wav", subdirectory: "TestResources")! - let player = AudioPlayer(url: url)! - engine.output = TransientShaper(player, attackAmount: 1.0) - let audio = engine.startTest(totalDuration: 1.0) - player.play() - audio.append(engine.render(duration: 1.0)) - testMD5(audio) - } - - func testReleaseAmount() { - let engine = AudioEngine() - let url = Bundle.module.url(forResource: "12345", withExtension: "wav", subdirectory: "TestResources")! - let player = AudioPlayer(url: url)! - engine.output = TransientShaper(player, releaseAmount: 1.0) - let audio = engine.startTest(totalDuration: 1.0) - player.play() - audio.append(engine.render(duration: 1.0)) - testMD5(audio) - } - */ - - /* This produces different MD5s on local machines vs CI - func testParameters() { - let engine = AudioEngine() - let url = Bundle.module.url(forResource: "12345", withExtension: "wav", subdirectory: "TestResources")! - let player = AudioPlayer(url: url)! - engine.output = TransientShaper(player, - playerAmount: -1.0, - attackAmount: -3.0, - releaseAmount: 1.0, - outputAmount: 0.0) - player.play() - let audio = engine.startTest(totalDuration: 1.0) - audio.append(engine.render(duration: 1.0)) - testMD5(audio) - } - */ - -} diff --git a/Tests/DunneAudioKitTests/ValidatedMD5s.swift b/Tests/DunneAudioKitTests/ValidatedMD5s.swift index 0d90015..c7f45eb 100644 --- a/Tests/DunneAudioKitTests/ValidatedMD5s.swift +++ b/Tests/DunneAudioKitTests/ValidatedMD5s.swift @@ -11,14 +11,9 @@ extension XCTestCase { } let validatedMD5s: [String: String] = [ - "-[SamplerTests testSampler]": "8739229f6bc52fa5db3cc2afe85ee580", - "-[SamplerTests testSamplerAttackVolumeEnvelope]": "bf00177ac48148fa4f780e5e364e84e2", - "-[SynthTests testChord]": "670c95beba121ff85150eb12497f3652", - "-[SynthTests testMonophonicPlayback]": "625554cfe7cc840083df9931d47490a6", - "-[SynthTests testParameterInitialization]": "7bd35b742ceff0ba77238d7da2ef046d", - "-[TransientShaperTests testAttackAmount]": "481068b77fc73b349315f2327fb84318", - "-[TransientShaperTests testDefault]": "cea9fc1deb7a77fe47a071d7aaf411d3", - "-[TransientShaperTests testOutputAmount]": "e84963aeedd6268dd648dd6a862fb76a", - "-[TransientShaperTests testplayerAmount]": "f70c4ba579921129c86b9a6abb0cb52e", - "-[TransientShaperTests testReleaseAmount]": "accb7a919f3c63e4dbec41c0e7ef88db", + "-[SamplerTests testSampler]": "764e9a29c81659ea19b942afead19c1e", + "-[SamplerTests testSamplerAttackVolumeEnvelope]": "2b10675e27c588c5fc7aa70ec1b299c5", + "-[SynthTests testChord]": "4f1199e90b38cf7ede595c62600bb307", + "-[SynthTests testMonophonicPlayback]": "2851284c61e62af0ade1e0ac5ee786c9", + "-[SynthTests testParameterInitialization]": "0030b568eff9dcdbd5b532a5de1e32dd" ]