luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-05 08:56:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "tests/protocol: redo a bit"

Browse Source 
This reverts commit 8d9969fe15.
This commit is contained in:
Matthias Clasen 2012-12-19 15:20:13 -05:00
parent 53a436221f
commit f64d6640d4
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
glib/tests/protocol.c
View File

@ -33,7 +33,8 @@
static void static void
debug (void) debug (void)
{ {
g_debug ("this is a regular g_debug() from the test suite"); if (g_test_verbose ())
g_debug ("this is a regular g_debug() from the test suite");
} }
static void static void
@ -42,37 +43,43 @@ info (void)
#ifdef g_info #ifdef g_info
#error "rewrite this to use g_info()" #error "rewrite this to use g_info()"
#endif #endif
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "this is a regular g_log(..., G_LOG_LEVEL_INFO, ...) from the test suite"); if (g_test_verbose ())
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "this is a regular g_log(..., G_LOG_LEVEL_INFO, ...) from the test suite");
} }
static void static void
message (void) message (void)
{ {
g_message ("this is a regular g_message() from the test suite"); if (g_test_verbose ())
g_message ("this is a regular g_message() from the test suite");
} }
static void static void
warning (void) warning (void)
{ {
g_warning ("this is a regular g_warning() from the test suite"); if (g_test_verbose ())
g_warning ("this is a regular g_warning() from the test suite");
} }
static void static void
critical (void) critical (void)
{ {
g_critical ("this is a regular g_critical() from the test suite"); if (g_test_verbose ())
g_critical ("this is a regular g_critical() from the test suite");
} }
static void static void
error (void) error (void)
{ {
g_error ("this is a regular g_error() from the test suite"); if (g_test_verbose ())
g_error ("this is a regular g_error() from the test suite");
} }
static void static void
gtest_message (void) gtest_message (void)
{ {
g_test_message ("this is a regular g_test_message() from the test suite"); if (g_test_verbose ())
g_test_message ("this is a regular g_test_message() from the test suite");
} }
static gboolean static gboolean
@ -114,9 +121,10 @@ test_message (void)
gchar* argv[] = { gchar* argv[] = {
"./protocol", "./protocol",
NULL, NULL,
"-p", "/glib/testing/protocol:debug", "--verbose",
"-p", "/glib/testing/protocol:message", "-p", "/glib/testing/protocol/debug",
"-p", "/glib/testing/protocol:gtest-message", "-p", "/glib/testing/protocol/message",
"-p", "/glib/testing/protocol/gtest-message",
NULL NULL
}; };
GTestLogBuffer* tlb; GTestLogBuffer* tlb;
@ -221,9 +229,9 @@ static void
test_error (void) test_error (void)
{ {
gchar* tests[] = { gchar* tests[] = {
"/glib/testing/protocol:warning", "/glib/testing/protocol/warning",
"/glib/testing/protocol:critical", "/glib/testing/protocol/critical",
"/glib/testing/protocol:error" "/glib/testing/protocol/error"
}; };
gint i; gint i;
int messages = 0; int messages = 0;
@ -233,6 +241,7 @@ test_error (void)
gchar* argv[] = { gchar* argv[] = {
"./protocol", "./protocol",
NULL, NULL,
"--verbose",
"-p", tests[i], "-p", tests[i],
NULL NULL
}; };
@ -330,13 +339,13 @@ main (int argc,
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
/* we use ourself as the testcase, these are the ones we need internally */ /* we use ourself as the testcase, these are the ones we need internally */
g_test_add_func ("/glib/testing/protocol:debug", debug); g_test_add_func ("/glib/testing/protocol/debug", debug);
g_test_add_func ("/glib/testing/protocol:info", info); g_test_add_func ("/glib/testing/protocol/info", info);
g_test_add_func ("/glib/testing/protocol:message", message); g_test_add_func ("/glib/testing/protocol/message", message);
g_test_add_func ("/glib/testing/protocol:warning", warning); g_test_add_func ("/glib/testing/protocol/warning", warning);
g_test_add_func ("/glib/testing/protocol:critical", critical); g_test_add_func ("/glib/testing/protocol/critical", critical);
g_test_add_func ("/glib/testing/protocol:error", error); g_test_add_func ("/glib/testing/protocol/error", error);
g_test_add_func ("/glib/testing/protocol:gtest-message", gtest_message); g_test_add_func ("/glib/testing/protocol/gtest-message", gtest_message);
/* these are the real tests */ /* these are the real tests */
g_test_add_func ("/glib/testing/protocol/test-message", test_message); g_test_add_func ("/glib/testing/protocol/test-message", test_message);