Generate #defines for initializing message structures.

[apps/agl-service-can-low-level.git] / tests / extensions / decode_extensions.c

diff --git a/tests/extensions/decode_extensions.c b/tests/extensions/decode_extensions.c
index ef6a022..e437438 100644 (file)
--- a/tests/extensions/decode_extensions.c
+++ b/tests/extensions/decode_extensions.c
@@ -6,6 +6,7 @@
 #include <pb_decode.h>
 #include "alltypes.pb.h"
 #include "extensions.pb.h"
+#include "test_helpers.h"
 
 #define TEST(x) if (!(x)) { \
     printf("Test " #x " failed.\n"); \
@@ -15,26 +16,42 @@
 int main(int argc, char **argv)
 {
     uint8_t buffer[1024];
-    size_t count = fread(buffer, 1, sizeof(buffer), stdin);
-    pb_istream_t stream = pb_istream_from_buffer(buffer, count);
-    
-    AllTypes alltypes = {};
+    size_t count;
+    pb_istream_t stream;
     
+    AllTypes alltypes = {0};
     int32_t extensionfield1;
-    pb_extension_t ext1 = {&AllTypes_extensionfield1, &extensionfield1, NULL};
-    alltypes.extensions = &ext1;
-        
-    ExtensionMessage extensionfield2 = {};
-    pb_extension_t ext2 = {&ExtensionMessage_AllTypes_extensionfield2, &extensionfield2, NULL};
+    pb_extension_t ext1;
+    ExtensionMessage extensionfield2;
+    pb_extension_t ext2;
+    
+    /* Read the message data */
+    SET_BINARY_MODE(stdin);
+    count = fread(buffer, 1, sizeof(buffer), stdin);
+    stream = pb_istream_from_buffer(buffer, count);
+    
+    /* Add the extensions */
+    alltypes.extensions = &ext1;        
+
+    ext1.type = &AllTypes_extensionfield1;
+    ext1.dest = &extensionfield1;
     ext1.next = &ext2;
     
+    ext2.type = &ExtensionMessage_AllTypes_extensionfield2;
+    ext2.dest = &extensionfield2;
+    ext2.next = NULL;
+    
+    /* Decode the message */
     if (!pb_decode(&stream, AllTypes_fields, &alltypes))
     {
         printf("Parsing failed: %s\n", PB_GET_ERROR(&stream));
         return 1;
     }
 
+    /* Check that the extensions decoded properly */
+    TEST(ext1.found)
     TEST(extensionfield1 == 12345)
+    TEST(ext2.found)
     TEST(strcmp(extensionfield2.test1, "test") == 0)
     TEST(extensionfield2.test2 == 54321)