summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-09-25 18:57:01 -0400
committerWill Thompson <will.thompson@collabora.co.uk>2012-09-25 18:57:01 -0400
commit02378b69d4057001f873875ea9c03bda516fc08d (patch)
treef0d0edbcf7a8c3c6f1572a25986921b6d58e89ea /tests
parente897c6f8284dc4ce6f5329fbfc6b24ba643d3ecd (diff)
downloadtelepathy-logger-02378b69d4057001f873875ea9c03bda516fc08d.tar.gz
Make TplLogStore:name immutable.
For all log stores except the Xml one, this is always set to the same thing. For the Xml one, the name of the store depends entirely on the value of empathy-legacy.
Diffstat (limited to 'tests')
-rw-r--r--tests/dbus/test-tpl-log-iter-pidgin.c1
-rw-r--r--tests/dbus/test-tpl-log-iter-xml.c1
-rw-r--r--tests/dbus/test-tpl-log-store-pidgin.c9
-rw-r--r--tests/dbus/test-tpl-log-store-xml.c1
4 files changed, 3 insertions, 9 deletions
diff --git a/tests/dbus/test-tpl-log-iter-pidgin.c b/tests/dbus/test-tpl-log-iter-pidgin.c
index c18a34b..e1a96dc 100644
--- a/tests/dbus/test-tpl-log-iter-pidgin.c
+++ b/tests/dbus/test-tpl-log-iter-pidgin.c
@@ -52,7 +52,6 @@ setup (PidginTestCaseFixture* fixture,
g_assert (fixture->main_loop != NULL);
fixture->store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
- "name", "testcase",
"testmode", TRUE,
NULL);
diff --git a/tests/dbus/test-tpl-log-iter-xml.c b/tests/dbus/test-tpl-log-iter-xml.c
index 1d64c15..7b966f6 100644
--- a/tests/dbus/test-tpl-log-iter-xml.c
+++ b/tests/dbus/test-tpl-log-iter-xml.c
@@ -28,7 +28,6 @@ setup (XmlTestCaseFixture* fixture,
GError *error = NULL;
fixture->store = g_object_new (TPL_TYPE_LOG_STORE_XML,
- "name", "testcase",
"testmode", TRUE,
NULL);
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index 3ef0a23..fea3daf 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -171,7 +171,6 @@ setup (PidginTestCaseFixture* fixture,
DEBUG ("basedir is %s", fixture->basedir);
fixture->store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
- "name", "testcase",
"testmode", TRUE,
NULL);
@@ -251,9 +250,7 @@ test_basedir (PidginTestCaseFixture *fixture,
/* try to instantiate the default store, without passing basedir, it has to
* match the real libpurple basedir */
- store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
- "name", "testcase",
- NULL);
+ store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN, NULL);
dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".purple",
"logs", NULL);
g_assert_cmpstr (log_store_pidgin_get_basedir (store), ==, dir);
@@ -345,9 +342,9 @@ test_get_name (PidginTestCaseFixture *fixture,
{
const gchar *name;
- name = log_store_pidgin_get_name (TPL_LOG_STORE (fixture->store));
+ name = _tpl_log_store_get_name (TPL_LOG_STORE (fixture->store));
- g_assert_cmpstr (name, ==, "testcase");
+ g_assert_cmpstr (name, ==, "Pidgin");
}
static void
diff --git a/tests/dbus/test-tpl-log-store-xml.c b/tests/dbus/test-tpl-log-store-xml.c
index f35b4a7..6deceb9 100644
--- a/tests/dbus/test-tpl-log-store-xml.c
+++ b/tests/dbus/test-tpl-log-store-xml.c
@@ -48,7 +48,6 @@ setup (XmlTestCaseFixture* fixture,
gconstpointer user_data)
{
fixture->store = g_object_new (TPL_TYPE_LOG_STORE_XML,
- "name", "testcase",
"testmode", TRUE,
NULL);