Adding upstream version 3.4.2+dfsg.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
cfcebb1a7d
commit
338ffded6d
75 changed files with 1082 additions and 878 deletions
|
@ -193,6 +193,18 @@ test_anyxml(void **state)
|
|||
free(str);
|
||||
CHECK_LYD_STRING(tree, LYD_PRINT_WITHSIBLINGS, data_expected);
|
||||
lyd_free_all(tree);
|
||||
|
||||
data = "<anyx xmlns=\"urn:tests:a\"><x>1</x><x>0</x><x>-1</x><x>4294967295</x><x>4294967296</x><x>-2147483648</x><x>-2147483649</x></anyx>";
|
||||
CHECK_PARSE_LYD(data, 0, LYD_VALIDATE_PRESENT, tree);
|
||||
assert_non_null(tree);
|
||||
tree = tree->next;
|
||||
assert_int_equal(LY_SUCCESS, lyd_print_mem(&str, tree, LYD_XML, LYD_PRINT_SHRINK));
|
||||
CHECK_STRING(str, data);
|
||||
free(str);
|
||||
assert_int_equal(LY_SUCCESS, lyd_print_mem(&str, tree, LYD_JSON, LYD_PRINT_SHRINK));
|
||||
CHECK_STRING(str, "{\"a:anyx\":{\"x\":[1,0,-1,4294967295,\"4294967296\",-2147483648,\"-2147483649\"]}}");
|
||||
free(str);
|
||||
lyd_free_all(tree);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -349,7 +361,7 @@ test_opaq(void **state)
|
|||
" <c xmld:id=\"D\">1</c>\n"
|
||||
"</a>\n",
|
||||
LYD_XML, LYD_PARSE_OPAQ, LYD_VALIDATE_PRESENT, &tree));
|
||||
CHECK_LOG_CTX("Unknown XML prefix \"xmld\".", "/a", 3);
|
||||
CHECK_LOG_CTX("Unknown XML prefix \"xmld\" at attribute \"id\".", "/a", 3);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -409,7 +409,7 @@ test_target(void **state)
|
|||
assert_string_equal(lyd_get_value(term->prev), "b");
|
||||
|
||||
lyd_free_all(tree);
|
||||
ly_path_free(UTEST_LYCTX, path);
|
||||
ly_path_free(path);
|
||||
lyxp_expr_free(UTEST_LYCTX, exp);
|
||||
}
|
||||
|
||||
|
|
|
@ -130,6 +130,57 @@ test_insert_cont_leaflist(void **state)
|
|||
lyd_free_all(cont);
|
||||
}
|
||||
|
||||
static void
|
||||
test_dup_sort(void **state)
|
||||
{
|
||||
const char *schema;
|
||||
struct lys_module *mod;
|
||||
struct lyd_node *cont, *cont2;
|
||||
char *str;
|
||||
|
||||
schema = "module a {namespace urn:tests:a;prefix a;yang-version 1.1;revision 2014-05-08;"
|
||||
"container cn { list lst {key \"k\"; leaf k {type uint32;}}}}";
|
||||
UTEST_ADD_MODULE(schema, LYS_IN_YANG, NULL, &mod);
|
||||
|
||||
assert_int_equal(lyd_new_inner(NULL, mod, "cn", 0, &cont), LY_SUCCESS);
|
||||
assert_int_equal(lyd_new_list(cont, NULL, "lst", 0, NULL, "2"), LY_SUCCESS);
|
||||
assert_int_equal(lyd_new_list(cont, NULL, "lst", 0, NULL, "5"), LY_SUCCESS);
|
||||
assert_int_equal(lyd_new_list(cont, NULL, "lst", 0, NULL, "9"), LY_SUCCESS);
|
||||
|
||||
assert_int_equal(lyd_new_inner(NULL, mod, "cn", 0, &cont2), LY_SUCCESS);
|
||||
assert_int_equal(lyd_new_list(cont2, NULL, "lst", 0, NULL, "1"), LY_SUCCESS);
|
||||
assert_int_equal(lyd_new_list(cont2, NULL, "lst", 0, NULL, "3"), LY_SUCCESS);
|
||||
assert_int_equal(lyd_new_list(cont2, NULL, "lst", 0, NULL, "8"), LY_SUCCESS);
|
||||
|
||||
assert_int_equal(lyd_dup_siblings(lyd_child(cont2), (struct lyd_node_inner *)cont, 0, NULL), LY_SUCCESS);
|
||||
lyd_print_mem(&str, cont, LYD_XML, 0);
|
||||
assert_string_equal(str,
|
||||
"<cn xmlns=\"urn:tests:a\">\n"
|
||||
" <lst>\n"
|
||||
" <k>1</k>\n"
|
||||
" </lst>\n"
|
||||
" <lst>\n"
|
||||
" <k>2</k>\n"
|
||||
" </lst>\n"
|
||||
" <lst>\n"
|
||||
" <k>3</k>\n"
|
||||
" </lst>\n"
|
||||
" <lst>\n"
|
||||
" <k>5</k>\n"
|
||||
" </lst>\n"
|
||||
" <lst>\n"
|
||||
" <k>8</k>\n"
|
||||
" </lst>\n"
|
||||
" <lst>\n"
|
||||
" <k>9</k>\n"
|
||||
" </lst>\n"
|
||||
"</cn>\n");
|
||||
free(str);
|
||||
|
||||
lyd_free_all(cont);
|
||||
lyd_free_all(cont2);
|
||||
}
|
||||
|
||||
static void
|
||||
test_try_user_order_func(void **state)
|
||||
{
|
||||
|
@ -1599,6 +1650,7 @@ main(void)
|
|||
UTEST(test_insert_top_level_leaflist),
|
||||
UTEST(test_insert_cont_list),
|
||||
UTEST(test_insert_cont_leaflist),
|
||||
UTEST(test_dup_sort),
|
||||
UTEST(test_try_user_order_func),
|
||||
UTEST(test_ordered_by_user),
|
||||
UTEST(test_remove),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue