From 868453ef75110badecdb54e13b79a74cfc95282a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Nov 2013 16:34:20 -0600 Subject: Woot, a test, kinda --- CMakeLists.txt | 5 +++++ tests/CMakeLists.txt | 21 +++++++++++++++++++++ tests/name-watch-test.cc | 21 +++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 tests/name-watch-test.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index 837d9ec..ecd2f12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,5 +68,10 @@ add_subdirectory(data) add_subdirectory(src) enable_testing() + +set (GTEST_SOURCE_DIR /usr/src/gtest/src) +set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..) +set (GTEST_LIBS -lpthread) + add_subdirectory(tests) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e69de29..1e5448d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -0,0 +1,21 @@ + +########################### +# Google Test +########################### + +include_directories(${GTEST_INCLUDE_DIR}) + +add_library (gtest STATIC + ${GTEST_SOURCE_DIR}/gtest-all.cc + ${GTEST_SOURCE_DIR}/gtest_main.cc) +target_link_libraries(gtest ${GTEST_LIBS}) + + +########################### +# Name Watch Test +########################### + +add_executable (name-watch-test name-watch-test.cc) +target_link_libraries (name-watch-test gtest ${GIO2_LIBRARIES}) +add_test(name-watch-test name-watch-test) + diff --git a/tests/name-watch-test.cc b/tests/name-watch-test.cc new file mode 100644 index 0000000..b5a1db3 --- /dev/null +++ b/tests/name-watch-test.cc @@ -0,0 +1,21 @@ + +#include +#include + +class NameWatchTest : public ::testing::Test +{ + protected: + virtual void SetUp() { + + } + + virtual void TearDown() { + + } +}; + +TEST_F(NameWatchTest, DummyTest) +{ + + +} -- cgit v1.2.3 From 436a5a3a347b7c0946e5e53f721f0f7d2fd53062 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Nov 2013 16:34:57 -0600 Subject: Grab Google Test --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 9104d0c..3714c07 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9.0), autotools-dev, valac (>= 0.20), libglib2.0-dev (>= 2.22.3), + libgtest-dev, liburl-dispatcher1-dev, libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), -- cgit v1.2.3 From 30e3f1f9d404c77ee32d2e004c2c9327192f5872 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Nov 2013 22:11:57 -0600 Subject: Okay, no we're testing something! --- tests/CMakeLists.txt | 5 +++-- tests/name-watch-test.cc | 44 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1e5448d..8e79fd0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -15,7 +15,8 @@ target_link_libraries(gtest ${GTEST_LIBS}) # Name Watch Test ########################### -add_executable (name-watch-test name-watch-test.cc) -target_link_libraries (name-watch-test gtest ${GIO2_LIBRARIES}) +include_directories(${CMAKE_SOURCE_DIR}/src) +add_executable (name-watch-test name-watch-test.cc ${CMAKE_SOURCE_DIR}/src/bus-watch-namespace.c) +target_link_libraries (name-watch-test gtest ${SOUNDSERVICE_LIBRARIES}) add_test(name-watch-test name-watch-test) diff --git a/tests/name-watch-test.cc b/tests/name-watch-test.cc index b5a1db3..64f681d 100644 --- a/tests/name-watch-test.cc +++ b/tests/name-watch-test.cc @@ -2,20 +2,58 @@ #include #include +extern "C" { +#include "bus-watch-namespace.h" +} + class NameWatchTest : public ::testing::Test { + private: + GTestDBus * testbus = NULL; + protected: virtual void SetUp() { - + testbus = g_test_dbus_new(G_TEST_DBUS_NONE); + g_test_dbus_up(testbus); } virtual void TearDown() { - + g_test_dbus_down(testbus); + g_clear_object(&testbus); } }; -TEST_F(NameWatchTest, DummyTest) +typedef struct { + guint appeared; + guint vanished; +} callback_count_t; + +static void +appeared_simple_cb (GDBusConnection * bus, const gchar * name, const gchar * owner, gpointer user_data) +{ + callback_count_t * callback_count = static_cast(user_data); + callback_count->appeared++; +} + +static void +vanished_simple_cb (GDBusConnection * bus, const gchar * name, gpointer user_data) { + callback_count_t * callback_count = static_cast(user_data); + callback_count->vanished++; +} + + +TEST_F(NameWatchTest, BaseWatch) +{ + callback_count_t callback_count = {0}; + + guint ns_watch = bus_watch_namespace(G_BUS_TYPE_SESSION, + "com.foo", + appeared_simple_cb, + vanished_simple_cb, + &callback_count, + NULL); + bus_unwatch_namespace(ns_watch); } -- cgit v1.2.3 From fc3c64800be186946252921639c79cd712c6a4f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Nov 2013 22:20:40 -0600 Subject: Make sure we can see names coming on the bus and call the acquired signal --- tests/name-watch-test.cc | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/name-watch-test.cc b/tests/name-watch-test.cc index 64f681d..66daadc 100644 --- a/tests/name-watch-test.cc +++ b/tests/name-watch-test.cc @@ -54,6 +54,33 @@ TEST_F(NameWatchTest, BaseWatch) &callback_count, NULL); + guint name1 = g_bus_own_name(G_BUS_TYPE_SESSION, + "com.foo.bar", + G_BUS_NAME_OWNER_FLAGS_NONE, + NULL, NULL, NULL, NULL, NULL); + guint name2 = g_bus_own_name(G_BUS_TYPE_SESSION, + "com.foo.bar_too", + G_BUS_NAME_OWNER_FLAGS_NONE, + NULL, NULL, NULL, NULL, NULL); + + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + + + ASSERT_EQ(callback_count.appeared, 2); + + g_bus_unown_name(name1); + g_bus_unown_name(name2); + + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + + ASSERT_EQ(callback_count.vanished, 2); bus_unwatch_namespace(ns_watch); } -- cgit v1.2.3 From 7a5f01039d308695e4f5faf347912c443d5ca26c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Nov 2013 22:23:02 -0600 Subject: Test for a couple of names we shouldn't expect to see. --- tests/name-watch-test.cc | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tests/name-watch-test.cc b/tests/name-watch-test.cc index 66daadc..737915e 100644 --- a/tests/name-watch-test.cc +++ b/tests/name-watch-test.cc @@ -84,3 +84,45 @@ TEST_F(NameWatchTest, BaseWatch) bus_unwatch_namespace(ns_watch); } + +TEST_F(NameWatchTest, NonMatches) +{ + callback_count_t callback_count = {0}; + + guint ns_watch = bus_watch_namespace(G_BUS_TYPE_SESSION, + "com.foo", + appeared_simple_cb, + vanished_simple_cb, + &callback_count, + NULL); + + guint name1 = g_bus_own_name(G_BUS_TYPE_SESSION, + "com.foobar.bar", + G_BUS_NAME_OWNER_FLAGS_NONE, + NULL, NULL, NULL, NULL, NULL); + guint name2 = g_bus_own_name(G_BUS_TYPE_SESSION, + "com.bar.com.foo", + G_BUS_NAME_OWNER_FLAGS_NONE, + NULL, NULL, NULL, NULL, NULL); + + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + + + ASSERT_EQ(callback_count.appeared, 0); + + g_bus_unown_name(name1); + g_bus_unown_name(name2); + + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + + ASSERT_EQ(callback_count.vanished, 0); + + bus_unwatch_namespace(ns_watch); +} -- cgit v1.2.3 From 6b8b48fe7e5749cb3142e57f2ea544046703bff6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Nov 2013 22:31:55 -0600 Subject: Adding a test to make sure we get names if they existed before we did --- tests/name-watch-test.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/name-watch-test.cc b/tests/name-watch-test.cc index 737915e..c9737ec 100644 --- a/tests/name-watch-test.cc +++ b/tests/name-watch-test.cc @@ -126,3 +126,47 @@ TEST_F(NameWatchTest, NonMatches) bus_unwatch_namespace(ns_watch); } + +TEST_F(NameWatchTest, StartupNames) +{ + guint name1 = g_bus_own_name(G_BUS_TYPE_SESSION, + "com.foo.bar", + G_BUS_NAME_OWNER_FLAGS_NONE, + NULL, NULL, NULL, NULL, NULL); + + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + + callback_count_t callback_count = {0}; + + guint ns_watch = bus_watch_namespace(G_BUS_TYPE_SESSION, + "com.foo", + appeared_simple_cb, + vanished_simple_cb, + &callback_count, + NULL); + + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + + ASSERT_EQ(callback_count.appeared, 1); + + g_bus_unown_name(name1); + + g_usleep(100000); + while (g_main_pending()) + g_main_iteration(TRUE); + + ASSERT_EQ(callback_count.vanished, 1); + + bus_unwatch_namespace(ns_watch); +} + -- cgit v1.2.3 From 67f6ffe35c6318cd510f49647e57aa01abeb4d70 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Nov 2013 22:36:33 -0600 Subject: Nicer mainloop --- tests/name-watch-test.cc | 55 ++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/tests/name-watch-test.cc b/tests/name-watch-test.cc index c9737ec..ef182c8 100644 --- a/tests/name-watch-test.cc +++ b/tests/name-watch-test.cc @@ -21,6 +21,19 @@ class NameWatchTest : public ::testing::Test g_test_dbus_down(testbus); g_clear_object(&testbus); } + + static gboolean timeout_cb (gpointer user_data) { + GMainLoop * loop = static_cast(user_data); + g_main_loop_quit(loop); + return G_SOURCE_REMOVE; + } + + void loop (unsigned int ms) { + GMainLoop * loop = g_main_loop_new(NULL, FALSE); + g_timeout_add(ms, timeout_cb, loop); + g_main_loop_run(loop); + g_main_loop_unref(loop); + } }; typedef struct { @@ -63,22 +76,14 @@ TEST_F(NameWatchTest, BaseWatch) G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL, NULL); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); - + loop(100); ASSERT_EQ(callback_count.appeared, 2); g_bus_unown_name(name1); g_bus_unown_name(name2); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); + loop(100); ASSERT_EQ(callback_count.vanished, 2); @@ -105,22 +110,14 @@ TEST_F(NameWatchTest, NonMatches) G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL, NULL); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); - + loop(100); ASSERT_EQ(callback_count.appeared, 0); g_bus_unown_name(name1); g_bus_unown_name(name2); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); + loop(100); ASSERT_EQ(callback_count.vanished, 0); @@ -134,9 +131,7 @@ TEST_F(NameWatchTest, StartupNames) G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL, NULL); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); + loop(100); callback_count_t callback_count = {0}; @@ -147,23 +142,13 @@ TEST_F(NameWatchTest, StartupNames) &callback_count, NULL); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); + loop(100); ASSERT_EQ(callback_count.appeared, 1); g_bus_unown_name(name1); - g_usleep(100000); - while (g_main_pending()) - g_main_iteration(TRUE); + loop(100); ASSERT_EQ(callback_count.vanished, 1); -- cgit v1.2.3 From efb0c090af3ccf5e3ca19d4228bd8f8b0e5a5c07 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Nov 2013 22:38:03 -0600 Subject: Copyright header --- tests/name-watch-test.cc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/name-watch-test.cc b/tests/name-watch-test.cc index ef182c8..d7e85b4 100644 --- a/tests/name-watch-test.cc +++ b/tests/name-watch-test.cc @@ -1,3 +1,21 @@ +/* + * Copyright 2013 Canonical Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: + * Ted Gould + */ #include #include -- cgit v1.2.3 From 7c2b5448a186614299da1f16da3b87619dd97ef0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 18 Nov 2013 08:40:22 -0600 Subject: Adding DBus for the test suite --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 3714c07..ab0c0f1 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Conor Curran Build-Depends: debhelper (>= 9.0), cmake, + dbus, dh-translations, gnome-common, autotools-dev, -- cgit v1.2.3