Fix tests which weren't actually testing anything

Author: h4yn0nnym0u5e

test/CMakeLists.txt

@@ -49,18 +49,18 @@ if (DEFINED BUILD_FOR_LINUX)
     add_executable(tests
             audio/output_test.cpp
 
-            audio/array/AudioArrayFixture.h
+            # audio/array/AudioArrayFixture.h
             audio/array/test_array_mono_loop_backward_playback.cpp
             audio/array/test_array_mono_loop_forward_playback.cpp
             audio/array/test_array_stereo_loop_backward_playback.cpp
             audio/array/test_array_stereo_loop_forward_playback.cpp
 
-            audio/wav/AudioWavFixture.h
+            # audio/wav/AudioWavFixture.h
             audio/wav/test_wav_mono_loop_forward_playback.cpp
             audio/wav/test_wav_stereo_loop_forward_playback.cpp
             audio/wav/test_wav_tags.cpp
 
-            low_level/sd/ResamplingReaderFixture.h
+            # low_level/sd/ResamplingReaderFixture.h
             low_level/sd/test_raw_mono_noloop_forward_playback.cpp
             low_level/sd/test_raw_mono_noloop_forward_double_rate_playback.cpp
             low_level/sd/test_raw_mono_loop_forward_playback.cpp

test/low_level/array/test_array_mono_loop_forward_playback.cpp

@@ -16,7 +16,7 @@ BOOST_AUTO_TEST_SUITE(test_array_mono_loop_forward_playback)
 
     BOOST_FIXTURE_TEST_CASE(ReadForwardLoopAtRegularPlaybackRate, ResamplingArrayFixture) {
 
-        const uint32_t expectedDataSize = kick_raw_len; // 32 16bit samples = 64 bytes of space
+        const uint32_t expectedDataSize = kick_raw_len/2; // 32 16bit samples = 64 bytes of space
         printTest(expectedDataSize);
         //printf("ReadForwardAtRegularPlaybackRate(%d)\n", expectedDataSize);
 
@@ -36,10 +36,10 @@ BOOST_AUTO_TEST_SUITE(test_array_mono_loop_forward_playback)
             //printf("j:%d bytesRead: %d \n", j, bytesRead);           
             //printf("\n");
             j++;
-        } while (j < 3);
+        } while (bytesRead > 0);
         printf("total_bytes_read: %d \n", total_bytes_read);
         resamplingArrayReader->close();
-        BOOST_CHECK_EQUAL(true, true);
+        BOOST_CHECK_EQUAL(expectedDataSize, total_bytes_read);
     }
 
 BOOST_AUTO_TEST_SUITE_END()

test/low_level/array/test_array_stereo_loop_forward_playback.cpp

@@ -13,7 +13,7 @@
 extern unsigned char stereo_souljah_raw[];
 extern unsigned int stereo_souljah_raw_len;
 BOOST_AUTO_TEST_SUITE(test_array_stereo_loop_forward_playback)
-
+/*
     unsigned char stereo_raw[] = {
     0x00, 0x00, 0x10, 0x00, 
     0x01, 0x00, 0x11, 0x00, 
@@ -23,16 +23,16 @@ BOOST_AUTO_TEST_SUITE(test_array_stereo_loop_forward_playback)
     0x05, 0x00, 0x15, 0x00 };
     
     unsigned int stereo_raw_length = 24;
-
+*/
     BOOST_FIXTURE_TEST_CASE(ReadForwardLoopAtRegularPlaybackRate, ResamplingArrayFixture) {
 
-        const uint32_t expectedDataSize = stereo_souljah_raw_len; // 32 16bit samples = 64 bytes of space
+        const uint32_t expectedDataSize = stereo_souljah_raw_len/2; // stereo
         printTest(expectedDataSize);
         //printf("ReadForwardAtRegularPlaybackRate(%d)\n", expectedDataSize);
 
         resamplingArrayReader->begin();
         resamplingArrayReader->setPlaybackRate(0.5f);
-        resamplingArrayReader->playRaw((int16_t*)stereo_raw, stereo_raw_length/4, 1);
+        resamplingArrayReader->playRaw((int16_t*)stereo_souljah_raw, stereo_souljah_raw_len/4, 2);
         BOOST_CHECK_EQUAL(resamplingArrayReader->isPlaying(), true);
         resamplingArrayReader->setInterpolationType(ResampleInterpolationType::resampleinterpolation_none);
         int16_t actual_left[256];
@@ -46,10 +46,10 @@ BOOST_AUTO_TEST_SUITE(test_array_stereo_loop_forward_playback)
             total_bytes_read += bytesRead;
             //printf("j:%d bytesRead: %d \n", j, bytesRead);           
             j++;
-        } while (j < 3);
+        } while (bytesRead > 0);
         printf("total_bytes_read: %d \n", total_bytes_read);
         resamplingArrayReader->close();
-        BOOST_CHECK_EQUAL(true, true);
+        BOOST_CHECK_EQUAL(expectedDataSize, total_bytes_read);
     }
 
 BOOST_AUTO_TEST_SUITE_END()

test/low_level/arraywav/test_array_mono_loop_forward_playback.cpp

@@ -16,13 +16,13 @@ BOOST_AUTO_TEST_SUITE(test_array_mono)
 
     BOOST_FIXTURE_TEST_CASE(ReadForwardLoopAtRegularPlaybackRate, ResamplingArrayWavFixture) {
 
-        const uint32_t expectedDataSize = mono_souljah_wav_len; // 32 16bit samples = 64 bytes of space
+        const uint32_t expectedDataSize = mono_souljah_wav_len - WAV_HEADER_SIZE; // 32 16bit samples = 64 bytes of space
         printTest(expectedDataSize);
         //printf("ReadForwardAtRegularPlaybackRate(%d)\n", expectedDataSize);
 
         resamplingArrayReader->begin();
         resamplingArrayReader->setPlaybackRate(0.5f);
-        resamplingArrayReader->playWav((int16_t*)mono_souljah_wav, mono_souljah_wav_len/2);
+        resamplingArrayReader->playWav((int16_t*)mono_souljah_wav /*, mono_souljah_wav_len/2 */);
         BOOST_CHECK_EQUAL(resamplingArrayReader->isPlaying(), true);
         resamplingArrayReader->setInterpolationType(ResampleInterpolationType::resampleinterpolation_linear);
         int16_t actual[256];
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_SUITE(test_array_mono)
         } while (bytesRead > 0);
         printf("total_bytes_read: %d \n", total_bytes_read);
         resamplingArrayReader->close();
-        BOOST_CHECK_EQUAL(true, true);
+        BOOST_CHECK_EQUAL(expectedDataSize, total_bytes_read);
     }
 
 BOOST_AUTO_TEST_SUITE_END()

test/low_level/arraywav/test_array_stereo_loop_forward_playback.cpp

@@ -16,13 +16,13 @@ BOOST_AUTO_TEST_SUITE(test_array_stereo)
 
     BOOST_FIXTURE_TEST_CASE(ReadForwardLoopAtRegularPlaybackRate, ResamplingArrayWavFixture) {
 
-        const uint32_t expectedDataSize = stereo_souljah_wav_len; // 32 16bit samples = 64 bytes of space
+        const uint32_t expectedDataSize = (stereo_souljah_wav_len - WAV_HEADER_SIZE)/4; 
         printTest(expectedDataSize);
         //printf("ReadForwardAtRegularPlaybackRate(%d)\n", expectedDataSize);
 
         resamplingArrayReader->begin();
         resamplingArrayReader->setPlaybackRate(1.0f);
-        resamplingArrayReader->playWav((int16_t*)stereo_souljah_wav, stereo_souljah_wav_len/2);
+        resamplingArrayReader->playWav((int16_t*)stereo_souljah_wav/*, stereo_souljah_wav_len/2 */);
         BOOST_CHECK_EQUAL(resamplingArrayReader->isPlaying(), true);
         resamplingArrayReader->setInterpolationType(ResampleInterpolationType::resampleinterpolation_linear);
         int16_t actualLeft[256], actualRight[256];
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_SUITE(test_array_stereo)
         } while (bytesRead > 0);
         printf("total_bytes_read: %d \n", total_bytes_read);
         resamplingArrayReader->close();
-        BOOST_CHECK_EQUAL(true, true);
+        BOOST_CHECK_EQUAL(expectedDataSize, total_bytes_read);
     }
 
 BOOST_AUTO_TEST_SUITE_END()

test/utils.h

@@ -1,6 +1,7 @@
 #define PRINT_ALL_SAMPLES false
 #define NO_RATE -1.0
 #define LOOP_BLOCKS 42 // number of blocks to generate when looping
+#define WAV_HEADER_SIZE 44 // sleazy hack...
 
 #define REFERENCE_PATH "../../test/resources/reference/"
 #define INPUT_PATH "../../test/resources/input"