commit 004d3153520d09e29c4773f74e7a41ecf55f6c42
author Michal Vasko <mvasko@cesnet.cz> Thu Jun 11 19:59:22 2020 +0200
committer GitHub <noreply@github.com> Thu Jun 11 19:59:22 2020 +0200
tree 5b6b3661305191bf6727ad5c3b21aadd6e8abefa
parent 875f52347734e7fcde9e0e466c6f63bfb6362d4d

path FEATURE new compiled path structure (#1108)

Refactoring includes using it for
instance-identifier and for checking leafref,
it is evaluated using stanrad XPath. Predicates
used for lyd_new_list2(), tests included.

tests/utests/schema/test_parser_yin.c

diff --git a/tests/utests/schema/test_parser_yin.c b/tests/utests/schema/test_parser_yin.c
index ea22333..809bfd6 100644
--- a/tests/utests/schema/test_parser_yin.c
+++ b/tests/utests/schema/test_parser_yin.c
@@ -26,6 +26,7 @@
 #include "../../../src/tree_schema_internal.h"
 #include "../../../src/parser_yin.h"
 #include "../../../src/xml.h"
+#include "../../../src/xpath.h"
 
 /* prototypes of static functions */
 void lysp_ext_instance_free(struct ly_ctx *ctx, struct lysp_ext_instance *ext);
@@ -1656,25 +1657,6 @@
 }
 
 static void
-test_path_elem(void **state)
-{
-    struct test_parser_yin_state *st = *state;
-    const char *data;
-    struct lysp_type type = {};
-
-    data = ELEMENT_WRAPPER_START "<path value=\"p&amp;th-val\">" EXT_SUBELEM "</path>" ELEMENT_WRAPPER_END;
-    assert_int_equal(test_element_helper(st, data, &type, NULL, NULL), LY_SUCCESS);
-    assert_string_equal("p&th-val", type.path);
-    assert_true(type.flags & LYS_SET_PATH);
-    assert_string_equal(type.exts[0].name, "urn:example:extensions:c-define");
-    assert_int_equal(type.exts[0].insubstmt_index, 0);
-    assert_int_equal(type.exts[0].insubstmt, LYEXT_SUBSTMT_PATH);
-    lysp_type_free(st->ctx, &type);
-
-    st->finished_correctly = true;
-}
-
-static void
 test_pattern_elem(void **state)
 {
     struct test_parser_yin_state *st = *state;
@@ -2071,7 +2053,7 @@
     assert_string_equal(type.enums->name,  "enum");
     assert_int_equal(type.fraction_digits, 2);
     assert_string_equal(type.length->arg, "length");
-    assert_string_equal(type.path, "path");
+    assert_string_equal(type.path->expr, "path");
     assert_string_equal(type.patterns->arg, "\006pattern");
     assert_string_equal(type.range->arg, "range");
     assert_int_equal(type.require_instance, 1);
@@ -4337,7 +4319,6 @@
         cmocka_unit_test_setup_teardown(test_length_elem, setup_element_test, teardown_element_test),
         cmocka_unit_test_setup_teardown(test_modifier_elem, setup_element_test, teardown_element_test),
         cmocka_unit_test_setup_teardown(test_namespace_elem, setup_element_test, teardown_element_test),
-        cmocka_unit_test_setup_teardown(test_path_elem, setup_element_test, teardown_element_test),
         cmocka_unit_test_setup_teardown(test_pattern_elem, setup_element_test, teardown_element_test),
         cmocka_unit_test_setup_teardown(test_value_position_elem, setup_element_test, teardown_element_test),
         cmocka_unit_test_setup_teardown(test_prefix_elem, setup_element_test, teardown_element_test),