X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_bt_ctf_field_type_validation.c;h=f88cecd533cd15158ff0edde557d939af89f3e8d;hb=3dca22768a95bef664012559aa9ac977091de6ac;hp=71225bfd426f2013297cfaaed27951b4fc270b56;hpb=d975f66c5dcfc7eade13db3edbc975d2055dfe4b;p=babeltrace.git diff --git a/tests/lib/test_bt_ctf_field_type_validation.c b/tests/lib/test_bt_ctf_field_type_validation.c index 71225bfd..f88cecd5 100644 --- a/tests/lib/test_bt_ctf_field_type_validation.c +++ b/tests/lib/test_bt_ctf_field_type_validation.c @@ -34,7 +34,7 @@ #include "tap/tap.h" static -struct bt_field_type *get_good_packet_header_type(void) +struct bt_field_type *get_good_packet_header_field_type(void) { /* Generated by bt-ctfirtg using the following input: @@ -143,7 +143,7 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_magic = bt_field_type_integer_create(32); assert(root_magic); - ret = bt_ctf_field_type_integer_set_signed(root_magic, 0); + ret = bt_field_type_integer_set_is_signed(root_magic, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_magic, 10); assert(ret == 0); @@ -157,7 +157,7 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_uuid_elem = bt_field_type_integer_create(8); assert(root_uuid_elem); - ret = bt_ctf_field_type_integer_set_signed(root_uuid_elem, 0); + ret = bt_field_type_integer_set_is_signed(root_uuid_elem, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_uuid_elem, 10); assert(ret == 0); @@ -173,7 +173,7 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_stream_id = bt_field_type_integer_create(32); assert(root_stream_id); - ret = bt_ctf_field_type_integer_set_signed(root_stream_id, 0); + ret = bt_field_type_integer_set_is_signed(root_stream_id, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_stream_id, 10); assert(ret == 0); @@ -197,7 +197,7 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_iron_dust = bt_field_type_integer_create(23); assert(root_iron_dust); - ret = bt_ctf_field_type_integer_set_signed(root_iron_dust, 0); + ret = bt_field_type_integer_set_is_signed(root_iron_dust, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_iron_dust, 10); assert(ret == 0); @@ -211,7 +211,7 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_iron_parallel_int = bt_field_type_integer_create(10); assert(root_iron_parallel_int); - ret = bt_ctf_field_type_integer_set_signed(root_iron_parallel_int, 0); + ret = bt_field_type_integer_set_is_signed(root_iron_parallel_int, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_iron_parallel_int, 10); assert(ret == 0); @@ -223,11 +223,11 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_iron_parallel = bt_field_type_enumeration_create(root_iron_parallel_int); assert(root_iron_parallel); - ret = bt_ctf_field_type_enumeration_add_mapping(root_iron_parallel, "RED", 0, 0); + ret = bt_field_type_enumeration_unsigned_add_mapping(root_iron_parallel, "RED", 0, 0); assert(ret == 0); - ret = bt_ctf_field_type_enumeration_add_mapping(root_iron_parallel, "BLUE", 1, 1); + ret = bt_field_type_enumeration_unsigned_add_mapping(root_iron_parallel, "BLUE", 1, 1); assert(ret == 0); - ret = bt_ctf_field_type_enumeration_add_mapping(root_iron_parallel, "YELLOW", 2, 2); + ret = bt_field_type_enumeration_unsigned_add_mapping(root_iron_parallel, "YELLOW", 2, 2); assert(ret == 0); ret = bt_field_type_structure_add_field(root_iron, root_iron_parallel, "parallel"); assert(ret == 0); @@ -237,7 +237,7 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_iron_fire_word = bt_field_type_integer_create(17); assert(root_iron_fire_word); - ret = bt_ctf_field_type_integer_set_signed(root_iron_fire_word, 0); + ret = bt_field_type_integer_set_is_signed(root_iron_fire_word, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_iron_fire_word, 10); assert(ret == 0); @@ -265,7 +265,7 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_iron_fire_keen_elem_BLUE_elem = bt_field_type_integer_create(5); assert(root_iron_fire_keen_elem_BLUE_elem); - ret = bt_ctf_field_type_integer_set_signed(root_iron_fire_keen_elem_BLUE_elem, 0); + ret = bt_field_type_integer_set_is_signed(root_iron_fire_keen_elem_BLUE_elem, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_iron_fire_keen_elem_BLUE_elem, 10); assert(ret == 0); @@ -311,7 +311,7 @@ struct bt_field_type *get_good_packet_header_type(void) assert(ret == 0); root_serious = bt_field_type_integer_create(1); assert(root_serious); - ret = bt_ctf_field_type_integer_set_signed(root_serious, 0); + ret = bt_field_type_integer_set_is_signed(root_serious, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_serious, 10); assert(ret == 0); @@ -352,7 +352,7 @@ struct bt_field_type *get_good_packet_header_type(void) } static -struct bt_field_type *get_good_packet_context_type(void) +struct bt_field_type *get_good_packet_context_field_type(void) { /* Generated by bt-ctfirtg using the following input: @@ -449,7 +449,7 @@ struct bt_field_type *get_good_packet_context_type(void) assert(ret == 0); root_placid = bt_field_type_integer_create(32); assert(root_placid); - ret = bt_ctf_field_type_integer_set_signed(root_placid, 0); + ret = bt_field_type_integer_set_is_signed(root_placid, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_placid, 10); assert(ret == 0); @@ -469,7 +469,7 @@ struct bt_field_type *get_good_packet_context_type(void) assert(ret == 0); root_serious = bt_field_type_integer_create(11); assert(root_serious); - ret = bt_ctf_field_type_integer_set_signed(root_serious, 0); + ret = bt_field_type_integer_set_is_signed(root_serious, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_serious, 10); assert(ret == 0); @@ -497,7 +497,7 @@ struct bt_field_type *get_good_packet_context_type(void) assert(ret == 0); root_clover_oval = bt_field_type_integer_create(17); assert(root_clover_oval); - ret = bt_ctf_field_type_integer_set_signed(root_clover_oval, 0); + ret = bt_field_type_integer_set_is_signed(root_clover_oval, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_clover_oval, 10); assert(ret == 0); @@ -521,7 +521,7 @@ struct bt_field_type *get_good_packet_context_type(void) assert(ret == 0); root_clover_whole_RED = bt_field_type_integer_create(44); assert(root_clover_whole_RED); - ret = bt_ctf_field_type_integer_set_signed(root_clover_whole_RED, 0); + ret = bt_field_type_integer_set_is_signed(root_clover_whole_RED, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_clover_whole_RED, 10); assert(ret == 0); @@ -543,7 +543,7 @@ struct bt_field_type *get_good_packet_context_type(void) assert(ret == 0); root_clover_egg_elem = bt_field_type_integer_create(55); assert(root_clover_egg_elem); - ret = bt_ctf_field_type_integer_set_signed(root_clover_egg_elem, 0); + ret = bt_field_type_integer_set_is_signed(root_clover_egg_elem, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_clover_egg_elem, 10); assert(ret == 0); @@ -559,7 +559,7 @@ struct bt_field_type *get_good_packet_context_type(void) assert(ret == 0); root_clover_square_int = bt_field_type_integer_create(12); assert(root_clover_square_int); - ret = bt_ctf_field_type_integer_set_signed(root_clover_square_int, 0); + ret = bt_field_type_integer_set_is_signed(root_clover_square_int, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_clover_square_int, 10); assert(ret == 0); @@ -571,15 +571,15 @@ struct bt_field_type *get_good_packet_context_type(void) assert(ret == 0); root_clover_square = bt_field_type_enumeration_create(root_clover_square_int); assert(root_clover_square); - ret = bt_ctf_field_type_enumeration_add_mapping(root_clover_square, "YOUNG", 0, 0); + ret = bt_field_type_enumeration_unsigned_add_mapping(root_clover_square, "YOUNG", 0, 0); assert(ret == 0); - ret = bt_ctf_field_type_enumeration_add_mapping(root_clover_square, "OLD", 1, 1); + ret = bt_field_type_enumeration_unsigned_add_mapping(root_clover_square, "OLD", 1, 1); assert(ret == 0); ret = bt_field_type_structure_add_field(root_clover, root_clover_square, "square"); assert(ret == 0); root_clover_useful_elem = bt_field_type_integer_create(2); assert(root_clover_useful_elem); - ret = bt_ctf_field_type_integer_set_signed(root_clover_useful_elem, 0); + ret = bt_field_type_integer_set_is_signed(root_clover_useful_elem, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_clover_useful_elem, 10); assert(ret == 0); @@ -628,7 +628,7 @@ struct bt_field_type *get_good_packet_context_type(void) static -struct bt_field_type *get_good_event_header_type(void) +struct bt_field_type *get_good_event_header_field_type(void) { /* Generated by bt-ctfirtg using the following input: @@ -700,7 +700,7 @@ struct bt_field_type *get_good_event_header_type(void) assert(ret == 0); root_id = bt_field_type_integer_create(17); assert(root_id); - ret = bt_ctf_field_type_integer_set_signed(root_id, 0); + ret = bt_field_type_integer_set_is_signed(root_id, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_id, 10); assert(ret == 0); @@ -714,7 +714,7 @@ struct bt_field_type *get_good_event_header_type(void) assert(ret == 0); root_timestamp = bt_field_type_integer_create(64); assert(root_timestamp); - ret = bt_ctf_field_type_integer_set_signed(root_timestamp, 0); + ret = bt_field_type_integer_set_is_signed(root_timestamp, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_timestamp, 10); assert(ret == 0); @@ -732,7 +732,7 @@ struct bt_field_type *get_good_event_header_type(void) assert(ret == 0); root_action_special = bt_field_type_integer_create(17); assert(root_action_special); - ret = bt_ctf_field_type_integer_set_signed(root_action_special, 0); + ret = bt_field_type_integer_set_is_signed(root_action_special, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_action_special, 10); assert(ret == 0); @@ -760,7 +760,7 @@ struct bt_field_type *get_good_event_header_type(void) assert(ret == 0); root_action_grandiose_elem = bt_field_type_integer_create(3); assert(root_action_grandiose_elem); - ret = bt_ctf_field_type_integer_set_signed(root_action_grandiose_elem, 0); + ret = bt_field_type_integer_set_is_signed(root_action_grandiose_elem, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_action_grandiose_elem, 10); assert(ret == 0); @@ -790,7 +790,7 @@ struct bt_field_type *get_good_event_header_type(void) assert(ret == 0); root_fruit_apple_elem = bt_field_type_integer_create(5); assert(root_fruit_apple_elem); - ret = bt_ctf_field_type_integer_set_signed(root_fruit_apple_elem, 0); + ret = bt_field_type_integer_set_is_signed(root_fruit_apple_elem, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_fruit_apple_elem, 10); assert(ret == 0); @@ -826,7 +826,7 @@ struct bt_field_type *get_good_event_header_type(void) } static -struct bt_field_type *get_good_stream_event_context_type(void) +struct bt_field_type *get_good_stream_event_context_field_type(void) { /* Generated by bt-ctfirtg using the following input: @@ -917,7 +917,7 @@ struct bt_field_type *get_good_stream_event_context_type(void) assert(ret == 0); root_face_magic = bt_field_type_integer_create(23); assert(root_face_magic); - ret = bt_ctf_field_type_integer_set_signed(root_face_magic, 0); + ret = bt_field_type_integer_set_is_signed(root_face_magic, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_face_magic, 10); assert(ret == 0); @@ -941,7 +941,7 @@ struct bt_field_type *get_good_stream_event_context_type(void) assert(ret == 0); root_cats = bt_field_type_integer_create(5); assert(root_cats); - ret = bt_ctf_field_type_integer_set_signed(root_cats, 0); + ret = bt_field_type_integer_set_is_signed(root_cats, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_cats, 10); assert(ret == 0); @@ -967,7 +967,7 @@ struct bt_field_type *get_good_stream_event_context_type(void) assert(ret == 0); root_stream_id = bt_field_type_integer_create(9); assert(root_stream_id); - ret = bt_ctf_field_type_integer_set_signed(root_stream_id, 0); + ret = bt_field_type_integer_set_is_signed(root_stream_id, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_stream_id, 10); assert(ret == 0); @@ -999,7 +999,7 @@ struct bt_field_type *get_good_stream_event_context_type(void) } static -struct bt_field_type *get_good_event_context_type(void) +struct bt_field_type *get_good_event_context_field_type(void) { /* Generated by bt-ctfirtg using the following input: @@ -1115,7 +1115,7 @@ struct bt_field_type *get_good_event_context_type(void) assert(ret == 0); root_film = bt_field_type_integer_create(19); assert(root_film); - ret = bt_ctf_field_type_integer_set_signed(root_film, 0); + ret = bt_field_type_integer_set_is_signed(root_film, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_film, 10); assert(ret == 0); @@ -1157,7 +1157,7 @@ struct bt_field_type *get_good_event_context_type(void) assert(ret == 0); root_berry_third = bt_field_type_integer_create(18); assert(root_berry_third); - ret = bt_ctf_field_type_integer_set_signed(root_berry_third, 0); + ret = bt_field_type_integer_set_is_signed(root_berry_third, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_berry_third, 10); assert(ret == 0); @@ -1189,7 +1189,7 @@ struct bt_field_type *get_good_event_context_type(void) assert(ret == 0); root_cats = bt_field_type_integer_create(55); assert(root_cats); - ret = bt_ctf_field_type_integer_set_signed(root_cats, 0); + ret = bt_field_type_integer_set_is_signed(root_cats, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_cats, 10); assert(ret == 0); @@ -1288,7 +1288,7 @@ struct bt_field_type *get_good_event_context_type(void) } static -struct bt_field_type *get_good_event_payload_type(void) +struct bt_field_type *get_good_event_payload_field_type(void) { /* Generated by bt-ctfirtg using the following input: @@ -1413,7 +1413,7 @@ struct bt_field_type *get_good_event_payload_type(void) assert(ret == 0); root_splendid = bt_field_type_integer_create(12); assert(root_splendid); - ret = bt_ctf_field_type_integer_set_signed(root_splendid, 0); + ret = bt_field_type_integer_set_is_signed(root_splendid, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_splendid, 10); assert(ret == 0); @@ -1572,26 +1572,26 @@ struct bt_field_type *get_child_ft(struct bt_field_type *parent_ft, struct bt_field_type *ft = NULL; switch (bt_field_type_get_type_id(parent_ft)) { - case CTF_TYPE_STRUCT: + case BT_FIELD_TYPE_ID_STRUCT: ft = bt_field_type_structure_get_field_type_by_name( parent_ft, name); break; - case CTF_TYPE_VARIANT: + case BT_FIELD_TYPE_ID_VARIANT: ft = bt_field_type_variant_get_field_type_by_name( parent_ft, name); break; - case CTF_TYPE_ARRAY: - ft = bt_field_type_array_get_element_type(parent_ft); + case BT_FIELD_TYPE_ID_ARRAY: + ft = bt_field_type_array_get_element_field_type(parent_ft); break; - case CTF_TYPE_SEQUENCE: - ft = bt_field_type_sequence_get_element_type(parent_ft); + case BT_FIELD_TYPE_ID_SEQUENCE: + ft = bt_field_type_sequence_get_element_field_type(parent_ft); break; - case CTF_TYPE_ENUM: - ft = bt_field_type_enumeration_get_container_type( + case BT_FIELD_TYPE_ID_ENUM: + ft = bt_field_type_enumeration_get_container_field_type( parent_ft); break; @@ -1724,17 +1724,17 @@ void validate_test_pass(struct bt_trace *trace) ec = bt_stream_class_get_event_class_by_index(sc, 0); assert(ec); - ph = bt_trace_get_packet_header_type(trace); + ph = bt_trace_get_packet_header_field_type(trace); ok(ph, "Trace packet header still exists after successful validation"); - pc = bt_stream_class_get_packet_context_type(sc); + pc = bt_stream_class_get_packet_context_field_type(sc); ok(pc, "Stream packet context still exists after successful validation"); - eh = bt_stream_class_get_event_header_type(sc); + eh = bt_stream_class_get_event_header_field_type(sc); ok(eh, "Stream event header still exists after successful validation"); - sec = bt_stream_class_get_event_context_type(sc); + sec = bt_stream_class_get_event_context_field_type(sc); ok(sec, "Stream event context still exists after successful validation"); - ectx = bt_event_class_get_context_type(ec); + ectx = bt_event_class_get_context_field_type(ec); ok(ectx, "Event context still exists after successful validation"); - ep = bt_event_class_get_payload_type(ec); + ep = bt_event_class_get_payload_field_type(ec); ok(ep, "Event payload still exists after successful validation"); /* trace.packet.header.iron.fire.keen */ @@ -1750,7 +1750,7 @@ void validate_test_pass(struct bt_trace *trace) BT_SCOPE_TRACE_PACKET_HEADER, 3, 2, FIELD_PATH_END), "trace.packet.header.iron.fire.keen.[element] has the correct field path"); ft_target = get_ft(ph, "iron", "parallel", NULL); - ft_tag = bt_field_type_variant_get_tag_type(ft_src); + ft_tag = bt_field_type_variant_get_tag_field_type(ft_src); ok(ft_tag == ft_target, "trace.packet.header.iron.fire.keen.[element] has the correct tag type"); BT_PUT(ft_src); @@ -1791,7 +1791,7 @@ void validate_test_pass(struct bt_trace *trace) BT_SCOPE_TRACE_PACKET_HEADER, 3, 2, FIELD_PATH_END), "stream.packet.context.clover.whole has the correct field path"); ft_target = get_ft(ph, "iron", "parallel", NULL); - ft_tag = bt_field_type_variant_get_tag_type(ft_src); + ft_tag = bt_field_type_variant_get_tag_field_type(ft_src); ok(ft_tag == ft_target, "stream.packet.context.clover.whole has the correct tag type"); BT_PUT(ft_src); @@ -2076,30 +2076,30 @@ void test_pass(void) ec = bt_event_class_create("oh_what_an_event_class"); assert(ec); - ph = get_good_packet_header_type(); + ph = get_good_packet_header_field_type(); assert(ph); - pc = get_good_packet_context_type(); + pc = get_good_packet_context_field_type(); assert(pc); - eh = get_good_event_header_type(); + eh = get_good_event_header_field_type(); assert(eh); - sec = get_good_stream_event_context_type(); + sec = get_good_stream_event_context_field_type(); assert(sec); - ectx = get_good_event_context_type(); + ectx = get_good_event_context_field_type(); assert(ec); - ep = get_good_event_payload_type(); + ep = get_good_event_payload_field_type(); assert(ep); - ret = bt_trace_set_packet_header_type(trace, ph); + ret = bt_trace_set_packet_header_field_type(trace, ph); assert(ret == 0); - ret = bt_stream_class_set_packet_context_type(sc, pc); + ret = bt_stream_class_set_packet_context_field_type(sc, pc); assert(ret == 0); - ret = bt_stream_class_set_event_header_type(sc, eh); + ret = bt_stream_class_set_event_header_field_type(sc, eh); assert(ret == 0); - ret = bt_stream_class_set_event_context_type(sc, sec); + ret = bt_stream_class_set_event_context_field_type(sc, sec); assert(ret == 0); - ret = bt_event_class_set_context_type(ec, ectx); + ret = bt_event_class_set_context_field_type(ec, ectx); assert(ret == 0); - ret = bt_event_class_set_payload_type(ec, ep); + ret = bt_event_class_set_payload_field_type(ec, ep); assert(ret == 0); ret = bt_stream_class_add_event_class(sc, ec); @@ -2123,42 +2123,40 @@ void test_pass(void) } static -struct bt_event *create_event_with_context_and_payload( - struct bt_field_type *ectx, struct bt_field_type *ep) +int try_add_event_class_to_trace(struct bt_field_type *ectx, + struct bt_field_type *ep) { int ret; + struct bt_trace *trace; struct bt_stream_class *sc; struct bt_event_class *ec; - struct bt_event *event; + trace = bt_trace_create(); + assert(trace); sc = bt_stream_class_create("sc"); assert(sc); ec = bt_event_class_create("ec"); assert(ec); if (ectx) { - ret = bt_event_class_set_context_type(ec, ectx); + ret = bt_event_class_set_context_field_type(ec, ectx); assert(ret == 0); } if (ep) { - ret = bt_event_class_set_payload_type(ec, ep); + ret = bt_event_class_set_payload_field_type(ec, ep); assert(ret == 0); } ret = bt_stream_class_add_event_class(sc, ec); assert(ret == 0); - - /* Validation happens here */ - event = bt_event_create(ec); - + ret = bt_trace_add_stream_class(trace, sc); BT_PUT(ec); BT_PUT(sc); - - return event; + BT_PUT(trace); + return ret; } - static struct bt_field_type *test_fail_unavailable_root_get_event_payload(void) { @@ -2193,7 +2191,7 @@ struct bt_field_type *test_fail_unavailable_root_get_event_payload(void) assert(ret == 0); root_a = bt_field_type_integer_create(32); assert(root_a); - ret = bt_ctf_field_type_integer_set_signed(root_a, 0); + ret = bt_field_type_integer_set_is_signed(root_a, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_a, 10); assert(ret == 0); @@ -2232,15 +2230,13 @@ static void test_fail_unavailable_root(void) { struct bt_field_type *ep; - struct bt_event *event; ep = test_fail_unavailable_root_get_event_payload(); assert(ep); - event = create_event_with_context_and_payload(NULL, ep); - ok(!event, "Sequence FT with length in unavailable root is invalid"); + ok(try_add_event_class_to_trace(NULL, ep), + "Sequence FT with length in unavailable root is invalid"); BT_PUT(ep); - BT_PUT(event); } static @@ -2277,7 +2273,7 @@ struct bt_field_type *test_fail_target_is_root_get_event_payload(void) assert(ret == 0); root_a = bt_field_type_integer_create(32); assert(root_a); - ret = bt_ctf_field_type_integer_set_signed(root_a, 0); + ret = bt_field_type_integer_set_is_signed(root_a, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_a, 10); assert(ret == 0); @@ -2316,15 +2312,12 @@ static void test_fail_target_is_root(void) { struct bt_field_type *ep; - struct bt_event *event; ep = test_fail_target_is_root_get_event_payload(); assert(ep); - event = create_event_with_context_and_payload(NULL, ep); - ok(!event, "Sequence FT with root as its length is invalid"); - + ok(try_add_event_class_to_trace(NULL, ep), + "Sequence FT with root as its length is invalid"); BT_PUT(ep); - BT_PUT(event); } static @@ -2365,7 +2358,7 @@ struct bt_field_type *test_fail_target_is_after_source_get_ep(void) assert(ret == 0); root_a = bt_field_type_integer_create(32); assert(root_a); - ret = bt_ctf_field_type_integer_set_signed(root_a, 0); + ret = bt_field_type_integer_set_is_signed(root_a, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_a, 10); assert(ret == 0); @@ -2393,7 +2386,7 @@ struct bt_field_type *test_fail_target_is_after_source_get_ep(void) assert(ret == 0); root_d = bt_field_type_integer_create(17); assert(root_d); - ret = bt_ctf_field_type_integer_set_signed(root_d, 0); + ret = bt_field_type_integer_set_is_signed(root_d, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_d, 10); assert(ret == 0); @@ -2419,15 +2412,12 @@ static void test_fail_target_is_after_source(void) { struct bt_field_type *ep; - struct bt_event *event; ep = test_fail_target_is_after_source_get_ep(); assert(ep); - event = create_event_with_context_and_payload(NULL, ep); - ok(!event, "Sequence FT with length after it is invalid"); - + ok(try_add_event_class_to_trace(NULL, ep), + "Sequence FT with length after it is invalid"); BT_PUT(ep); - BT_PUT(event); } static @@ -2472,7 +2462,7 @@ struct bt_field_type *test_fail_target_is_ancestor_of_source_get_ep(void) assert(ret == 0); root_a = bt_field_type_integer_create(32); assert(root_a); - ret = bt_ctf_field_type_integer_set_signed(root_a, 0); + ret = bt_field_type_integer_set_is_signed(root_a, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_a, 10); assert(ret == 0); @@ -2506,7 +2496,7 @@ struct bt_field_type *test_fail_target_is_ancestor_of_source_get_ep(void) assert(ret == 0); root_d = bt_field_type_integer_create(17); assert(root_d); - ret = bt_ctf_field_type_integer_set_signed(root_d, 0); + ret = bt_field_type_integer_set_is_signed(root_d, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_d, 10); assert(ret == 0); @@ -2533,15 +2523,12 @@ static void test_fail_target_is_ancestor_of_source(void) { struct bt_field_type *ep; - struct bt_event *event; ep = test_fail_target_is_ancestor_of_source_get_ep(); assert(ep); - event = create_event_with_context_and_payload(NULL, ep); - ok(!event, "Sequence FT with ancestor as its length is invalid"); - + ok(try_add_event_class_to_trace(NULL, ep), + "Sequence FT with ancestor as its length is invalid"); BT_PUT(ep); - BT_PUT(event); } static @@ -2582,7 +2569,7 @@ struct bt_field_type *test_fail_target_is_source_get_event_payload(void) assert(ret == 0); root_a = bt_field_type_integer_create(32); assert(root_a); - ret = bt_ctf_field_type_integer_set_signed(root_a, 0); + ret = bt_field_type_integer_set_is_signed(root_a, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_a, 10); assert(ret == 0); @@ -2610,7 +2597,7 @@ struct bt_field_type *test_fail_target_is_source_get_event_payload(void) assert(ret == 0); root_d = bt_field_type_integer_create(17); assert(root_d); - ret = bt_ctf_field_type_integer_set_signed(root_d, 0); + ret = bt_field_type_integer_set_is_signed(root_d, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_d, 10); assert(ret == 0); @@ -2636,15 +2623,12 @@ static void test_fail_target_is_source(void) { struct bt_field_type *ep; - struct bt_event *event; ep = test_fail_target_is_source_get_event_payload(); assert(ep); - event = create_event_with_context_and_payload(NULL, ep); - ok(!event, "Sequence FT with itself as its length is invalid"); - + ok(try_add_event_class_to_trace(NULL, ep), + "Sequence FT with itself as its length is invalid"); BT_PUT(ep); - BT_PUT(event); } static @@ -2686,7 +2670,7 @@ struct bt_field_type *test_fail_variant_tag_is_not_enum_get_ep(void) assert(ret == 0); root_a = bt_field_type_integer_create(32); assert(root_a); - ret = bt_ctf_field_type_integer_set_signed(root_a, 0); + ret = bt_field_type_integer_set_is_signed(root_a, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_a, 10); assert(ret == 0); @@ -2716,7 +2700,7 @@ struct bt_field_type *test_fail_variant_tag_is_not_enum_get_ep(void) assert(ret == 0); root_d = bt_field_type_integer_create(17); assert(root_d); - ret = bt_ctf_field_type_integer_set_signed(root_d, 0); + ret = bt_field_type_integer_set_is_signed(root_d, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_d, 10); assert(ret == 0); @@ -2742,15 +2726,12 @@ static void test_fail_variant_tag_is_not_enum(void) { struct bt_field_type *ep; - struct bt_event *event; ep = test_fail_variant_tag_is_not_enum_get_ep(); assert(ep); - event = create_event_with_context_and_payload(NULL, ep); - ok(!event, "Variant FT with non-enum FT as its tag FT is invalid"); - + ok(try_add_event_class_to_trace(NULL, ep), + "Variant FT with non-enum FT as its tag FT is invalid"); BT_PUT(ep); - BT_PUT(event); } static @@ -2799,7 +2780,7 @@ struct bt_field_type *test_fail_variant_tag_mismatch_mappings_get_ep(void) assert(ret == 0); root_a_int = bt_field_type_integer_create(16); assert(root_a_int); - ret = bt_ctf_field_type_integer_set_signed(root_a_int, 0); + ret = bt_field_type_integer_set_is_signed(root_a_int, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_a_int, 10); assert(ret == 0); @@ -2811,11 +2792,11 @@ struct bt_field_type *test_fail_variant_tag_mismatch_mappings_get_ep(void) assert(ret == 0); root_a = bt_field_type_enumeration_create(root_a_int); assert(root_a); - ret = bt_ctf_field_type_enumeration_add_mapping(root_a, "GLASS", 0, 0); + ret = bt_field_type_enumeration_unsigned_add_mapping(root_a, "GLASS", 0, 0); assert(ret == 0); - ret = bt_ctf_field_type_enumeration_add_mapping(root_a, "OF", 1, 1); + ret = bt_field_type_enumeration_unsigned_add_mapping(root_a, "OF", 1, 1); assert(ret == 0); - ret = bt_ctf_field_type_enumeration_add_mapping(root_a, "WATER", 2, 2); + ret = bt_field_type_enumeration_unsigned_add_mapping(root_a, "WATER", 2, 2); assert(ret == 0); ret = bt_field_type_structure_add_field(root, root_a, "a"); assert(ret == 0); @@ -2829,7 +2810,7 @@ struct bt_field_type *test_fail_variant_tag_mismatch_mappings_get_ep(void) assert(ret == 0); root_b_OF = bt_field_type_integer_create(2); assert(root_b_OF); - ret = bt_ctf_field_type_integer_set_signed(root_b_OF, 0); + ret = bt_field_type_integer_set_is_signed(root_b_OF, 0); assert(ret == 0); ret = bt_field_type_integer_set_base(root_b_OF, 10); assert(ret == 0); @@ -2864,15 +2845,12 @@ static void test_fail_variant_tag_mismatch_mappings(void) { struct bt_field_type *ep; - struct bt_event *event; ep = test_fail_variant_tag_mismatch_mappings_get_ep(); assert(ep); - event = create_event_with_context_and_payload(NULL, ep); - ok(event, "Variant FT with mismatching tag FT is valid"); - + ok(try_add_event_class_to_trace(NULL, ep) == 0, + "Variant FT with mismatching tag FT is valid"); BT_PUT(ep); - BT_PUT(event); } static @@ -2939,15 +2917,12 @@ static void test_fail_sequence_tag_is_not_int(void) { struct bt_field_type *ep; - struct bt_event *event; ep = test_fail_sequence_tag_is_not_int_get_ep(); assert(ep); - event = create_event_with_context_and_payload(NULL, ep); - ok(!event, "Sequence FT with non-enum length FT is invalid"); - + ok(try_add_event_class_to_trace(NULL, ep), + "Sequence FT with non-enum length FT is invalid"); BT_PUT(ep); - BT_PUT(event); } static