diff options
Diffstat (limited to 'shaping/test/gtest_shaper_send_log.cpp')
| -rw-r--r-- | shaping/test/gtest_shaper_send_log.cpp | 87 |
1 files changed, 50 insertions, 37 deletions
diff --git a/shaping/test/gtest_shaper_send_log.cpp b/shaping/test/gtest_shaper_send_log.cpp index effd7bf..897120d 100644 --- a/shaping/test/gtest_shaper_send_log.cpp +++ b/shaping/test/gtest_shaper_send_log.cpp @@ -56,19 +56,19 @@ static void gtest_shaper_log_parse(struct shaping_flow *sf, const char *data, si for (int i = 0; i < sf->rule_num; i++) { ASSERT_EQ(mpack_type_map, mpack_node_type(mpack_node_array_at(tmp_node, i)) ); tmp_rule_node = mpack_node_map_cstr(mpack_node_array_at(tmp_node, i), "rule_id"); - EXPECT_EQ(mpack_type_uint, mpack_node_type(tmp_rule_node)); - sf->matched_rule_infos[i].id = mpack_node_u64(tmp_rule_node); + EXPECT_EQ(mpack_type_bin, mpack_node_type(tmp_rule_node)); + uuid_copy(sf->matched_rule_infos[i].uuid, *(uuid_t*)mpack_node_bin_data(tmp_rule_node)); tmp_profile_node = mpack_node_map_cstr(mpack_node_array_at(tmp_node, i), "profile_ids"); ASSERT_EQ(mpack_type_array, mpack_node_type(tmp_profile_node)); int profile_array_len = mpack_node_array_length(tmp_profile_node); sf->matched_rule_infos[i].borrowing_num = profile_array_len - 1; for (int j = 0; j < profile_array_len; j++) { - ASSERT_EQ(mpack_type_uint, mpack_node_type(mpack_node_array_at(tmp_profile_node, j)) ); + ASSERT_EQ(mpack_type_bin, mpack_node_type(mpack_node_array_at(tmp_profile_node, j)) ); if (j == 0) { - sf->matched_rule_infos[i].primary.id = mpack_node_u64(mpack_node_array_at(tmp_profile_node, j)); + uuid_copy(sf->matched_rule_infos[i].primary.uuid, *(uuid_t*)mpack_node_bin_data(mpack_node_array_at(tmp_profile_node, j))); } else { - sf->matched_rule_infos[i].borrowing[j - 1].id = mpack_node_u64(mpack_node_array_at(tmp_profile_node, j)); + uuid_copy(sf->matched_rule_infos[i].borrowing[j - 1].uuid, *(uuid_t*)mpack_node_bin_data(mpack_node_array_at(tmp_profile_node, j))); } } } @@ -88,26 +88,26 @@ TEST(MPACK_LOG, PARSE) sf_in.ctrl_meta.session_id = 12345678; sf_in.rule_num = 3; - //rule_id 0, primary profile id 0, borrow profile id 1 - sf_in.matched_rule_infos[0].id = 0; - sf_in.matched_rule_infos[0].primary.id = 0; + //rule_id 1, primary profile id 1, borrow profile id 2 + uuid_parse("00000000-0000-0000-0000-000000000001", sf_in.matched_rule_infos[0].uuid); + uuid_parse("00000000-0000-0000-0000-000000000001", sf_in.matched_rule_infos[0].primary.uuid); sf_in.matched_rule_infos[0].borrowing_num = 1; - sf_in.matched_rule_infos[0].borrowing[0].id = 1; + uuid_parse("00000000-0000-0000-0000-000000000002", sf_in.matched_rule_infos[0].borrowing[0].uuid); - //rule id 1, primary profile id 2, borrow profile id 3,4 - sf_in.matched_rule_infos[1].id = 1; - sf_in.matched_rule_infos[1].primary.id = 2; + //rule id 2, primary profile id 3, borrow profile id 4,5 + uuid_parse("00000000-0000-0000-0000-000000000002", sf_in.matched_rule_infos[1].uuid); + uuid_parse("00000000-0000-0000-0000-000000000003", sf_in.matched_rule_infos[1].primary.uuid); sf_in.matched_rule_infos[1].borrowing_num = 2; - sf_in.matched_rule_infos[1].borrowing[0].id = 3; - sf_in.matched_rule_infos[1].borrowing[1].id = 4; + uuid_parse("00000000-0000-0000-0000-000000000004", sf_in.matched_rule_infos[1].borrowing[0].uuid); + uuid_parse("00000000-0000-0000-0000-000000000005", sf_in.matched_rule_infos[1].borrowing[1].uuid); - //rule id 2, primary profile id 5, borrow profile id 6,7,8 - sf_in.matched_rule_infos[2].id = 2; - sf_in.matched_rule_infos[2].primary.id = 5; + //rule id 3, primary profile id 6, borrow profile id 7,8,9 + uuid_parse("00000000-0000-0000-0000-000000000003", sf_in.matched_rule_infos[2].uuid); + uuid_parse("00000000-0000-0000-0000-000000000006", sf_in.matched_rule_infos[2].primary.uuid); sf_in.matched_rule_infos[2].borrowing_num = 3; - sf_in.matched_rule_infos[2].borrowing[0].id = 6; - sf_in.matched_rule_infos[2].borrowing[1].id = 7; - sf_in.matched_rule_infos[2].borrowing[2].id = 8; + uuid_parse("00000000-0000-0000-0000-000000000007", sf_in.matched_rule_infos[2].borrowing[0].uuid); + uuid_parse("00000000-0000-0000-0000-000000000008", sf_in.matched_rule_infos[2].borrowing[1].uuid); + uuid_parse("00000000-0000-0000-0000-000000000009", sf_in.matched_rule_infos[2].borrowing[2].uuid); shaper_session_log_prepare(&sf_in, &mpack_data, &mpack_size); gtest_shaper_log_parse(&sf_out, mpack_data, mpack_size); @@ -115,26 +115,39 @@ TEST(MPACK_LOG, PARSE) EXPECT_EQ(sf_out.ctrl_meta.session_id, 12345678); EXPECT_EQ(sf_out.rule_num, 3); - //rule_id 0, primary profile id 0, borrow profile id 1 - EXPECT_EQ(sf_out.matched_rule_infos[0].id, 0); - EXPECT_EQ(sf_out.matched_rule_infos[0].primary.id, 0); + //rule_id 1, primary profile id 1, borrow profile id 2 + char uuid_str[UUID_STR_LEN]; + uuid_unparse(sf_out.matched_rule_infos[0].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000001", uuid_str); + uuid_unparse(sf_out.matched_rule_infos[0].primary.uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000001", uuid_str); EXPECT_EQ(sf_out.matched_rule_infos[0].borrowing_num, 1); - EXPECT_EQ(sf_out.matched_rule_infos[0].borrowing[0].id, 1); - - //rule id 1, primary profile id 2, borrow profile id 3,4 - EXPECT_EQ(sf_out.matched_rule_infos[1].id, 1); - EXPECT_EQ(sf_out.matched_rule_infos[1].primary.id, 2); + uuid_unparse(sf_out.matched_rule_infos[0].borrowing[0].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000002", uuid_str); + + //rule id 2, primary profile id 3, borrow profile id 4,5 + uuid_unparse(sf_out.matched_rule_infos[1].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000002", uuid_str); + uuid_unparse(sf_out.matched_rule_infos[1].primary.uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000003", uuid_str); EXPECT_EQ(sf_out.matched_rule_infos[1].borrowing_num, 2); - EXPECT_EQ(sf_out.matched_rule_infos[1].borrowing[0].id, 3); - EXPECT_EQ(sf_out.matched_rule_infos[1].borrowing[1].id, 4); - - //rule id 2, primary profile id 5, borrow profile id 6,7,8 - EXPECT_EQ(sf_out.matched_rule_infos[2].id, 2); - EXPECT_EQ(sf_out.matched_rule_infos[2].primary.id, 5); + uuid_unparse(sf_out.matched_rule_infos[1].borrowing[0].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000004", uuid_str); + uuid_unparse(sf_out.matched_rule_infos[1].borrowing[1].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000005", uuid_str); + + //rule id 3, primary profile id 6, borrow profile id 7,8,9 + uuid_unparse(sf_out.matched_rule_infos[2].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000003", uuid_str); + uuid_unparse(sf_out.matched_rule_infos[2].primary.uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000006", uuid_str); EXPECT_EQ(sf_out.matched_rule_infos[2].borrowing_num, 3); - EXPECT_EQ(sf_out.matched_rule_infos[2].borrowing[0].id, 6); - EXPECT_EQ(sf_out.matched_rule_infos[2].borrowing[1].id, 7); - EXPECT_EQ(sf_out.matched_rule_infos[2].borrowing[2].id, 8); + uuid_unparse(sf_out.matched_rule_infos[2].borrowing[0].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000007", uuid_str); + uuid_unparse(sf_out.matched_rule_infos[2].borrowing[1].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000008", uuid_str); + uuid_unparse(sf_out.matched_rule_infos[2].borrowing[2].uuid, uuid_str); + EXPECT_STREQ("00000000-0000-0000-0000-000000000009", uuid_str); if (mpack_data) { free(mpack_data); |