commit d5f2b5ff05f27a9f4fb5c2d9b8f9c36500c946f4
author Radek Krejci <rkrejci@cesnet.cz> Thu Oct 11 10:54:36 2018 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Thu Oct 11 10:54:36 2018 +0200
tree b30ac5e0fd303b36b74e14aa5aa5659d89c3efa6
parent d70d107a488c91fe783e74257f2cd25eb19e85ab

YANG parser CHANGE quoted string indentation counter rewritten

Previous version did not handle strings not starting on a new/separate line

tests/src/test_parser_yang.c

diff --git a/tests/src/test_parser_yang.c b/tests/src/test_parser_yang.c
index ea69343..85b1a32 100644
--- a/tests/src/test_parser_yang.c
+++ b/tests/src/test_parser_yang.c
@@ -31,6 +31,7 @@
 /* set to 0 to printing error messages to stderr instead of checking them in code */
 #define ENABLE_LOGGER_CHECKING 1
 
+#if ENABLE_LOGGER_CHECKING
 static void
 logger(LY_LOG_LEVEL level, const char *msg, const char *path)
 {
@@ -42,6 +43,7 @@
         strncpy(logbuf, msg, BUFSIZE - 1);
     }
 }
+#endif
 
 static int
 logger_setup(void **state)
@@ -187,20 +189,61 @@
     assert_int_equal(LY_SUCCESS, get_string(&ctx, &str, Y_MAYBE_STR_ARG, &word, &buf, &len));
     assert_null(word);
 
+    str = "{";
     assert_int_equal(LY_EVALID, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
-    logbuf_assert("Invalid character sequence \";\", expected an argument. Line number 1.");
+    logbuf_assert("Invalid character sequence \"{\", expected an argument. Line number 1.");
+
+    str = "\"\\s\""; /* invalid escape sequence */
+    assert_int_equal(LY_EVALID, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
+    logbuf_assert("Double-quoted string unknown special character \'\\s\'. Line number 1.");
+    str = "\'\\s\'"; /* valid, since it is not an escape sequence in single quoted string */
+    assert_int_equal(LY_SUCCESS, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
+    assert_int_equal(2, len);
+    assert_string_equal("\\s\'", word);
+    assert_int_equal('\0', str[0]); /* input has been eaten */
+
+    assert_null(buf);
 
     /* different quoting */
     str = "hello";
     assert_int_equal(LY_SUCCESS, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
     assert_null(buf);
+    assert_int_equal(5, len);
     assert_string_equal("hello", word);
 
-    str = "\"hello\"";
+    str = "hello/*comment*/";
     assert_int_equal(LY_SUCCESS, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
     assert_null(buf);
     assert_int_equal(5, len);
-    assert_false(strncmp("hello", word, 5));
+    assert_false(strncmp("hello", word, len));
+
+
+    str = "\"hello\\n\\t\\\"\\\\\"";
+    assert_int_equal(LY_SUCCESS, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
+    assert_null(buf);
+    assert_int_equal(9, len);
+    assert_string_equal("hello\\n\\t\\\"\\\\\"", word);
+
+    ctx.indent = 14;
+    str = "\"hello \t\n\t\t world!\"";
+    /* - space and tabs before newline are stripped out
+     * - space and tabs after newline (indentation) are stripped out
+     */
+    assert_int_equal(LY_SUCCESS, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
+    assert_non_null(buf);
+    assert_ptr_equal(word, buf);
+    assert_int_equal(14, len);
+    assert_string_equal("hello\n  world!", word);
+    free(buf);
+
+    ctx.indent = 14;
+    str = "\"hello\n \tworld!\"";
+    assert_int_equal(LY_SUCCESS, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
+    assert_non_null(buf);
+    assert_ptr_equal(word, buf);
+    assert_int_equal(12, len);
+    assert_string_equal("hello\nworld!", word);
+    free(buf);
 
     str = "\'hello\'";
     assert_int_equal(LY_SUCCESS, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
@@ -232,7 +275,7 @@
     /* missing argument */
     str = ";";
     assert_int_equal(LY_EVALID, get_string(&ctx, &str, Y_STR_ARG, &word, &buf, &len));
-    logbuf_assert("Invalid character sequence \";\", expected an argument. Line number 3.");
+    logbuf_assert("Invalid character sequence \";\", expected an argument. Line number 5.");
 
 }
 

tests/src/test_xml.c

diff --git a/tests/src/test_xml.c b/tests/src/test_xml.c
index 02cd8b9..cbabebb 100644
--- a/tests/src/test_xml.c
+++ b/tests/src/test_xml.c
@@ -317,9 +317,6 @@
     assert_string_equal("<", str);
     assert_int_equal(LYXML_ELEMENT, ctx.status);
 
-    free(buf);
-    buf = NULL;
-
     /* test using n-bytes UTF8 hexadecimal code points */
     ctx.status = LYXML_ATTR_CONTENT;
     str = "\'&#x0024;&#x00A2;&#x20ac;&#x10348;\'";
@@ -327,7 +324,7 @@
     assert_int_not_equal(0, dynamic);
     assert_non_null(buf);
     assert_ptr_equal(out, buf);
-    assert_int_equal(11, buf_len);
+    assert_int_equal(22, buf_len);
     assert_int_equal(10, len);
     assert_string_equal("$¢€𐍈", buf);
     assert_int_equal(LYXML_ATTRIBUTE, ctx.status);