From b502c26edcfae7a1ed8df928eb450d67223b7b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Sun, 15 Jan 2017 21:22:12 +0100 Subject: Make all the tests use the drumkit_creator functions. --- test/audiocachetest.cc | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'test/audiocachetest.cc') diff --git a/test/audiocachetest.cc b/test/audiocachetest.cc index f67909d..a3d62c9 100644 --- a/test/audiocachetest.cc +++ b/test/audiocachetest.cc @@ -30,6 +30,8 @@ #include #include +#include "drumkit_creator.h" + #define FRAMESIZE 64 class AudioCacheTest @@ -137,41 +139,53 @@ public: void singleChannelNonThreaded() { printf("\nsinglechannel_nonthreaded()\n"); - const char filename[] = "kit/ride-single-channel.wav"; + + auto filename = drumkit_creator::createSingleChannelWav("single_channel.wav"); + + // Conduct test int channel = 0; bool threaded = false; - testHelper(filename, channel, threaded, FRAMESIZE); + testHelper(filename.c_str(), channel, threaded, FRAMESIZE); } void singleChannelThreaded() { printf("\nsinglechannel_threaded()\n"); - const char filename[] = "kit/ride-single-channel.wav"; + + auto filename = drumkit_creator::createSingleChannelWav("single_channel.wav"); + + // Conduct test int channel = 0; bool threaded = true; - testHelper(filename, channel, threaded, FRAMESIZE); + testHelper(filename.c_str(), channel, threaded, FRAMESIZE); } void multiChannelNonThreaded() { printf("\nmultichannel_nonthreaded()\n"); - const char filename[] = "kit/ride-multi-channel.wav"; + + auto filename = drumkit_creator::createMultiChannelWav("multi_channel.wav"); + + // Conduct test int channel = 0; bool threaded = false; - testHelper(filename, channel, threaded, FRAMESIZE); + testHelper(filename.c_str(), channel, threaded, FRAMESIZE); ++channel; - testHelper(filename, channel, threaded, FRAMESIZE); + testHelper(filename.c_str(), channel, threaded, FRAMESIZE); } void multiChannelThreaded() { printf("\nmultichannel_threaded()\n"); - const char filename[] = "kit/ride-multi-channel.wav"; + + auto filename = drumkit_creator::createMultiChannelWav("multi_channel.wav"); + + // Conduct test int channel = 0; bool threaded = true; - testHelper(filename, channel, threaded, FRAMESIZE); + testHelper(filename.c_str(), channel, threaded, FRAMESIZE); ++channel; - testHelper(filename, channel, threaded, FRAMESIZE); + testHelper(filename.c_str(), channel, threaded, FRAMESIZE); } }; -- cgit v1.2.3