[tests] Add synthesis test for changing frame sizes.

Refactor synthesis tests so code for generic test
cases isn't duplicated.

2 files changed, 96 insertions, 41 deletions

diff --git a/tests/test_synthesis.cpp b/tests/test_synthesis.cpp
index e0d5142..d1a8658 100644
--- a/tests/test_synthesis.cpp
+++ b/tests/test_synthesis.cpp
@@ -3,80 +3,133 @@
 using namespace simpl;
 
 // ---------------------------------------------------------------------------
-//	TestMQSynthesis
+//	test_basic
 // ---------------------------------------------------------------------------
-void TestMQSynthesis::setUp() {
-    _sf = SndfileHandle(TEST_AUDIO_FILE);
-
-    if(_sf.error() > 0) {
-        throw Exception(std::string("Could not open audio file: ") +
-                        std::string(TEST_AUDIO_FILE));
-    }
-}
-
-void TestMQSynthesis::test_basic() {
+static void test_basic(PeakDetection *pd, PartialTracking* pt,
+                       Synthesis* synth, SndfileHandle *sf) {
     int num_samples = 4096;
 
-    std::vector<sample> audio(_sf.frames(), 0.0);
-    _sf.read(&audio[0], (int)_sf.frames());
+    std::vector<sample> audio(sf->frames(), 0.0);
+    sf->read(&audio[0], (int)sf->frames());
 
-    _pd.clear();
-    _pt.reset();
-    _synth.reset();
+    pd->clear();
+    pt->reset();
+    synth->reset();
 
-    Frames frames = _pd.find_peaks(num_samples,
-                                   &(audio[(int)_sf.frames() / 2]));
-    frames = _pt.find_partials(frames);
-    frames = _synth.synth(frames);
+    Frames frames = pd->find_peaks(num_samples,
+                                   &(audio[(int)sf->frames() / 2]));
+    frames = pt->find_partials(frames);
+    frames = synth->synth(frames);
 
     for(int i = 0; i < frames.size(); i++) {
         CPPUNIT_ASSERT(frames[i]->num_peaks() > 0);
         CPPUNIT_ASSERT(frames[i]->num_partials() > 0);
 
         double energy = 0.f;
-        for(int j = 0; j < _synth.hop_size(); j++) {
+        for(int j = 0; j < synth->hop_size(); j++) {
             energy += frames[i]->synth()[j] * frames[i]->synth()[j];
         }
         CPPUNIT_ASSERT(energy > 0.f);
     }
 }
 
-
 // ---------------------------------------------------------------------------
-//	TestLorisSynthesis
+//	test_changing_frame_size
 // ---------------------------------------------------------------------------
-void TestLorisSynthesis::setUp() {
-    _sf = SndfileHandle(TEST_AUDIO_FILE);
+static void test_changing_frame_size(PeakDetection *pd, PartialTracking* pt,
+                                     Synthesis* synth, SndfileHandle *sf) {
+    int num_samples = 4096;
+    int frame_size = 256;
+    int hop_size = 128;
 
-    if(_sf.error() > 0) {
-        throw Exception(std::string("Could not open audio file: ") +
-                        std::string(TEST_AUDIO_FILE));
+    std::vector<sample> audio(sf->frames(), 0.0);
+    sf->read(&audio[0], (int)sf->frames());
+
+    pd->clear();
+    pt->reset();
+    synth->reset();
+
+    pd->frame_size(frame_size);
+    pd->hop_size(hop_size);
+    synth->frame_size(frame_size);
+    synth->hop_size(hop_size);
+
+    Frames frames = pd->find_peaks(num_samples,
+                                   &(audio[(int)sf->frames() / 2]));
+    frames = pt->find_partials(frames);
+    frames = synth->synth(frames);
+
+    for(int i = 0; i < frames.size(); i++) {
+        CPPUNIT_ASSERT(frames[i]->num_peaks() > 0);
+        CPPUNIT_ASSERT(frames[i]->num_partials() > 0);
+
+        double energy = 0.f;
+        for(int j = 0; j < synth->hop_size(); j++) {
+            energy += frames[i]->synth()[j] * frames[i]->synth()[j];
+        }
+        CPPUNIT_ASSERT(energy > 0.f);
     }
-}
 
-void TestLorisSynthesis::test_basic() {
-    int num_samples = 4096;
+    frame_size = 128;
+    hop_size = 64;
 
-    std::vector<sample> audio(_sf.frames(), 0.0);
-    _sf.read(&audio[0], (int)_sf.frames());
+    pd->clear();
+    pt->reset();
+    synth->reset();
 
-    _pd.clear();
-    _pt.reset();
-    _synth.reset();
+    pd->frame_size(frame_size);
+    pd->hop_size(hop_size);
+    synth->frame_size(frame_size);
+    synth->hop_size(hop_size);
 
-    Frames frames = _pd.find_peaks(num_samples,
-                                   &(audio[(int)_sf.frames() / 2]));
-    frames = _pt.find_partials(frames);
-    frames = _synth.synth(frames);
+    frames = pd->find_peaks(num_samples, &(audio[(int)sf->frames() / 2]));
+    frames = pt->find_partials(frames);
+    frames = synth->synth(frames);
 
     for(int i = 0; i < frames.size(); i++) {
         CPPUNIT_ASSERT(frames[i]->num_peaks() > 0);
         CPPUNIT_ASSERT(frames[i]->num_partials() > 0);
 
         double energy = 0.f;
-        for(int j = 0; j < _synth.hop_size(); j++) {
+        for(int j = 0; j < synth->hop_size(); j++) {
             energy += frames[i]->synth()[j] * frames[i]->synth()[j];
         }
         CPPUNIT_ASSERT(energy > 0.f);
     }
 }
+
+// ---------------------------------------------------------------------------
+//	TestMQSynthesis
+// ---------------------------------------------------------------------------
+void TestMQSynthesis::setUp() {
+    _sf = SndfileHandle(TEST_AUDIO_FILE);
+
+    if(_sf.error() > 0) {
+        throw Exception(std::string("Could not open audio file: ") +
+                        std::string(TEST_AUDIO_FILE));
+    }
+}
+
+void TestMQSynthesis::test_basic() {
+    ::test_basic(&_pd, &_pt, &_synth, &_sf);
+}
+
+void TestMQSynthesis::test_changing_frame_size() {
+    ::test_changing_frame_size(&_pd, &_pt, &_synth, &_sf);
+}
+
+// ---------------------------------------------------------------------------
+//	TestLorisSynthesis
+// ---------------------------------------------------------------------------
+void TestLorisSynthesis::setUp() {
+    _sf = SndfileHandle(TEST_AUDIO_FILE);
+
+    if(_sf.error() > 0) {
+        throw Exception(std::string("Could not open audio file: ") +
+                        std::string(TEST_AUDIO_FILE));
+    }
+}
+
+void TestLorisSynthesis::test_basic() {
+    ::test_basic(&_pd, &_pt, &_synth, &_sf);
+}
diff --git a/tests/test_synthesis.h b/tests/test_synthesis.h
index 64ee65c..251fa93 100644
--- a/tests/test_synthesis.h
+++ b/tests/test_synthesis.h
@@ -18,6 +18,7 @@ namespace simpl
 class TestMQSynthesis : public CPPUNIT_NS::TestCase {
     CPPUNIT_TEST_SUITE(TestMQSynthesis);
     CPPUNIT_TEST(test_basic);
+    CPPUNIT_TEST(test_changing_frame_size);
     CPPUNIT_TEST_SUITE_END();
 
 public:
@@ -30,6 +31,7 @@ protected:
     SndfileHandle _sf;
 
     void test_basic();
+    void test_changing_frame_size();
 };
 
 // ---------------------------------------------------------------------------