commit 81c3e9f786f035e53b63bc10600916f6cd99ec50
parent 7cd3bfdc0895709f1ca770aeb419f2bab5c55bba
Author: fundamental <[email protected]>
Date: Fri, 26 Jun 2009 17:30:39 -0400
Added tests to portamento and updated existing test
Diffstat:
3 files changed, 81 insertions(+), 11 deletions(-)
diff --git a/src/Tests/ControllerTest.h b/src/Tests/ControllerTest.h
@@ -0,0 +1,73 @@
+/*
+ ZynAddSubFX - a software synthesizer
+
+ ControllerTest.h - CxxTest for Params/Controller
+ Copyright (C) 2009-2009 Mark McCurry
+ Author: Mark McCurry
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of version 2 of the GNU General Public License
+ as published by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License (version 2 or later) for more details.
+
+ You should have received a copy of the GNU General Public License (version 2)
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+*/
+#include <cxxtest/TestSuite.h>
+#include <iostream>
+#include "../Params/Controller.h"
+
+class ControllerTest : public CxxTest::TestSuite
+{
+public:
+ void setUp() {
+ testCtl=new Controller();
+ }
+
+ void tearDown() {
+ delete testCtl;
+ }
+
+
+ void testPortamentoRange() {
+ //Initialize portamento
+ testCtl->setportamento(127);
+ testCtl->portamento.time=127;
+ testCtl->initportamento(40.0,400.0,false);
+ //Bounds Check
+ while(testCtl->portamento.used){
+ TS_ASSERT((0.0<=testCtl->portamento.x)&&
+ (testCtl->portamento.x<=1.0));
+ TS_ASSERT((0.1<=testCtl->portamento.freqrap)&&
+ (testCtl->portamento.freqrap<=1.0));
+ testCtl->updateportamento();
+ }
+ TS_ASSERT((0.0<=testCtl->portamento.x)&&
+ (testCtl->portamento.x<=1.0));
+ TS_ASSERT((0.1<=testCtl->portamento.freqrap)&&
+ (testCtl->portamento.freqrap<=1.0));
+ }
+
+ void testPortamentoValue() {
+ testCtl->setportamento(127);
+ testCtl->portamento.time=127;
+ testCtl->initportamento(40.0,400.0,false);
+ int i;
+ for(i=0;i<10;++i){
+ testCtl->updateportamento();
+ }
+ //Assert that the numbers are the same as they were at release
+ TS_ASSERT_DELTA(testCtl->portamento.x,0.0290249,0.000001)
+ TS_ASSERT_DELTA(testCtl->portamento.freqrap,0.126122,0.000001)
+ }
+
+private:
+ Controller *testCtl;
+
+};
diff --git a/src/Tests/EchoTest.h b/src/Tests/EchoTest.h
@@ -24,9 +24,6 @@
#include "../Effects/Echo.h"
#include "../globals.h"
-int SOUND_BUFFER_SIZE=256;
-int SAMPLE_RATE=1024;
-
class EchoTest : public CxxTest::TestSuite
{
public:
@@ -59,10 +56,10 @@ public:
//Make sure that the output will be zero at start
//(given a zero input)
testFX->out(inL,inR);
- for (int i=0;i<SOUND_BUFFER_SIZE;++i)
- TS_ASSERT_EQUALS(outL[i],0.0);
- for (int i=0;i<SOUND_BUFFER_SIZE;++i)
- TS_ASSERT_EQUALS(outR[i],0.0);
+ for (int i=0;i<SOUND_BUFFER_SIZE;++i){
+ TS_ASSERT_DELTA(outL[i],0.0,0.0001);
+ TS_ASSERT_DELTA(outR[i],0.0,0.0001);
+ }
}
void testClear() {
@@ -72,7 +69,7 @@ public:
*(inL+i)=1.0;
for (int i=0;i<SOUND_BUFFER_SIZE;++i)
*(inR+i)=1.0;
- for (int i=0;i<50;++i)
+ for (int i=0;i<500;++i)
testFX->out(inL,inR);
for (int i=0;i<SOUND_BUFFER_SIZE;++i) {
TS_ASSERT_DIFFERS(outL[i],0.0);
@@ -97,7 +94,7 @@ public:
*(inR+i)=1.0;
char FEEDBACK=5;
testFX->changepar(FEEDBACK,127);
- for (int i=0;i<4;++i)
+ for (int i=0;i<100;++i)
testFX->out(inL,inR);
for (int i=0;i<SOUND_BUFFER_SIZE;++i) {
TS_ASSERT_DIFFERS(outL[i],0.0);
diff --git a/src/Tests/make.sh b/src/Tests/make.sh
@@ -1,2 +1,2 @@
-cxxtestgen.py --error-printer -o runner.cpp SampleTest.h EchoTest.h
-g++ -g -o runner runner.cpp ../Samples/AuSample.o ../Samples/Sample.o ../Effects/Echo.o ../Effects/Effect.o ../Controls/Control.o ../Controls/DelayCtl.o
+cxxtestgen.py --error-printer -o runner.cpp SampleTest.h EchoTest.h ControllerTest.h
+g++ -g -o runner runner.cpp ../Samples/AuSample.o ../Samples/Sample.o ../Effects/Echo.o ../Effects/Effect.o ../Controls/Control.o ../Controls/DelayCtl.o ../Params/Controller.o ../Misc/XMLwrapper.o ../Misc/Config.o ../Misc/Util.o -lmxml -lm -lz -lpthread
