.. | .. |
---|
3 | 3 | #include "util/expr.h" |
---|
4 | 4 | #include "tests.h" |
---|
5 | 5 | #include <stdlib.h> |
---|
| 6 | +#include <string.h> |
---|
| 7 | +#include <linux/zalloc.h> |
---|
6 | 8 | |
---|
7 | | -static int test(struct parse_ctx *ctx, const char *e, double val2) |
---|
| 9 | +static int test(struct expr_parse_ctx *ctx, const char *e, double val2) |
---|
8 | 10 | { |
---|
9 | 11 | double val; |
---|
10 | 12 | |
---|
11 | | - if (expr__parse(&val, ctx, &e)) |
---|
| 13 | + if (expr__parse(&val, ctx, e, 1)) |
---|
12 | 14 | TEST_ASSERT_VAL("parse test failed", 0); |
---|
13 | 15 | TEST_ASSERT_VAL("unexpected value", val == val2); |
---|
14 | 16 | return 0; |
---|
.. | .. |
---|
16 | 18 | |
---|
17 | 19 | int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) |
---|
18 | 20 | { |
---|
| 21 | + struct expr_id_data *val_ptr; |
---|
19 | 22 | const char *p; |
---|
20 | | - const char **other; |
---|
21 | 23 | double val; |
---|
22 | | - int i, ret; |
---|
23 | | - struct parse_ctx ctx; |
---|
24 | | - int num_other; |
---|
| 24 | + int ret; |
---|
| 25 | + struct expr_parse_ctx ctx; |
---|
25 | 26 | |
---|
26 | 27 | expr__ctx_init(&ctx); |
---|
27 | | - expr__add_id(&ctx, "FOO", 1); |
---|
28 | | - expr__add_id(&ctx, "BAR", 2); |
---|
| 28 | + expr__add_id_val(&ctx, strdup("FOO"), 1); |
---|
| 29 | + expr__add_id_val(&ctx, strdup("BAR"), 2); |
---|
29 | 30 | |
---|
30 | 31 | ret = test(&ctx, "1+1", 2); |
---|
31 | 32 | ret |= test(&ctx, "FOO+BAR", 3); |
---|
.. | .. |
---|
37 | 38 | ret |= test(&ctx, "min(1,2) + 1", 2); |
---|
38 | 39 | ret |= test(&ctx, "max(1,2) + 1", 3); |
---|
39 | 40 | ret |= test(&ctx, "1+1 if 3*4 else 0", 2); |
---|
| 41 | + ret |= test(&ctx, "1.1 + 2.1", 3.2); |
---|
| 42 | + ret |= test(&ctx, ".1 + 2.", 2.1); |
---|
| 43 | + ret |= test(&ctx, "d_ratio(1, 2)", 0.5); |
---|
| 44 | + ret |= test(&ctx, "d_ratio(2.5, 0)", 0); |
---|
| 45 | + ret |= test(&ctx, "1.1 < 2.2", 1); |
---|
| 46 | + ret |= test(&ctx, "2.2 > 1.1", 1); |
---|
| 47 | + ret |= test(&ctx, "1.1 < 1.1", 0); |
---|
| 48 | + ret |= test(&ctx, "2.2 > 2.2", 0); |
---|
| 49 | + ret |= test(&ctx, "2.2 < 1.1", 0); |
---|
| 50 | + ret |= test(&ctx, "1.1 > 2.2", 0); |
---|
40 | 51 | |
---|
41 | 52 | if (ret) |
---|
42 | 53 | return ret; |
---|
43 | 54 | |
---|
44 | 55 | p = "FOO/0"; |
---|
45 | | - ret = expr__parse(&val, &ctx, &p); |
---|
46 | | - TEST_ASSERT_VAL("division by zero", ret == 1); |
---|
| 56 | + ret = expr__parse(&val, &ctx, p, 1); |
---|
| 57 | + TEST_ASSERT_VAL("division by zero", ret == -1); |
---|
47 | 58 | |
---|
48 | 59 | p = "BAR/"; |
---|
49 | | - ret = expr__parse(&val, &ctx, &p); |
---|
50 | | - TEST_ASSERT_VAL("missing operand", ret == 1); |
---|
| 60 | + ret = expr__parse(&val, &ctx, p, 1); |
---|
| 61 | + TEST_ASSERT_VAL("missing operand", ret == -1); |
---|
51 | 62 | |
---|
| 63 | + expr__ctx_clear(&ctx); |
---|
52 | 64 | TEST_ASSERT_VAL("find other", |
---|
53 | | - expr__find_other("FOO + BAR + BAZ + BOZO", "FOO", &other, &num_other) == 0); |
---|
54 | | - TEST_ASSERT_VAL("find other", num_other == 3); |
---|
55 | | - TEST_ASSERT_VAL("find other", !strcmp(other[0], "BAR")); |
---|
56 | | - TEST_ASSERT_VAL("find other", !strcmp(other[1], "BAZ")); |
---|
57 | | - TEST_ASSERT_VAL("find other", !strcmp(other[2], "BOZO")); |
---|
58 | | - TEST_ASSERT_VAL("find other", other[3] == NULL); |
---|
| 65 | + expr__find_other("FOO + BAR + BAZ + BOZO", "FOO", |
---|
| 66 | + &ctx, 1) == 0); |
---|
| 67 | + TEST_ASSERT_VAL("find other", hashmap__size(&ctx.ids) == 3); |
---|
| 68 | + TEST_ASSERT_VAL("find other", hashmap__find(&ctx.ids, "BAR", |
---|
| 69 | + (void **)&val_ptr)); |
---|
| 70 | + TEST_ASSERT_VAL("find other", hashmap__find(&ctx.ids, "BAZ", |
---|
| 71 | + (void **)&val_ptr)); |
---|
| 72 | + TEST_ASSERT_VAL("find other", hashmap__find(&ctx.ids, "BOZO", |
---|
| 73 | + (void **)&val_ptr)); |
---|
59 | 74 | |
---|
60 | | - for (i = 0; i < num_other; i++) |
---|
61 | | - free((void *)other[i]); |
---|
62 | | - free((void *)other); |
---|
| 75 | + expr__ctx_clear(&ctx); |
---|
| 76 | + TEST_ASSERT_VAL("find other", |
---|
| 77 | + expr__find_other("EVENT1\\,param\\=?@ + EVENT2\\,param\\=?@", |
---|
| 78 | + NULL, &ctx, 3) == 0); |
---|
| 79 | + TEST_ASSERT_VAL("find other", hashmap__size(&ctx.ids) == 2); |
---|
| 80 | + TEST_ASSERT_VAL("find other", hashmap__find(&ctx.ids, "EVENT1,param=3/", |
---|
| 81 | + (void **)&val_ptr)); |
---|
| 82 | + TEST_ASSERT_VAL("find other", hashmap__find(&ctx.ids, "EVENT2,param=3/", |
---|
| 83 | + (void **)&val_ptr)); |
---|
| 84 | + |
---|
| 85 | + expr__ctx_clear(&ctx); |
---|
63 | 86 | |
---|
64 | 87 | return 0; |
---|
65 | 88 | } |
---|