X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fjson.at;h=af53d76f47add413c12fe9b7e19614f63d1f94aa;hb=10df718e73122df2f3b04ed585e50e4b299a8cbd;hp=371bf2d2512ef6b8a02395d92c39c0745f38bb91;hpb=a105c27b4e24ac0d29ba131eca00793bc3385dca;p=openvswitch diff --git a/tests/json.at b/tests/json.at index 371bf2d2..af53d76f 100644 --- a/tests/json.at +++ b/tests/json.at @@ -3,7 +3,7 @@ m4_define([JSON_CHECK_POSITIVE], AT_KEYWORDS([json positive]) AT_CHECK([printf %s "AS_ESCAPE([$2])" > input]) AT_CAPTURE_FILE([input]) - OVS_CHECK_LCOV([test-json $4 input], [0], [stdout], []) + AT_CHECK([test-json $4 input], [0], [stdout], []) AT_CHECK([cat stdout], [0], [$3 ]) AT_CLEANUP]) @@ -13,7 +13,7 @@ m4_define([JSON_CHECK_NEGATIVE], AT_KEYWORDS([json negative]) AT_CHECK([printf %s "AS_ESCAPE([$2])" > input]) AT_CAPTURE_FILE([input]) - OVS_CHECK_LCOV([test-json $4 input], [1], [stdout], []) + AT_CHECK([test-json $4 input], [1], [stdout], []) AT_CHECK([[sed 's/^error: [^:]*:/error:/' < stdout]], [0], [$3 ]) AT_CLEANUP]) @@ -60,8 +60,11 @@ JSON_CHECK_NEGATIVE([formfeed in quoted string], JSON_CHECK_NEGATIVE([bad escape in quoted string], [[["\x12"]]], [error: bad escape \x]) -JSON_CHECK_NEGATIVE([\u must be followed by 4 hex digits], +JSON_CHECK_NEGATIVE([\u must be followed by 4 hex digits (1)], [[["\u1x"]]], + [error: quoted string ends within \u escape]) +JSON_CHECK_NEGATIVE([\u must be followed by 4 hex digits (2)], + [[["\u1xyz"]]], [error: malformed \u escape]) JSON_CHECK_NEGATIVE([isolated leading surrogate not allowed], [[["\ud834xxx"]]], @@ -75,7 +78,7 @@ JSON_CHECK_NEGATIVE([null bytes not allowed], AT_SETUP([end of input in quoted string]) AT_KEYWORDS([json negative]) -AT_CHECK([printf '\"xxx' | test-json -], [1], +AT_CHECK([printf '"xxx' | test-json -], [1], [error: line 0, column 4, byte 4: unexpected end of input in quoted string ]) AT_CLEANUP