data parsers CHANGE try to keep as specific error messages as possible

Author: rkrejci

src/parser.c

@@ -1267,11 +1267,6 @@ lyp_parse_value(struct lys_type *type, const char **value_, struct lyxml_elem *x
 
         ident = resolve_identref(type, value, (struct lyd_node*)leaf);
         if (!ident) {
-            if (leaf) {
-                LOGVAL(LYE_INVAL, LY_VLOG_LYD, leaf, *value_, leaf->schema->name);
-            } else {
-                LOGVAL(LYE_SPEC, LY_VLOG_NONE, NULL, "Invalid identityref value \"%s\" (%s).", value, *value_);
-            }
             goto cleanup;
         } else if (leaf) {
             /* store the result */
@@ -1308,11 +1303,11 @@ lyp_parse_value(struct lys_type *type, const char **value_, struct lyxml_elem *x
                 goto cleanup;
             }
         }
-        if (resolvable && tree && !resolve_instid(tree, value) && type->info.inst.req) {
+        if (resolvable && tree && !resolve_instid(tree, value) && (ly_errno || type->info.inst.req)) {
             if (leaf) {
                 LOGVAL(LYE_INVAL, LY_VLOG_LYD, leaf, *value_, leaf->schema->name);
             } else {
-                LOGVAL(LYE_SPEC, LY_VLOG_NONE, NULL, "Invalid instance-identifier value \"%s\" (%s).", value, *value_);
+                LOGVAL(LYE_SPEC, leaf ? LY_VLOG_LYD : LY_VLOG_NONE, leaf, "Invalid instance-identifier value \"%s\" (%s).", value, *value_);
             }
             goto cleanup;
         } else if (!resolvable && leaf) {

tests/data/test_values.c

@@ -144,6 +144,30 @@ test_xmltojson_identityref(void **state)
     assert_string_equal(st->data, result);
 }
 
+static void
+test_xmltojson_identityref2(void **state)
+{
+    struct state *st = (*state);
+    const char *yang = "module y {"
+                    "  namespace urn:y;"
+                    "  prefix y;"
+                    "  identity vehicle;"
+                    "  identity car { base vehicle; }"
+                    "  leaf y { type identityref { base y:vehicle; } default y:car; }"
+                    "}";
+    const char *result = "<y xmlns=\"urn:y\" xmlns:y=\"urn:y\">y:car</y>";
+
+    assert_ptr_not_equal(lys_parse_mem(st->ctx, yang, LYS_IN_YANG), NULL);
+
+    st->dt = NULL;
+    lyd_validate(&st->dt, LYD_OPT_CONFIG, st->ctx);
+    assert_ptr_not_equal(st->dt, NULL);
+
+    lyd_print_mem(&st->data, st->dt, LYD_XML, LYP_WITHSIBLINGS | LYP_WD_ALL);
+    assert_ptr_not_equal(st->data, NULL);
+    assert_string_equal(st->data, result);
+}
+
 static void
 test_xmltojson_instanceid(void **state)
 {
@@ -270,6 +294,7 @@ int main(void)
     const struct CMUnitTest tests[] = {
                     cmocka_unit_test_setup_teardown(test_default_int, setup_f, teardown_f),
                     cmocka_unit_test_setup_teardown(test_xmltojson_identityref, setup_f, teardown_f),
+                    cmocka_unit_test_setup_teardown(test_xmltojson_identityref2, setup_f, teardown_f),
                     cmocka_unit_test_setup_teardown(test_xmltojson_instanceid, setup_f, teardown_f),
                     cmocka_unit_test_setup_teardown(test_canonical, setup_f, teardown_f),};
 

tests/schema/test_typedef.c

@@ -250,12 +250,12 @@ test_typedef_11_multidents_yang(void **state)
 
     root = lyd_parse_mem(st->ctx, data1, LYD_XML, LYD_OPT_CONFIG);
     assert_ptr_equal(root, NULL);
-    assert_string_equal(ly_errmsg(), "Invalid value \"des\" in \"l2\" element.");
+    assert_string_equal(ly_errmsg(), "Failed to resolve identityref \"des\".");
     assert_string_equal(ly_errpath(), "/x:l2");
 
     root = lyd_parse_mem(st->ctx, data2, LYD_XML, LYD_OPT_CONFIG);
     assert_ptr_equal(root, NULL);
-    assert_string_equal(ly_errmsg(), "Invalid value \"des3\" in \"l2\" element.");
+    assert_string_equal(ly_errmsg(), "Failed to resolve identityref \"des3\".");
     assert_string_equal(ly_errpath(), "/x:l2");
 
     root = lyd_parse_mem(st->ctx, data3, LYD_XML, LYD_OPT_CONFIG);
@@ -290,12 +290,12 @@ test_typedef_11_multidents_yin(void **state)
 
     root = lyd_parse_mem(st->ctx, data1, LYD_XML, LYD_OPT_CONFIG);
     assert_ptr_equal(root, NULL);
-    assert_string_equal(ly_errmsg(), "Invalid value \"des\" in \"l2\" element.");
+    assert_string_equal(ly_errmsg(), "Failed to resolve identityref \"des\".");
     assert_string_equal(ly_errpath(), "/x:l2");
 
     root = lyd_parse_mem(st->ctx, data2, LYD_XML, LYD_OPT_CONFIG);
     assert_ptr_equal(root, NULL);
-    assert_string_equal(ly_errmsg(), "Invalid value \"des3\" in \"l2\" element.");
+    assert_string_equal(ly_errmsg(), "Failed to resolve identityref \"des3\".");
     assert_string_equal(ly_errpath(), "/x:l2");
 
     root = lyd_parse_mem(st->ctx, data3, LYD_XML, LYD_OPT_CONFIG);