ofproto: Bundle all controller-related settings into a struct.

[openvswitch] / tests / json.at

diff --git a/tests/json.at b/tests/json.at
index 371bf2d2512ef6b8a02395d92c39c0745f38bb91..0449e0361dabffae0e13ce20f7ebf9be5b9b0c47 100644 (file)
--- 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"]]],