From c5342cff28a7139fe6bf0dddc5ba26c4a6daffc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Morin?= Date: Thu, 5 Oct 2017 10:02:17 -0400 Subject: [PATCH] Modify the test to encode using protoc and verify, they should match. --- tests/without_64bit/SConscript | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/without_64bit/SConscript b/tests/without_64bit/SConscript index 4472529..be415d8 100644 --- a/tests/without_64bit/SConscript +++ b/tests/without_64bit/SConscript @@ -26,5 +26,24 @@ dec = opts.Program(["decode_alltypes.c", "alltypes.pb.c", "pb_decode_no64bit.o", env.RunTest(enc) env.RunTest([dec, "encode_alltypes.output"]) +# Re-encode the data using protoc, and check that the results from nanopb +# match byte-per-byte to the protoc output. +env.Decode("encode_alltypes.output.decoded", + ["encode_alltypes.output", "alltypes.proto"], + MESSAGE='AllTypes') +env.Encode("encode_alltypes.output.recoded", + ["encode_alltypes.output.decoded", "alltypes.proto"], + MESSAGE='AllTypes') +env.Compare(["encode_alltypes.output", "encode_alltypes.output.recoded"]) + + +# Do the same checks with the optional fields present. env.RunTest("optionals.output", enc, ARGS = ['1']) env.RunTest("optionals.decout", [dec, "optionals.output"], ARGS = ['1']) +env.Decode("optionals.output.decoded", + ["optionals.output", "alltypes.proto"], + MESSAGE='AllTypes') +env.Encode("optionals.output.recoded", + ["optionals.output.decoded", "alltypes.proto"], + MESSAGE='AllTypes') +env.Compare(["optionals.output", "optionals.output.recoded"])