keyexpr test fix

eclipse-zenoh · Dec 1, 2023 · 96fda4b · 96fda4b
1 parent 968d570
commit 96fda4b
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/tests/universal/keyexpr.cxx b/tests/universal/keyexpr.cxx
@@ -381,6 +381,13 @@ void includes_declared(Session& s) {
     assert(foobarv.check());
     assert(starbuzv.check());
 
+    assert(keyexpr_includes("FOO/*", "FOO/BAR", err));
+    assert(err == 0);
+    assert(!keyexpr_includes("*/BUZ", "FOO/BAR", err));
+    assert(err == 0);
+    assert(!keyexpr_includes("FOO/*", nul, err));
+    assert(err < 0);
+
 #ifdef ZENOHCXX_ZENOHC
     // zenoh-c is able to check declared keyexprs
     assert(foostar.includes(foobar, err));
@@ -389,12 +396,6 @@ void includes_declared(Session& s) {
     assert(err == 0);
     assert(!foostar.includes(nul, err));
     assert(err < 0);
-    assert(keyexpr_includes("FOO/*", "FOO/BAR", err));
-    assert(err == 0);
-    assert(!keyexpr_includes("*/BUZ", "FOO/BAR", err));
-    assert(err == 0);
-    assert(!keyexpr_includes("FOO/*", nul, err));
-    assert(err < 0);
 #else
     // zenoh-pico returns error when checking declared keyexprs: the string value is avaliable in session only
     assert(!foostar.includes(foobar, err));
@@ -403,12 +404,6 @@ void includes_declared(Session& s) {
     assert(err < 0);
     assert(!foostar.includes(nul, err));
     assert(err < 0);
-    assert(!keyexpr_includes("FOO/*", "FOO/BAR", err));
-    assert(err < 0);
-    assert(!keyexpr_includes("*/BUZ", "FOO/BAR", err));
-    assert(err < 0);
-    assert(!keyexpr_includes("FOO/*", nul, err));
-    assert(err < 0);
 #endif
 
     // both zenoh-c and zenoh-pico are able to check declared keyexprs through the session