From f0da3a4283b7d1192de5c7e620df9381cd5a724b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 12 Jan 2020 22:40:18 +0100 Subject: blobmsg_json: fix int16 serialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit int16 blobmsg type is currently being serialized as uint16_t due to missing cast during JSON output. Following blobmsg content: bar-min: -32768 (i16) bar-max: 32767 (i16) Produces following JSON: { "bar-min":32768,"bar-max":32767 } Whereas one would expect: { "bar-min":-32768,"bar-max":32767 } Reviewed-by: Jo-Philipp Wich Signed-off-by: Petr Štetiar --- tests/cram/test_blobmsg.t | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/cram/test_blobmsg.t b/tests/cram/test_blobmsg.t index 9ab2acf..84ec143 100644 --- a/tests/cram/test_blobmsg.t +++ b/tests/cram/test_blobmsg.t @@ -33,7 +33,7 @@ check that blobmsg is producing expected results: \tworld : 2 (str) (esc) } - [*] blobmsg to json: {"message":"Hello, world!","testdata":{"double":133.700000,"foo":false,"poo":true,"moo-min":true,"moo-max":true,"bar-min":32768,"bar-max":32767,"baz-min":-2147483648,"baz-max":2147483647,"taz-min":-9223372036854775808,"taz-max":9223372036854775807,"world":"2"},"list":[false,true,true,true,32768,32767,-2147483648,2147483647,-9223372036854775808,9223372036854775807,133.700000]} + [*] blobmsg to json: {"message":"Hello, world!","testdata":{"double":133.700000,"foo":false,"poo":true,"moo-min":true,"moo-max":true,"bar-min":-32768,"bar-max":32767,"baz-min":-2147483648,"baz-max":2147483647,"taz-min":-9223372036854775808,"taz-max":9223372036854775807,"world":"2"},"list":[false,true,true,true,-32768,32767,-2147483648,2147483647,-9223372036854775808,9223372036854775807,133.700000]} [*] blobmsg from json: Message: Hello, world! @@ -42,7 +42,7 @@ check that blobmsg is producing expected results: 1 (i8) 1 (i8) 1 (i8) - 32768 (i32) + -32768 (i32) 32767 (i32) -2147483648 (i32) 2147483647 (i32) @@ -56,7 +56,7 @@ check that blobmsg is producing expected results: \tpoo : 1 (i8) (esc) \tmoo-min : 1 (i8) (esc) \tmoo-max : 1 (i8) (esc) - \tbar-min : 32768 (i32) (esc) + \tbar-min : -32768 (i32) (esc) \tbar-max : 32767 (i32) (esc) \tbaz-min : -2147483648 (i32) (esc) \tbaz-max : 2147483647 (i32) (esc) @@ -96,7 +96,7 @@ check that blobmsg is producing expected results: \tworld : 2 (str) (esc) } - [*] blobmsg to json: {"message":"Hello, world!","testdata":{"double":133.700000,"foo":false,"poo":true,"moo-min":true,"moo-max":true,"bar-min":32768,"bar-max":32767,"baz-min":-2147483648,"baz-max":2147483647,"taz-min":-9223372036854775808,"taz-max":9223372036854775807,"world":"2"},"list":[false,true,true,true,32768,32767,-2147483648,2147483647,-9223372036854775808,9223372036854775807,133.700000]} + [*] blobmsg to json: {"message":"Hello, world!","testdata":{"double":133.700000,"foo":false,"poo":true,"moo-min":true,"moo-max":true,"bar-min":-32768,"bar-max":32767,"baz-min":-2147483648,"baz-max":2147483647,"taz-min":-9223372036854775808,"taz-max":9223372036854775807,"world":"2"},"list":[false,true,true,true,-32768,32767,-2147483648,2147483647,-9223372036854775808,9223372036854775807,133.700000]} [*] blobmsg from json: Message: Hello, world! @@ -105,7 +105,7 @@ check that blobmsg is producing expected results: 1 (i8) 1 (i8) 1 (i8) - 32768 (i32) + -32768 (i32) 32767 (i32) -2147483648 (i32) 2147483647 (i32) @@ -119,7 +119,7 @@ check that blobmsg is producing expected results: \tpoo : 1 (i8) (esc) \tmoo-min : 1 (i8) (esc) \tmoo-max : 1 (i8) (esc) - \tbar-min : 32768 (i32) (esc) + \tbar-min : -32768 (i32) (esc) \tbar-max : 32767 (i32) (esc) \tbaz-min : -2147483648 (i32) (esc) \tbaz-max : 2147483647 (i32) (esc) @@ -159,7 +159,7 @@ check that blobmsg is producing expected results: \tworld : 2 (str) (esc) } - [*] blobmsg to json: {"message":"Hello, world!","testdata":{"double":133.700000,"foo":false,"poo":true,"moo-min":true,"moo-max":true,"bar-min":32768,"bar-max":32767,"baz-min":-2147483648,"baz-max":2147483647,"taz-min":-9223372036854775808,"taz-max":9223372036854775807,"world":"2"},"list":[false,true,true,true,32768,32767,-2147483648,2147483647,-9223372036854775808,9223372036854775807,133.700000]} + [*] blobmsg to json: {"message":"Hello, world!","testdata":{"double":133.700000,"foo":false,"poo":true,"moo-min":true,"moo-max":true,"bar-min":-32768,"bar-max":32767,"baz-min":-2147483648,"baz-max":2147483647,"taz-min":-9223372036854775808,"taz-max":9223372036854775807,"world":"2"},"list":[false,true,true,true,-32768,32767,-2147483648,2147483647,-9223372036854775808,9223372036854775807,133.700000]} [*] blobmsg from json: Message: Hello, world! @@ -168,7 +168,7 @@ check that blobmsg is producing expected results: 1 (i8) 1 (i8) 1 (i8) - 32768 (i32) + -32768 (i32) 32767 (i32) -2147483648 (i32) 2147483647 (i32) @@ -182,7 +182,7 @@ check that blobmsg is producing expected results: \tpoo : 1 (i8) (esc) \tmoo-min : 1 (i8) (esc) \tmoo-max : 1 (i8) (esc) - \tbar-min : 32768 (i32) (esc) + \tbar-min : -32768 (i32) (esc) \tbar-max : 32767 (i32) (esc) \tbaz-min : -2147483648 (i32) (esc) \tbaz-max : 2147483647 (i32) (esc) @@ -222,7 +222,7 @@ check that blobmsg is producing expected results: \tworld : 2 (str) (esc) } - [*] blobmsg to json: {"message":"Hello, world!","testdata":{"double":133.700000,"foo":false,"poo":true,"moo-min":true,"moo-max":true,"bar-min":32768,"bar-max":32767,"baz-min":-2147483648,"baz-max":2147483647,"taz-min":-9223372036854775808,"taz-max":9223372036854775807,"world":"2"},"list":[false,true,true,true,32768,32767,-2147483648,2147483647,-9223372036854775808,9223372036854775807,133.700000]} + [*] blobmsg to json: {"message":"Hello, world!","testdata":{"double":133.700000,"foo":false,"poo":true,"moo-min":true,"moo-max":true,"bar-min":-32768,"bar-max":32767,"baz-min":-2147483648,"baz-max":2147483647,"taz-min":-9223372036854775808,"taz-max":9223372036854775807,"world":"2"},"list":[false,true,true,true,-32768,32767,-2147483648,2147483647,-9223372036854775808,9223372036854775807,133.700000]} [*] blobmsg from json: Message: Hello, world! @@ -231,7 +231,7 @@ check that blobmsg is producing expected results: 1 (i8) 1 (i8) 1 (i8) - 32768 (i32) + -32768 (i32) 32767 (i32) -2147483648 (i32) 2147483647 (i32) @@ -245,7 +245,7 @@ check that blobmsg is producing expected results: \tpoo : 1 (i8) (esc) \tmoo-min : 1 (i8) (esc) \tmoo-max : 1 (i8) (esc) - \tbar-min : 32768 (i32) (esc) + \tbar-min : -32768 (i32) (esc) \tbar-max : 32767 (i32) (esc) \tbaz-min : -2147483648 (i32) (esc) \tbaz-max : 2147483647 (i32) (esc) -- cgit v1.2.3