diff options
| -rw-r--r-- | tests/Makefile.am | 65 | ||||
| -rw-r--r-- | tests/test-device.cc | 20 | ||||
| -rw-r--r-- | tests/test-service.cc (renamed from tests/test-indicator.cc) | 37 |
3 files changed, 63 insertions, 59 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d8e329e..5c7d802 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,56 +4,61 @@ BUILT_SOURCES = check_PROGRAMS = ### -### +### tests: stock tests on user-visible strings ### -# stock UMB tests on user-visible strings include $(srcdir)/Makefile.am.strings +### +### gtest library +### + check_LIBRARIES = libgtest.a nodist_libgtest_a_SOURCES = \ - $(GTEST_SOURCE)/gtest-all.cc \ - $(GTEST_SOURCE)/gtest_main.cc + $(GTEST_SOURCE)/src/gtest-all.cc \ + $(GTEST_SOURCE)/src/gtest_main.cc AM_CPPFLAGS = $(GTEST_CPPFLAGS) -I${top_srcdir}/src -Wall -Werror AM_CXXFLAGS = $(GTEST_CXXFLAGS) ### +### tests: indicator-power-device ### -### - -TEST_LIBS = \ - $(COVERAGE_LDFLAGS) \ - $(XORG_GTEST_LDFLAGS) \ - libgtest.a -TEST_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(SERVICE_DEPS_CFLAGS) - -BUILT_SOURCES += gschemas.compiled -CLEANFILES += gschemas.compiled -gschemas.compiled: Makefile - @glib-compile-schemas --targetdir=$(abs_builddir) $(top_builddir)/data +TEST_LIBS = $(COVERAGE_LDFLAGS) libgtest.a -lpthread +TEST_CPPFLAGS = $(SERVICE_DEPS_CFLAGS) $(AM_CPPFLAGS) TESTS += test-device check_PROGRAMS += test-device test_device_SOURCES = test-device.cc -test_device_LDADD = $(TEST_LIBS) -test_device_CPPFLAGS = $(TEST_CPPFLAGS) +test_device_CPPFLAGS = $(TEST_CPPFLAGS) -Wall -Werror -Wextra +test_device_LDADD = \ + $(top_builddir)/src/libindicatorpower-service.a \ + $(SERVICE_DEPS_LIBS) \ + $(TEST_LIBS) + +# (FIXME: incomplete) +# +### +### tests: indicator-power-service +### +# +# build a local copy of the GSettings schemas +#BUILT_SOURCES += gschemas.compiled +#CLEANFILES += gschemas.compiled +#gschemas.compiled: Makefile +# @glib-compile-schemas --targetdir=$(abs_builddir) $(top_builddir)/data +# +#TESTS += test-service +#check_PROGRAMS += test-service +#test_service_SOURCES = test-service.cc +#test_service_LDADD = $(TEST_LIBS) +#test_service_CPPFLAGS = $(TEST_CPPFLAGS) -DSCHEMA_DIR="\"$(top_builddir)/tests/\"" +# #TESTS += test-dbus-listener #check_PROGRAMS += test-dbus-listener #test_dbus_listener_SOURCES = test-dbus-listener.cc #test_dbus_listener_LDADD = $(TEST_LIBS) #test_dbus_listener_CPPFLAGS = $(TEST_CPPFLAGS) - -TESTS += test-indicator -check_PROGRAMS += test-indicator -test_indicator_SOURCES = test-indicator.cc -test_indicator_LDADD = $(TEST_LIBS) -test_indicator_CPPFLAGS = $(TEST_CPPFLAGS) -DSCHEMA_DIR="\"$(top_builddir)/tests/\"" - -### -### -### +# diff --git a/tests/test-device.cc b/tests/test-device.cc index 9c48699..987b201 100644 --- a/tests/test-device.cc +++ b/tests/test-device.cc @@ -30,12 +30,12 @@ class DeviceTest : public ::testing::Test int log_count_ipower_actual; - static void log_count_func (const gchar *log_domain, - GLogLevelFlags log_level, - const gchar *message, - gpointer user_data) + static void log_count_func (const gchar * log_domain G_GNUC_UNUSED, + GLogLevelFlags log_level G_GNUC_UNUSED, + const gchar * message G_GNUC_UNUSED, + gpointer gself) { - reinterpret_cast<DeviceTest*>(user_data)->log_count_ipower_actual++; + reinterpret_cast<DeviceTest*>(gself)->log_count_ipower_actual++; } protected: @@ -543,7 +543,7 @@ TEST_F(DeviceTest, Labels) device will take longest to charge (and optionally how long it will take). */ TEST_F(DeviceTest, ChoosePrimary) { - GSList * device_list; + GList * device_list; IndicatorPowerDevice * a; IndicatorPowerDevice * b; @@ -581,8 +581,8 @@ TEST_F(DeviceTest, ChoosePrimary) }; device_list = NULL; - device_list = g_slist_append (device_list, a); - device_list = g_slist_append (device_list, b); + device_list = g_list_append (device_list, a); + device_list = g_list_append (device_list, b); for (int i=0, n=G_N_ELEMENTS(tests); i<n; i++) { @@ -601,11 +601,11 @@ TEST_F(DeviceTest, ChoosePrimary) ASSERT_EQ (a, indicator_power_service_choose_primary_device(device_list)); /* reverse the list to check that list order doesn't matter */ - device_list = g_slist_reverse (device_list); + device_list = g_list_reverse (device_list); ASSERT_EQ (a, indicator_power_service_choose_primary_device(device_list)); } } // cleanup - g_slist_free_full (device_list, g_object_unref); + g_list_free_full (device_list, g_object_unref); } diff --git a/tests/test-indicator.cc b/tests/test-service.cc index 6fd9bf7..cae3021 100644 --- a/tests/test-indicator.cc +++ b/tests/test-service.cc @@ -1,27 +1,26 @@ /* -Copyright 2012 Canonical Ltd. - -Authors: - Charles Kerr <charles.kerr@canonical.com> - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published -by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, 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 <http://www.gnu.org/licenses/>. -*/ + * Copyright 2013 Canonical Ltd. + * + * Authors: + * Charles Kerr <charles.kerr@canonical.com> + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, 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 <http://www.gnu.org/licenses/>. + */ #include <gtest/gtest.h> -#include "dbus-listener.h" #include "device.h" -#include "indicator-power.h" +#include "service.h" /*** **** |