aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/glib-fixture.h89
-rw-r--r--tests/test-dbus-fixture.h (renamed from tests/gtestdbus-fixture.h)30
-rw-r--r--tests/test-rotation-lock.cpp6
4 files changed, 44 insertions, 83 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 054a676..6c8be9b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,5 +31,5 @@ function(add_test_by_name name)
endfunction()
add_test_by_name(test-rotation-lock)
-add_test (cppcheck cppcheck --enable=all -q --error-exitcode=2 --inline-suppr -I${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
+add_test (cppcheck cppcheck --enable=all -USCHEMA_DIR --error-exitcode=2 --inline-suppr -I${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
diff --git a/tests/glib-fixture.h b/tests/glib-fixture.h
index 65d2921..41ac6e8 100644
--- a/tests/glib-fixture.h
+++ b/tests/glib-fixture.h
@@ -1,5 +1,8 @@
/*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -12,13 +15,9 @@
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Charles Kerr <charles.kerr@canonical.com>
*/
-#ifndef INDICATOR_TESTS_GLIB_FIXTURE_H
-#define INDICATOR_TESTS_GLIB_FIXTURE_H
+#pragma once
#include <map>
@@ -32,75 +31,44 @@
class GlibFixture : public ::testing::Test
{
- private:
-
- GLogFunc realLogHandler;
-
- std::map<GLogLevelFlags,size_t> expected_log;
- std::map<GLogLevelFlags,std::vector<std::string>> log;
-
- void test_log_counts()
- {
- const GLogLevelFlags levels_to_test[] = { G_LOG_LEVEL_ERROR,
- G_LOG_LEVEL_CRITICAL,
- G_LOG_LEVEL_MESSAGE,
- G_LOG_LEVEL_WARNING };
-
- for(const auto& level : levels_to_test)
- {
- const auto& v = log[level];
- const auto n = v.size();
-
- EXPECT_EQ(expected_log[level], n);
-
- if (expected_log[level] != n)
- for (size_t i=0; i<n; ++i)
- g_print("%d %s\n", (n+1), v[i].c_str());
- }
-
- expected_log.clear();
- log.clear();
- }
+ public:
- static void default_log_handler(const gchar * log_domain,
- GLogLevelFlags log_level,
- const gchar * message,
- gpointer self)
- {
- char* tmp = g_strdup_printf ("%s:%d \"%s\"", log_domain, (int)log_level, message);
- static_cast<GlibFixture*>(self)->log[log_level].push_back(tmp);
- g_free(tmp);
- }
+ virtual ~GlibFixture() =default;
protected:
- void increment_expected_errors(GLogLevelFlags level, size_t n=1)
- {
- expected_log[level] += n;
- }
-
- virtual void SetUp()
+ virtual void SetUp() override
{
setlocale(LC_ALL, "C.UTF-8");
loop = g_main_loop_new(nullptr, false);
- g_log_set_default_handler(default_log_handler, this);
-
+#ifdef SCHEMA_DIR
+ // only use local, temporary settings
+ g_assert(g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, true));
g_assert(g_setenv("GSETTINGS_BACKEND", "memory", true));
+ g_debug("SCHEMA_DIR is %s", SCHEMA_DIR);
+#endif
+
+ // fail on unexpected messages from this domain
+ g_log_set_fatal_mask(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING);
g_unsetenv("DISPLAY");
+
}
- virtual void TearDown()
+ virtual void TearDown() override
{
- test_log_counts();
-
- g_log_set_default_handler(realLogHandler, this);
+ g_test_assert_expected_messages ();
g_clear_pointer(&loop, g_main_loop_unref);
}
+ void expectLogMessage (const gchar *domain, GLogLevelFlags level, const gchar *pattern)
+ {
+ g_test_expect_message (domain, level, pattern);
+ }
+
private:
static gboolean
@@ -120,7 +88,7 @@ class GlibFixture : public ::testing::Test
protected:
/* convenience func to loop while waiting for a GObject's signal */
- void wait_for_signal(gpointer o, const gchar * signal, const guint timeout_seconds=5)
+ void wait_for_signal(gpointer o, const gchar * signal, const int timeout_seconds=5)
{
// wait for the signal or for timeout, whichever comes first
const auto handler_id = g_signal_connect_swapped(o, signal,
@@ -135,7 +103,7 @@ class GlibFixture : public ::testing::Test
}
/* convenience func to loop for N msec */
- void wait_msec(guint msec=50)
+ void wait_msec(int msec=50)
{
const auto id = g_timeout_add(msec, wait_msec__timeout, loop);
g_main_loop_run(loop);
@@ -143,10 +111,5 @@ class GlibFixture : public ::testing::Test
}
GMainLoop * loop;
-
- public:
-
- virtual ~GlibFixture() =default;
};
-#endif /* INDICATOR_TESTS_GLIB_FIXTURE_H */
diff --git a/tests/gtestdbus-fixture.h b/tests/test-dbus-fixture.h
index c592033..3947e58 100644
--- a/tests/gtestdbus-fixture.h
+++ b/tests/test-dbus-fixture.h
@@ -17,8 +17,7 @@
* Charles Kerr <charles.kerr@canonical.com>
*/
-#ifndef INDICATOR_TESTS_GTESTDBUS_FIXTURE_H
-#define INDICATOR_TESTS_GTESTDBUS_FIXTURE_H
+#pragma once
#include "glib-fixture.h"
@@ -26,14 +25,14 @@
****
***/
-class GTestDBusFixture: public GlibFixture
+class TestDBusFixture: public GlibFixture
{
public:
- GTestDBusFixture() =default;
- virtual ~GTestDBusFixture() =default;
+ TestDBusFixture() =default;
+ virtual ~TestDBusFixture() =default;
- explicit GTestDBusFixture(const std::vector<std::string>& service_dirs_in): service_dirs(service_dirs_in) {}
+ explicit TestDBusFixture(const std::vector<std::string>& service_dirs_in): service_dirs(service_dirs_in) {}
private:
@@ -42,10 +41,10 @@ class GTestDBusFixture: public GlibFixture
static void
on_bus_opened (GObject* /*object*/, GAsyncResult * res, gpointer gself)
{
- auto self = static_cast<GTestDBusFixture*>(gself);
+ auto self = static_cast<TestDBusFixture*>(gself);
GError * err = 0;
- self->bus = g_bus_get_finish (res, &err);
+ self->system_bus = g_bus_get_finish (res, &err);
g_assert_no_error (err);
g_main_loop_quit (self->loop);
@@ -54,10 +53,10 @@ class GTestDBusFixture: public GlibFixture
static void
on_bus_closed (GObject* /*object*/, GAsyncResult * res, gpointer gself)
{
- auto self = static_cast<GTestDBusFixture*>(gself);
+ auto self = static_cast<TestDBusFixture*>(gself);
GError * err = 0;
- g_dbus_connection_close_finish (self->bus, res, &err);
+ g_dbus_connection_close_finish (self->system_bus, res, &err);
g_assert_no_error (err);
g_main_loop_quit (self->loop);
@@ -66,10 +65,10 @@ class GTestDBusFixture: public GlibFixture
protected:
GTestDBus * test_dbus = nullptr;
- GDBusConnection * bus = nullptr;
+ GDBusConnection * system_bus = nullptr;
const std::vector<std::string> service_dirs;
- virtual void SetUp ()
+ virtual void SetUp() override
{
super::SetUp ();
@@ -88,14 +87,14 @@ class GTestDBusFixture: public GlibFixture
g_main_loop_run (loop);
}
- virtual void TearDown ()
+ virtual void TearDown() override
{
wait_msec();
// close the system bus
- g_dbus_connection_close(bus, nullptr, on_bus_closed, this);
+ g_dbus_connection_close(system_bus, nullptr, on_bus_closed, this);
g_main_loop_run(loop);
- g_clear_object(&bus);
+ g_clear_object(&system_bus);
// tear down the test dbus
g_test_dbus_down(test_dbus);
@@ -105,4 +104,3 @@ class GTestDBusFixture: public GlibFixture
}
};
-#endif /* INDICATOR_TESTS_GTESTDBUS_FIXTURE_H */
diff --git a/tests/test-rotation-lock.cpp b/tests/test-rotation-lock.cpp
index 946b1dd..b8661cc 100644
--- a/tests/test-rotation-lock.cpp
+++ b/tests/test-rotation-lock.cpp
@@ -17,14 +17,14 @@
* Charles Kerr <charles.kerr@canonical.com>
*/
-#include "gtestdbus-fixture.h"
+#include "test-dbus-fixture.h"
#include <src/rotation-lock.h>
-class RotationLockFixture: public GTestDBusFixture
+class RotationLockFixture: public TestDBusFixture
{
private:
- typedef GTestDBusFixture super;
+ typedef TestDBusFixture super;
protected: