Skip to content

tests: runtime: Use more concrete matchers for assertions #12014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cosmo0920 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tests: runtime: Use more concrete matchers for assertions #12014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 60 additions & 2 deletions tests/runtime/out_tcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,31 @@ static void clear_output_num()
struct str_list {
size_t size;
char **lists;
int *matches;
int require_json_array;
char *joined;
};

static int validate_json_array_payload(flb_sds_t out_line, struct str_list *l)
{
size_t len;

len = flb_sds_len(out_line);
if (!TEST_CHECK(len >= 2 && out_line[0] == '[' && out_line[len - 1] == ']')) {
TEST_MSG("expected JSON array payload, got: %s", out_line);
return -1;
}

if (l->joined != NULL && strstr(out_line, l->lists[0]) != NULL &&
strstr(out_line, l->lists[1]) != NULL &&
!TEST_CHECK(strstr(out_line, l->joined) != NULL)) {
TEST_MSG("expected JSON array separator, got: %s", out_line);
return -1;
}

return 0;
}

/* Callback to check expected results */
static void cb_check_str_list(void *ctx, int ffd, int res_ret,
void *res_data, size_t res_size, void *data)
Expand All @@ -100,8 +123,19 @@ static void cb_check_str_list(void *ctx, int ffd, int res_ret,
return;
}

if (l->require_json_array) {
validate_json_array_payload(out_line, l);
}

for (i=0; i<l->size; i++) {
p = strstr(out_line, l->lists[i]);
if (l->matches != NULL) {
if (p != NULL) {
l->matches[i]++;
}
continue;
}

if (!TEST_CHECK(p != NULL)) {
TEST_MSG(" Got :%s\n expect:%s", out_line, l->lists[i]);
}
Expand All @@ -111,6 +145,21 @@ static void cb_check_str_list(void *ctx, int ffd, int res_ret,
flb_sds_destroy(out_line);
}

static int check_str_list_matches(struct str_list *l)
{
int ret = 0;
size_t i;

for (i=0; i<l->size; i++) {
if (!TEST_CHECK(l->matches[i] > 0)) {
TEST_MSG("missing expected output: %s", l->lists[i]);
ret = -1;
}
}

return ret;
}

static int msgpack_strncmp(char* str, size_t str_len, msgpack_object obj)
{
int ret = -1;
Expand Down Expand Up @@ -138,7 +187,7 @@ static int msgpack_strncmp(char* str, size_t str_len, msgpack_object obj)
case MSGPACK_OBJECT_NEGATIVE_INTEGER:
{
long long val = strtoll(str, NULL, 10);
if (val == (unsigned long)obj.via.i64) {
if (val == obj.via.i64) {
ret = 0;
}
}
Expand Down Expand Up @@ -447,10 +496,18 @@ void flb_test_format_json()
char *buf2 = "[2, {\"msg\":\"hello world\"}]";
size_t size2 = strlen(buf2);

char *expected_strs[] = {"[{\"date\":1.0,\"msg\":\"hello world\"},{\"date\":2.0,\"msg\":\"hello world\"}]"};
int matches[] = {0, 0};
char *expected_strs[] = {
"{\"date\":1.0,\"msg\":\"hello world\"}",
"{\"date\":2.0,\"msg\":\"hello world\"}"
};
Comment thread
cosmo0920 marked this conversation as resolved.
char *joined = "{\"date\":1.0,\"msg\":\"hello world\"},{\"date\":2.0,\"msg\":\"hello world\"}";
struct str_list expected = {
.size = sizeof(expected_strs)/sizeof(char*),
.lists = &expected_strs[0],
.matches = &matches[0],
.require_json_array = FLB_TRUE,
.joined = joined,
};

clear_output_num();
Expand Down Expand Up @@ -489,6 +546,7 @@ void flb_test_format_json()
if (!TEST_CHECK(num > 0)) {
TEST_MSG("no outputs");
}
check_str_list_matches(&expected);

test_ctx_destroy(ctx);
}
Expand Down
Loading