rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes for dynamic allocation

Browse Source
This commit is contained in:
Petteri Aimonen
2014-03-10 18:19:38 +02:00
parent 48ac461372
commit bf61d2337b
3 changed files with 99 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/alltypes_pointer/SConscript
View File

@@ -23,7 +23,6 @@ env.RunTest(enc)
env.RunTest("decode_alltypes.output", [dec, "encode_alltypes_pointer.output"])
env.RunTest("decode_alltypes_ref.output", [refdec, "encode_alltypes_pointer.output"])
env.Compare(["encode_alltypes_pointer.output", "$BUILD/alltypes/encode_alltypes.output"])
env.Compare(["encode_alltypes_pointer_ref.output", "$BUILD/alltypes/encode_alltypes.output"])
# Do the same thing with the optional fields present
env.RunTest("optionals.output", enc, ARGS = ['1'])

46
tests/alltypes_pointer/decode_alltypes_pointer.c
View File

@@ -7,13 +7,14 @@
#define TEST(x) if (!(x)) { \
printf("Test " #x " failed.\n"); \
return false; \
status = false; \
}
/* This function is called once from main(), it handles
the decoding and checks the fields. */
bool check_alltypes(pb_istream_t *stream, int mode)
{
bool status = true;
AllTypes alltypes;
/* Fill with garbage to better detect initialization errors */
@@ -22,28 +23,31 @@ bool check_alltypes(pb_istream_t *stream, int mode)
if (!pb_decode(stream, AllTypes_fields, &alltypes))
return false;
TEST(*alltypes.req_int32 == -1001);
TEST(*alltypes.req_int64 == -1002);
TEST(*alltypes.req_uint32 == 1003);
TEST(*alltypes.req_uint64 == 1004);
TEST(*alltypes.req_sint32 == -1005);
TEST(*alltypes.req_sint64 == -1006);
TEST(*alltypes.req_bool == true);
TEST(alltypes.req_int32 && *alltypes.req_int32 == -1001);
TEST(alltypes.req_int64 && *alltypes.req_int64 == -1002);
TEST(alltypes.req_uint32 && *alltypes.req_uint32 == 1003);
TEST(alltypes.req_uint64 && *alltypes.req_uint64 == 1004);
TEST(alltypes.req_sint32 && *alltypes.req_sint32 == -1005);
TEST(alltypes.req_sint64 && *alltypes.req_sint64 == -1006);
TEST(alltypes.req_bool && *alltypes.req_bool == true);
TEST(*alltypes.req_fixed32 == 1008);
TEST(*alltypes.req_sfixed32 == -1009);
TEST(*alltypes.req_float == 1010.0f);
TEST(alltypes.req_fixed32 && *alltypes.req_fixed32 == 1008);
TEST(alltypes.req_sfixed32 && *alltypes.req_sfixed32 == -1009);
TEST(alltypes.req_float && *alltypes.req_float == 1010.0f);
TEST(*alltypes.req_fixed64 == 1011);
TEST(*alltypes.req_sfixed64 == -1012);
TEST(*alltypes.req_double == 1013.0f);
TEST(alltypes.req_fixed64 && *alltypes.req_fixed64 == 1011);
TEST(alltypes.req_sfixed64 && *alltypes.req_sfixed64 == -1012);
TEST(alltypes.req_double && *alltypes.req_double == 1013.0f);
TEST(strcmp(alltypes.req_string, "1014") == 0);
TEST(alltypes.req_bytes->size == 4);
TEST(memcmp(alltypes.req_bytes->bytes, "1015", 4) == 0);
TEST(strcmp(alltypes.req_submsg->substuff1, "1016") == 0);
TEST(*alltypes.req_submsg->substuff2 == 1016);
TEST(*alltypes.req_submsg->substuff3 == 3);
TEST(alltypes.req_string && strcmp(alltypes.req_string, "1014") == 0);
TEST(alltypes.req_bytes && alltypes.req_bytes->size == 4);
TEST(alltypes.req_bytes && alltypes.req_bytes->bytes
&& memcmp(alltypes.req_bytes->bytes, "1015", 4) == 0);
TEST(alltypes.req_submsg && alltypes.req_submsg->substuff1
&& strcmp(alltypes.req_submsg->substuff1, "1016") == 0);
TEST(alltypes.req_submsg && alltypes.req_submsg->substuff2
&& *alltypes.req_submsg->substuff2 == 1016);
/* TEST(*alltypes.req_submsg->substuff3 == 3); Default values are not currently supported for pointer fields */
TEST(*alltypes.req_enum == MyEnum_Truth);
#if 0
@@ -180,7 +184,7 @@ bool check_alltypes(pb_istream_t *stream, int mode)
TEST(alltypes.end == 1099);
#endif
return true;
return status;
}
int main(int argc, char **argv)