projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header
[platform/upstream/glib.git]
/
gio
/
tests
/
gdbus-message.c
diff --git
a/gio/tests/gdbus-message.c
b/gio/tests/gdbus-message.c
index
b3be200
..
7a88bbf
100644
(file)
--- a/
gio/tests/gdbus-message.c
+++ b/
gio/tests/gdbus-message.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
*
* Author: David Zeuthen <davidz@redhat.com>
*/
@@
-54,29
+52,35
@@
message_lock (void)
g_assert (g_dbus_message_get_locked (m));
g_assert_cmpint (count, ==, 1);
g_assert (g_dbus_message_get_locked (m));
g_assert_cmpint (count, ==, 1);
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- g_dbus_message_set_serial (m, 42);
- g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*Attempted to modify a locked message*");
+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+ "*Attempted to modify a locked message*");
+ g_dbus_message_set_serial (m, 42);
+ g_test_assert_expected_messages ();
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- g_dbus_message_set_byte_order (m, G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN);
- g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*Attempted to modify a locked message*");
+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+ "*Attempted to modify a locked message*");
+ g_dbus_message_set_byte_order (m, G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN);
+ g_test_assert_expected_messages ();
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- g_dbus_message_set_message_type (m, G_DBUS_MESSAGE_TYPE_METHOD_CALL);
- g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*Attempted to modify a locked message*");
+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+ "*Attempted to modify a locked message*");
+ g_dbus_message_set_message_type (m, G_DBUS_MESSAGE_TYPE_METHOD_CALL);
+ g_test_assert_expected_messages ();
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- g_dbus_message_set_flags (m, G_DBUS_MESSAGE_FLAGS_NONE);
- g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*Attempted to modify a locked message*");
+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+ "*Attempted to modify a locked message*");
+ g_dbus_message_set_flags (m, G_DBUS_MESSAGE_FLAGS_NONE);
+ g_test_assert_expected_messages ();
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- g_dbus_message_set_body (m, NULL);
- g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*Attempted to modify a locked message*");
+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+ "*Attempted to modify a locked message*");
+ g_dbus_message_set_body (m, NULL);
+ g_test_assert_expected_messages ();
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- g_dbus_message_set_header (m, 0, NULL);
- g_test_trap_assert_failed (); g_test_trap_assert_stderr ("*Attempted to modify a locked message*");
+ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+ "*Attempted to modify a locked message*");
+ g_dbus_message_set_header (m, 0, NULL);
+ g_test_assert_expected_messages ();
g_object_unref (m);
}
g_object_unref (m);
}
@@
-143,7
+147,6
@@
main (int argc,
{
setlocale (LC_ALL, "C");
{
setlocale (LC_ALL, "C");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/gdbus/message/lock", message_lock);
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/gdbus/message/lock", message_lock);