X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftest_encode1.c;h=2e97829657c594b9bac4dcda40bd35a4fd6a380e;hb=59788e2aabe41d46164184d4c31fd877397b62ee;hp=99be7cb5fc1ca632c424dd1024c06d2a9bd7e58f;hpb=6dfba365b00175eae7e8b83aaf5d29ce190fd9eb;p=apps%2Fagl-service-can-low-level.git

diff --git a/tests/test_encode1.c b/tests/test_encode1.c
index 99be7cb5..2e978296 100644
--- a/tests/test_encode1.c
+++ b/tests/test_encode1.c
@@ -1,24 +1,32 @@
+/* A very simple encoding test case using person.proto.
+ * Just puts constant data in the fields and encodes into
+ * buffer, which is then written to stdout.
+ */
+
 #include <stdio.h>
 #include <pb_encode.h>
-#include "person.h"
-
-/* This test has only one source file anyway.. */
-#include "person.c"
-
-bool streamcallback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
-{
-    FILE *file = (FILE*) stream->state;
-    return fwrite(buf, 1, count, file) == count;
-}
+#include "person.pb.h"
 
 int main()
 {
+    /* Initialize the structure with constants */
     Person person = {"Test Person 99", 99, true, "test@person.com",
-        1, {{"555-12345678", true, Person_PhoneType_MOBILE}}};
-    
-    pb_ostream_t stream = {&streamcallback, stdout, SIZE_MAX, 0};
-    
-    pb_encode(&stream, Person_fields, &person);
+        3, {{"555-12345678", true, Person_PhoneType_MOBILE},
+            {"99-2342", false, 0},
+            {"1234-5678", true, Person_PhoneType_WORK},
+        }};
+
+    uint8_t buffer[512];
+    pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
     
-    return 0;
+    /* Now encode it and check if we succeeded. */
+    if (pb_encode(&stream, Person_fields, &person))
+    {
+        fwrite(buffer, 1, stream.bytes_written, stdout);
+        return 0; /* Success */
+    }
+    else
+    {
+        return 1; /* Failure */
+    }
 }