From 713a4b680de2193befb1b474fc33893571decc83 Mon Sep 17 00:00:00 2001 From: derselbst Date: Wed, 11 Apr 2018 10:23:17 +0200 Subject: [PATCH] remove redundant TEST_ASSERT_[N]EQ macros --- test/test.h | 5 ++--- test/test_sample_cache.c | 10 +++++----- test/test_sfont_loading.c | 32 ++++++++++++++++---------------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/test/test.h b/test/test.h index 4291882d..2c720a63 100644 --- a/test/test.h +++ b/test/test.h @@ -6,6 +6,5 @@ #define TEST_ASSERT(COND) if (!(COND)) { fprintf(stderr, __FILE__ ":%d assertion ("#COND") failed\n", __LINE__); exit(-1); } -#define TEST_ASSERT_EQ(LHS, RHS) TEST_ASSERT((LHS) == (RHS)) -#define TEST_ASSERT_NEQ(LHS, RHS) TEST_ASSERT((LHS) != (RHS)) -#define TEST_SUCCESS(FLUID_FUNCT) TEST_ASSERT_NEQ((FLUID_FUNCT), FLUID_FAILED) +/* macro to test whether a fluidsynth function succeeded or not */ +#define TEST_SUCCESS(FLUID_FUNCT) TEST_ASSERT((FLUID_FUNCT) != FLUID_FAILED) diff --git a/test/test_sample_cache.c b/test/test_sample_cache.c index c84076f9..aaadd60c 100644 --- a/test/test_sample_cache.c +++ b/test/test_sample_cache.c @@ -15,13 +15,13 @@ int main(void) fluid_synth_t *synth1 = new_fluid_synth(settings), *synth2 = new_fluid_synth(settings); - TEST_ASSERT_NEQ(settings, NULL); - TEST_ASSERT_NEQ(synth1, NULL); - TEST_ASSERT_NEQ(synth2, NULL); + TEST_ASSERT(settings != NULL); + TEST_ASSERT(synth1 != NULL); + TEST_ASSERT(synth2 != NULL); TEST_SUCCESS(fluid_settings_dupstr(settings, "synth.default-soundfont", &s)) - - TEST_ASSERT_NEQ(s[0], '\0'); + + TEST_ASSERT(s[0] != '\0'); printf("Attempt to open %s\n", s); diff --git a/test/test_sfont_loading.c b/test/test_sfont_loading.c index 82659e91..986b150e 100644 --- a/test/test_sfont_loading.c +++ b/test/test_sfont_loading.c @@ -16,53 +16,53 @@ int main(void) fluid_settings_t *settings = new_fluid_settings(); fluid_synth_t *synth = new_fluid_synth(settings); - TEST_ASSERT_NEQ(settings, NULL); - TEST_ASSERT_NEQ(synth, NULL); + TEST_ASSERT(settings != NULL); + TEST_ASSERT(synth != NULL); // no sfont loaded - TEST_ASSERT_EQ(fluid_synth_sfcount(synth), 0); + TEST_ASSERT(fluid_synth_sfcount(synth) == 0); TEST_SUCCESS(fluid_settings_dupstr(settings, "synth.default-soundfont", &s)) - TEST_ASSERT_NEQ(s[0], '\0'); + TEST_ASSERT(s[0] != '\0'); FLUID_LOG(FLUID_INFO, "Attempt to open %s", s); // load a sfont to synth TEST_SUCCESS(id = fluid_synth_sfload(synth, s, 1)); // one sfont loaded - TEST_ASSERT_EQ(fluid_synth_sfcount(synth), 1); - TEST_ASSERT_NEQ(sfont = fluid_synth_get_sfont_by_id(synth, id), NULL); + TEST_ASSERT(fluid_synth_sfcount(synth) == 1); + TEST_ASSERT((sfont = fluid_synth_get_sfont_by_id(synth, id)) != NULL); // this is still the same filename as we've put in - TEST_ASSERT_EQ(FLUID_STRCMP(s, fluid_sfont_get_name(sfont)), 0); - TEST_ASSERT_EQ(fluid_sfont_get_id(sfont), id); + TEST_ASSERT(FLUID_STRCMP(s, fluid_sfont_get_name(sfont)) == 0); + TEST_ASSERT(fluid_sfont_get_id(sfont) == id); // still the same id? - TEST_ASSERT_EQ(fluid_synth_sfreload(synth, id), id); + TEST_ASSERT(fluid_synth_sfreload(synth, id) == id); // one sfont loaded - TEST_ASSERT_EQ(fluid_synth_sfcount(synth), 1); - TEST_ASSERT_NEQ(sfont = fluid_synth_get_sfont_by_id(synth, id), NULL); + TEST_ASSERT(fluid_synth_sfcount(synth) == 1); + TEST_ASSERT((sfont = fluid_synth_get_sfont_by_id(synth, id)) != NULL); // still the same filename? - TEST_ASSERT_EQ(FLUID_STRCMP(s, fluid_sfont_get_name(sfont)), 0); + TEST_ASSERT(FLUID_STRCMP(s, fluid_sfont_get_name(sfont)) == 0); // correct id stored? - TEST_ASSERT_EQ(fluid_sfont_get_id(sfont), id); + TEST_ASSERT(fluid_sfont_get_id(sfont) == id); // remove the sfont without deleting TEST_SUCCESS(fluid_synth_remove_sfont(synth, sfont)); // no sfont loaded - TEST_ASSERT_EQ(fluid_synth_sfcount(synth), 0); + TEST_ASSERT(fluid_synth_sfcount(synth) == 0); // re-add the sfont without deleting TEST_SUCCESS(id = fluid_synth_add_sfont(synth, sfont)); // one sfont loaded - TEST_ASSERT_EQ(fluid_synth_sfcount(synth), 1); + TEST_ASSERT(fluid_synth_sfcount(synth) == 1); // destroy the sfont TEST_SUCCESS(fluid_synth_sfunload(synth, id, 0)); // no sfont loaded - TEST_ASSERT_EQ(fluid_synth_sfcount(synth), 0); + TEST_ASSERT(fluid_synth_sfcount(synth) == 0); delete_fluid_synth(synth); delete_fluid_settings(settings);