From dd268a24fe649fe7ddf24c4a923e898b184fdbb5 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Fri, 25 Mar 2016 08:16:12 -0400 Subject: [PATCH] tests: Build sidebar test with ctest Signed-off-by: Anna Schumaker --- tests/gui/CMakeLists.txt | 1 + tests/gui/Sconscript | 2 +- tests/gui/sidebar.c | 40 +++++++++++++++++++--------------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/tests/gui/CMakeLists.txt b/tests/gui/CMakeLists.txt index 1d496fb0..29ed295b 100644 --- a/tests/gui/CMakeLists.txt +++ b/tests/gui/CMakeLists.txt @@ -11,3 +11,4 @@ gui_unit_test(View) gui_unit_test(Queue) gui_unit_test(Window) gui_unit_test(Idle) +gui_unit_test(Sidebar) diff --git a/tests/gui/Sconscript b/tests/gui/Sconscript index 393502d9..00822dc8 100644 --- a/tests/gui/Sconscript +++ b/tests/gui/Sconscript @@ -31,7 +31,7 @@ gui_objs += [ env.Object("../../gui/view.c") ] gui_objs += [ env.Object("../../gui/queue.c") ] gui_objs += [ env.Object("../../gui/window.c") ] gui_objs += [ env.Object("../../gui/idle.c") ] -res += [ GuiTest("sidebar") ] +gui_objs += [ env.Object("../../gui/sidebar.c") ] res += [ GuiTest("playlist") ] gui_objs += [ env.Object("../../gui/collection.c") ] gui_objs += [ env.Object("../../gui/artwork.c") ] diff --git a/tests/gui/sidebar.c b/tests/gui/sidebar.c index c367d114..0776a279 100644 --- a/tests/gui/sidebar.c +++ b/tests/gui/sidebar.c @@ -1,9 +1,6 @@ /* * Copyright 2015 (c) Anna Schumaker. */ -#define TEST_NEED_AUDIO -#define TEST_NEED_COLLECTION -#define TEST_NEED_PLAYLIST #include #include #include @@ -12,32 +9,33 @@ static void test_sidebar() { - GtkPaned *paned; - int argc = 0; + GtkPaned *paned = GTK_PANED(gui_builder_widget("o_sidebar")); - test_equal(gui_settings_has("gui.sidebar.pos"), (bool)false); + g_assert_false(gui_settings_has("gui.sidebar.pos")); + gtk_paned_set_position(paned, 300); + g_assert_true(gui_settings_has("gui.sidebar.pos")); + g_assert_cmpuint(gui_settings_get("gui.sidebar.pos"), ==, 300); + + gui_settings_set("gui.sidebar.pos", 250); + gui_sidebar_init(); + g_assert_cmpuint(gui_settings_get("gui.sidebar.pos"), ==, 250); + g_assert_cmpuint(gtk_paned_get_position(paned), ==, 250); +} + +int main(int argc, char **argv) +{ + int ret; gtk_init(&argc, NULL); gui_builder_init("share/ocarina/ocarina6.glade"); gui_settings_init(); gui_sidebar_init(); - paned = GTK_PANED(gui_builder_widget("o_sidebar")); - test_equal(gui_settings_has("gui.sidebar.pos"), (bool)false); - - gtk_paned_set_position(paned, 300); - test_equal(gui_settings_has("gui.sidebar.pos"), (bool)true); - test_equal(gui_settings_get("gui.sidebar.pos"), 300); - - gui_settings_set("gui.sidebar.pos", 250); - gui_sidebar_init(); - test_equal(gui_settings_get("gui.sidebar.pos"), 250); - test_equal(gtk_paned_get_position(paned), 250); + g_test_init(&argc, &argv, NULL); + g_test_add_func("/Gui/Sidebar", test_sidebar); + ret = g_test_run(); gui_settings_deinit(); gui_builder_deinit(); + return ret; } - -DECLARE_UNIT_TESTS( - UNIT_TEST("Sidebar", test_sidebar), -);