Skip to content

Commit 96fda4b

Browse files
committed
keyexpr test fix
1 parent 968d570 commit 96fda4b

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

tests/universal/keyexpr.cxx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,13 @@ void includes_declared(Session& s) {
381381
assert(foobarv.check());
382382
assert(starbuzv.check());
383383

384+
assert(keyexpr_includes("FOO/*", "FOO/BAR", err));
385+
assert(err == 0);
386+
assert(!keyexpr_includes("*/BUZ", "FOO/BAR", err));
387+
assert(err == 0);
388+
assert(!keyexpr_includes("FOO/*", nul, err));
389+
assert(err < 0);
390+
384391
#ifdef ZENOHCXX_ZENOHC
385392
// zenoh-c is able to check declared keyexprs
386393
assert(foostar.includes(foobar, err));
@@ -389,12 +396,6 @@ void includes_declared(Session& s) {
389396
assert(err == 0);
390397
assert(!foostar.includes(nul, err));
391398
assert(err < 0);
392-
assert(keyexpr_includes("FOO/*", "FOO/BAR", err));
393-
assert(err == 0);
394-
assert(!keyexpr_includes("*/BUZ", "FOO/BAR", err));
395-
assert(err == 0);
396-
assert(!keyexpr_includes("FOO/*", nul, err));
397-
assert(err < 0);
398399
#else
399400
// zenoh-pico returns error when checking declared keyexprs: the string value is avaliable in session only
400401
assert(!foostar.includes(foobar, err));
@@ -403,12 +404,6 @@ void includes_declared(Session& s) {
403404
assert(err < 0);
404405
assert(!foostar.includes(nul, err));
405406
assert(err < 0);
406-
assert(!keyexpr_includes("FOO/*", "FOO/BAR", err));
407-
assert(err < 0);
408-
assert(!keyexpr_includes("*/BUZ", "FOO/BAR", err));
409-
assert(err < 0);
410-
assert(!keyexpr_includes("FOO/*", nul, err));
411-
assert(err < 0);
412407
#endif
413408

414409
// both zenoh-c and zenoh-pico are able to check declared keyexprs through the session

0 commit comments

Comments
 (0)