From 05774ba36f7f7a8f85389f9222f95f9e4f7b02e9 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Mon, 17 Dec 2018 15:14:39 +0100 Subject: [PATCH] [tests] improve test-sink --- tests/src/io/base-sink_custom.h | 5 +++++ tests/src/io/test-sink.c | 5 +++++ tests/src/io/test-sink_apple_audio.c | 2 ++ tests/src/io/test-sink_sndfile.c | 2 ++ tests/src/io/test-sink_wavwrite.c | 2 ++ 5 files changed, 16 insertions(+) diff --git a/tests/src/io/base-sink_custom.h b/tests/src/io/base-sink_custom.h index fe55b742..0c5219d1 100644 --- a/tests/src/io/base-sink_custom.h +++ b/tests/src/io/base-sink_custom.h @@ -116,9 +116,14 @@ int test_wrong_params(void) if (aubio_sink_custom_preset_channels(s, channels)) return 1; if (aubio_sink_custom_preset_samplerate(s, samplerate)) return 1; + if (aubio_sink_custom_get_samplerate(s) != samplerate) return 1; + if (aubio_sink_custom_get_channels(s) != channels) return 1; + mat = new_fmat(channels, hop_size); // check writing a vector with valid length aubio_sink_custom_do_multi(s, mat, hop_size); + // check writing 0 frames + aubio_sink_custom_do_multi(s, mat, 0); // check writing more than in the input aubio_sink_custom_do_multi(s, mat, hop_size+1); del_fmat(mat); diff --git a/tests/src/io/test-sink.c b/tests/src/io/test-sink.c index aa86050f..79a9602c 100644 --- a/tests/src/io/test-sink.c +++ b/tests/src/io/test-sink.c @@ -112,9 +112,14 @@ int test_wrong_params(void) if (aubio_sink_preset_channels(s, channels)) return 1; if (aubio_sink_preset_samplerate(s, samplerate)) return 1; + if (aubio_sink_get_samplerate(s) != samplerate) return 1; + if (aubio_sink_get_channels(s) != channels) return 1; + mat = new_fmat(channels, hop_size); // check writing a vector with valid length aubio_sink_do_multi(s, mat, hop_size); + // check writing 0 frames + aubio_sink_do_multi(s, mat, 0); // check writing more than in the input aubio_sink_do_multi(s, mat, hop_size+1); del_fmat(mat); diff --git a/tests/src/io/test-sink_apple_audio.c b/tests/src/io/test-sink_apple_audio.c index bcffb10a..8349cc8a 100644 --- a/tests/src/io/test-sink_apple_audio.c +++ b/tests/src/io/test-sink_apple_audio.c @@ -14,6 +14,8 @@ #define aubio_sink_custom_close aubio_sink_apple_audio_close #define aubio_sink_custom_preset_samplerate aubio_sink_apple_audio_preset_samplerate #define aubio_sink_custom_preset_channels aubio_sink_apple_audio_preset_channels +#define aubio_sink_custom_get_samplerate aubio_sink_apple_audio_get_samplerate +#define aubio_sink_custom_get_channels aubio_sink_apple_audio_get_channels #endif /* HAVE_SINK_APPLE_AUDIO */ #include "base-sink_custom.h" diff --git a/tests/src/io/test-sink_sndfile.c b/tests/src/io/test-sink_sndfile.c index 0cd02088..51950862 100644 --- a/tests/src/io/test-sink_sndfile.c +++ b/tests/src/io/test-sink_sndfile.c @@ -14,6 +14,8 @@ #define aubio_sink_custom_close aubio_sink_sndfile_close #define aubio_sink_custom_preset_samplerate aubio_sink_sndfile_preset_samplerate #define aubio_sink_custom_preset_channels aubio_sink_sndfile_preset_channels +#define aubio_sink_custom_get_samplerate aubio_sink_sndfile_get_samplerate +#define aubio_sink_custom_get_channels aubio_sink_sndfile_get_channels #endif /* HAVE_SNDFILE */ #include "base-sink_custom.h" diff --git a/tests/src/io/test-sink_wavwrite.c b/tests/src/io/test-sink_wavwrite.c index 6385be7c..e219fe65 100644 --- a/tests/src/io/test-sink_wavwrite.c +++ b/tests/src/io/test-sink_wavwrite.c @@ -14,6 +14,8 @@ #define aubio_sink_custom_close aubio_sink_wavwrite_close #define aubio_sink_custom_preset_samplerate aubio_sink_wavwrite_preset_samplerate #define aubio_sink_custom_preset_channels aubio_sink_wavwrite_preset_channels +#define aubio_sink_custom_get_samplerate aubio_sink_wavwrite_get_samplerate +#define aubio_sink_custom_get_channels aubio_sink_wavwrite_get_channels #endif /* HAVE_WAVWRITE */ #include "base-sink_custom.h" -- 2.11.0