diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-12-10 00:01:22 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 11:23:19 +0100 |
commit | ae4c81e4fca5bb5816b5cbabb17a7dcc22f58a3b (patch) | |
tree | 76012c4f3d176b748961c24f96e87724804f260a /tests/testsuminfo.c | |
parent | 0ffc9bc6e55b5e42766e68fb6cc087f6cbead6e0 (diff) | |
download | msitools-ae4c81e4fca5bb5816b5cbabb17a7dcc22f58a3b.tar.gz msitools-ae4c81e4fca5bb5816b5cbabb17a7dcc22f58a3b.tar.xz msitools-ae4c81e4fca5bb5816b5cbabb17a7dcc22f58a3b.zip |
convert to GObject
Diffstat (limited to 'tests/testsuminfo.c')
-rw-r--r-- | tests/testsuminfo.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/tests/testsuminfo.c b/tests/testsuminfo.c index 4a7b060..a024025 100644 --- a/tests/testsuminfo.c +++ b/tests/testsuminfo.c @@ -53,8 +53,7 @@ static void test_suminfo(void) r = libmsi_database_get_summary_info(hdb, 0, &hsuminfo); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed %u\n", r); - r = libmsi_unref(hsuminfo); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hsuminfo); r = libmsi_database_get_summary_info(hdb, 0, &hsuminfo); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed %u\n", r); @@ -112,8 +111,7 @@ static void test_suminfo(void) r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, &ft, "JungAh"); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_unref(hsuminfo); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hsuminfo); /* try again with the update count set */ r = libmsi_database_get_summary_info(hdb, 1, &hsuminfo); @@ -180,8 +178,7 @@ static void test_suminfo(void) r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, &ft, "Mike"); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_unref(hsuminfo); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hsuminfo); /* try again with a higher update count */ r = libmsi_database_get_summary_info(hdb, 10, &hsuminfo); @@ -207,11 +204,9 @@ static void test_suminfo(void) libmsi_database_commit(hdb); - r = libmsi_unref(hsuminfo); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hsuminfo); - r = libmsi_unref(hdb); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hdb); /* reread, non-zero update count */ r = libmsi_database_open(msifile, LIBMSI_DB_OPEN_TRANSACT, &hdb); @@ -226,12 +221,10 @@ static void test_suminfo(void) r = libmsi_summary_info_persist(hsuminfo); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_persist failed %u\n", r); - r = libmsi_unref(hsuminfo); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed %u\n", r); + g_object_unref(hsuminfo); /* now with zero update count */ - r = libmsi_unref(hdb); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed %u\n", r); + g_object_unref(hdb); r = libmsi_database_open(msifile, LIBMSI_DB_OPEN_READONLY, &hdb); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_open failed\n"); @@ -245,11 +238,9 @@ static void test_suminfo(void) r = libmsi_summary_info_persist(hsuminfo); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_persist wrong error %u\n", r); - r = libmsi_unref(hsuminfo); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n"); + g_object_unref(hsuminfo); - r = libmsi_unref(hdb); - ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed %u\n", r); + g_object_unref(hdb); r = DeleteFile(msifile); ok(r, "DeleteFile failed\n"); @@ -425,14 +416,15 @@ static void test_summary_binary(void) r = libmsi_summary_info_persist( hsuminfo ); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_persist failed %u\n", r); - libmsi_unref( hsuminfo ); - libmsi_unref( hdb ); + g_object_unref( hsuminfo ); + g_object_unref( hdb ); DeleteFile( msifile ); } void main() { + g_type_init(); test_suminfo(); test_summary_binary(); } |