[empathy] move test_init/test_deinit to test-helper.c



commit 2a974fc78e833d232a6203d5a807b0ee5efb396a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Oct 27 15:51:11 2009 +0000

    move test_init/test_deinit to test-helper.c

 tests/Makefile.am          |    3 ++-
 tests/empathy-utils-test.c |   17 +----------------
 tests/test-helper.c        |   19 +++++++++++++++++++
 tests/test-helper.h        |    9 +++++++++
 4 files changed, 31 insertions(+), 17 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 21ee99b..bc7407a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,8 @@ LDADD =								\
 TEST_PROGS =                                     \
      empathy-utils-test
 
-empathy_utils_test_SOURCES = empathy-utils-test.c
+empathy_utils_test_SOURCES = empathy-utils-test.c \
+     test-helper.c test-helper.h
 
 check_PROGRAMS = check-main $(TEST_PROGS)
 
diff --git a/tests/empathy-utils-test.c b/tests/empathy-utils-test.c
index 415526f..896793a 100644
--- a/tests/empathy-utils-test.c
+++ b/tests/empathy-utils-test.c
@@ -2,23 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <glib.h>
-
 #include <libempathy/empathy-utils.h>
-
-static void
-test_init (int argc,
-    char **argv)
-{
-  g_test_init (&argc, &argv, NULL);
-  g_type_init ();
-}
-
-static void
-test_deinit (void)
-{
-  ;
-}
+#include "test-helper.h"
 
 static void
 test_substring (void)
diff --git a/tests/test-helper.c b/tests/test-helper.c
new file mode 100644
index 0000000..37fad86
--- /dev/null
+++ b/tests/test-helper.c
@@ -0,0 +1,19 @@
+#include <stdlib.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#include "test-helper.h"
+
+void
+test_init (int argc,
+    char **argv)
+{
+  g_test_init (&argc, &argv, NULL);
+  g_type_init ();
+}
+
+void
+test_deinit (void)
+{
+  ;
+}
diff --git a/tests/test-helper.h b/tests/test-helper.h
new file mode 100644
index 0000000..a2a69b7
--- /dev/null
+++ b/tests/test-helper.h
@@ -0,0 +1,9 @@
+#ifndef __TEST_HELPER_H__
+#define __TEST_HELPER_H__
+
+void test_init (int argc,
+    char **argv);
+
+void test_deinit (void);
+
+#endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]