Handle unsupported extension field types more gracefully.

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

diff --git a/tests/test_decode1.c b/tests/test_decode1.c
index a507b0d..56bbd8f 100644 (file)
--- a/tests/test_decode1.c
+++ b/tests/test_decode1.c
@@ -1,76 +1,17 @@
-#include <stdio.h>
-#include <string.h>
-#include <stddef.h>
-#include "pb_decode.h"
-
-/* Structures for "Person" message */
-
-typedef enum {
-    Person_PhoneType_MOBILE = 0,
-    Person_PhoneType_HOME = 1,
-    Person_PhoneType_WORK = 2
-} Person_PhoneType;
-
-typedef struct {
-    char number[40];
-    bool has_type;
-    Person_PhoneType type;
-} Person_PhoneNumber;
-
-typedef struct {
-    char name[40];
-    int32_t id;
-    bool has_email;
-    char email[40];
-    size_t phone_size;
-    Person_PhoneNumber phone[5];
-} Person;
-
-/* Field descriptions */
-#define membersize(st, m) (sizeof ((st*)0)->m)
-
-const Person_PhoneType Person_PhoneType_type_default = Person_PhoneType_HOME;
-
-const pb_field_t Person_PhoneNumber_fields[] = {
-    {1, PB_HTYPE_REQUIRED | PB_LTYPE_STRING,
-        offsetof(Person_PhoneNumber, number), 0,
-        membersize(Person_PhoneNumber, number), 0, 0},
-        
-    {2, PB_HTYPE_OPTIONAL | PB_LTYPE_VARINT,
-        offsetof(Person_PhoneNumber, type) - offsetof(Person_PhoneNumber, number),
-        (int)offsetof(Person_PhoneNumber, has_type) - (int)offsetof(Person_PhoneNumber, type),
-        membersize(Person_PhoneNumber, type), 0,
-        &Person_PhoneType_type_default},
-    
-    PB_LAST_FIELD
-};
-
-const pb_field_t Person_fields[] = {
-    {1, PB_HTYPE_REQUIRED | PB_LTYPE_STRING,
-        offsetof(Person, name), 0,
-        membersize(Person, name), 0, 0},
-    
-    {2, PB_HTYPE_REQUIRED | PB_LTYPE_VARINT,
-        offsetof(Person, id) - offsetof(Person, name), 0,
-        membersize(Person, id), 0, 0},
-    
-    {3, PB_HTYPE_OPTIONAL | PB_LTYPE_STRING,
-        offsetof(Person, email) - offsetof(Person, id),
-        (int)offsetof(Person, has_email) - (int)offsetof(Person, email),
-        membersize(Person, email), 0, 0},
-    
-    {4, PB_HTYPE_ARRAY | PB_LTYPE_SUBMESSAGE,
-        offsetof(Person, phone) - offsetof(Person, email),
-        (int)offsetof(Person, phone_size) - (int)offsetof(Person, phone),
-        membersize(Person, phone[0]),
-        membersize(Person, phone) / membersize(Person, phone[0]),
-        Person_PhoneNumber_fields},
-    
-    PB_LAST_FIELD
-};
+/* A very simple decoding test case, using person.proto.
+ * Produces output compatible with protoc --decode.
+ * Reads the encoded data from stdin and prints the values
+ * to stdout as text.
+ *
+ * Run e.g. ./test_encode1 | ./test_decode1
+ */
 
-/* And now, the actual test program */
+#include <stdio.h>
+#include <pb_decode.h>
+#include "person.pb.h"
 
+/* This function is called once from main(), it handles
+   the decoding and printing. */
 bool print_person(pb_istream_t *stream)
 {
     int i;
@@ -79,12 +20,38 @@ bool print_person(pb_istream_t *stream)
     if (!pb_decode(stream, Person_fields, &person))
         return false;
     
-    printf("Person: name '%s' id '%d' email '%s'\n", person.name, person.id, person.email);
+    /* Now the decoding is done, rest is just to print stuff out. */
+
+    printf("name: \"%s\"\n", person.name);
+    printf("id: %ld\n", (long)person.id);
     
-    for (i = 0; i < person.phone_size; i++)
+    if (person.has_email)
+        printf("email: \"%s\"\n", person.email);
+    
+    for (i = 0; i < person.phone_count; i++)
     {
         Person_PhoneNumber *phone = &person.phone[i];
-        printf("PhoneNumber: number '%s' type '%d'\n", phone->number, phone->type);
+        printf("phone {\n");
+        printf("  number: \"%s\"\n", phone->number);
+        
+        if (phone->has_type)
+        {
+            switch (phone->type)
+            {
+                case Person_PhoneType_WORK:
+                    printf("  type: WORK\n");
+                    break;
+                
+                case Person_PhoneType_HOME:
+                    printf("  type: HOME\n");
+                    break;
+                
+                case Person_PhoneType_MOBILE:
+                    printf("  type: MOBILE\n");
+                    break;
+            }
+        }
+        printf("}\n");
     }
     
     return true;
@@ -92,12 +59,25 @@ bool print_person(pb_istream_t *stream)
 
 int main()
 {
+    /* Read the data into buffer */
     uint8_t buffer[512];
-    size_t size = fread(buffer, 1, 512, stdin);
+    size_t count = fread(buffer, 1, sizeof(buffer), stdin);
     
-    pb_istream_t stream = pb_istream_from_buffer(buffer, size);
-    if (!print_person(&stream))
-        printf("Parsing failed.\n");
+    if (!feof(stdin))
+    {
+       printf("Message does not fit in buffer\n");
+       return 1;
+    }
+    
+    /* Construct a pb_istream_t for reading from the buffer */
+    pb_istream_t stream = pb_istream_from_buffer(buffer, count);
     
-    return 0;
+    /* Decode and print out the stuff */
+    if (!print_person(&stream))
+    {
+        printf("Parsing failed: %s\n", PB_GET_ERROR(&stream));
+        return 1;
+    } else {
+        return 0;
+    }
 }