From 06a0c632056252f7873919afb7bc00017b9b2984 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 20 Mar 2015 16:08:55 -0400 Subject: [PATCH] Fix: Ensure assertions have no side-effect MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- tests/lib/test_bt_objects.c | 6 ++++-- tests/lib/test_ctf_writer.c | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/lib/test_bt_objects.c b/tests/lib/test_bt_objects.c index 389938b7..97131361 100644 --- a/tests/lib/test_bt_objects.c +++ b/tests/lib/test_bt_objects.c @@ -457,7 +457,8 @@ void test_array(void) ok(bt_object_array_size(array_obj) == 10, "appending to a frozen array object does not change its size"); - assert(obj = bt_object_array_get(array_obj, 1)); + obj = bt_object_array_get(array_obj, 1); + assert(obj); ok(bt_object_float_set(obj, 14.52) == BT_OBJECT_STATUS_FROZEN, "freezing an array object also freezes its elements"); BT_OBJECT_PUT(obj); @@ -1139,7 +1140,8 @@ void test_freeze(void) ok(!bt_object_is_frozen(NULL), "NULL is not frozen"); ok(bt_object_is_frozen(bt_object_null), "the null singleton is frozen"); - assert(obj = bt_object_integer_create()); + obj = bt_object_integer_create(); + assert(obj); ok(!bt_object_is_frozen(obj), "bt_object_is_frozen() returns false with a fresh object"); assert(!bt_object_freeze(obj)); diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index 2aa0c7e0..dfc91839 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -875,7 +875,8 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, "bt_ctf_event_class_set_attribute cannot set \"name\" or \"model.emf.uri\" to an integer value"); BT_OBJECT_PUT(obj); - assert(obj = bt_object_integer_create_init(5)); + obj = bt_object_integer_create_init(5); + assert(obj); ok(!bt_ctf_event_class_set_attribute(event_class, "loglevel", obj), "bt_ctf_event_class_set_attribute succeeds in setting the \"loglevel\" attribute"); BT_OBJECT_PUT(obj); @@ -903,7 +904,8 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class, ok(ret, "bt_ctf_event_class_set_attribute cannot set \"id\" or \"loglevel\" to a string value"); BT_OBJECT_PUT(obj); - assert(obj = bt_object_string_create_init("http://kernel.org/")); + obj = bt_object_string_create_init("http://kernel.org/"); + assert(obj); assert(!bt_ctf_event_class_set_attribute(event_class, "model.emf.uri", obj)); BT_OBJECT_PUT(obj); @@ -1782,7 +1784,8 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class) "two event classes with the same name cannot cohabit within the same stream class"); bt_ctf_event_class_put(event_class); - assert(event_class = bt_ctf_event_class_create("different name, ok")); + event_class = bt_ctf_event_class_create("different name, ok"); + assert(event_class); assert(!bt_ctf_event_class_set_id(event_class, 11)); ok(bt_ctf_stream_class_add_event_class(stream_class, event_class), "two event classes with the same ID cannot cohabit within the same stream class"); -- 2.34.1