Fixed a bunch of bugs related to callback fields.

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

diff --git a/tests/decode_unittests.c b/tests/decode_unittests.c
index 6f2b77e..ab12ac3 100644 (file)
--- a/tests/decode_unittests.c
+++ b/tests/decode_unittests.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "pb_decode.h"
 #include "unittests.h"
+#include "unittestproto.pb.h"
 
 #define S(x) pb_istream_from_buffer((uint8_t*)x, sizeof(x) - 1)
 
@@ -15,24 +16,6 @@ bool stream_callback(pb_istream_t *stream, uint8_t *buf, size_t count)
     return true;
 }
 
-typedef struct { size_t data_count; int32_t data[10]; } IntegerArray;
-const pb_field_t IntegerArray_fields[] = {
-    {1, PB_HTYPE_ARRAY | PB_LTYPE_VARINT, offsetof(IntegerArray, data),
-    pb_delta(IntegerArray, data_count, data),
-    pb_membersize(IntegerArray, data[0]),
-    pb_membersize(IntegerArray, data) / pb_membersize(IntegerArray, data[0])},
-    
-    PB_LAST_FIELD
-};
-
-typedef struct { pb_callback_t data; } CallbackArray;
-const pb_field_t CallbackArray_fields[] = {
-    {1, PB_HTYPE_CALLBACK | PB_LTYPE_VARINT, offsetof(CallbackArray, data),
-    0, pb_membersize(CallbackArray, data), 0},
-    
-    PB_LAST_FIELD
-};
-
 /* Verifies that the stream passed to callback matches the byte array pointed to by arg. */
 bool callback_check(pb_istream_t *stream, const pb_field_t *field, void *arg)
 {
@@ -160,25 +143,25 @@ int main()
     
     {
         pb_istream_t s;
-        pb_field_t f = {1, PB_LTYPE_FIXED, 0, 0, 4, 0, 0};
+        pb_field_t f = {1, PB_LTYPE_FIXED32, 0, 0, 4, 0, 0};
         float d;
         
-        COMMENT("Test pb_dec_fixed using float (failures here may be caused by imperfect rounding)")
-        TEST((s = S("\x00\x00\x00\x00"), pb_dec_fixed(&s, &f, &d) && d == 0.0f))
-        TEST((s = S("\x00\x00\xc6\x42"), pb_dec_fixed(&s, &f, &d) && d == 99.0f))
-        TEST((s = S("\x4e\x61\x3c\xcb"), pb_dec_fixed(&s, &f, &d) && d == -12345678.0f))
-        TEST((s = S("\x00"), !pb_dec_fixed(&s, &f, &d) && d == -12345678.0f))
+        COMMENT("Test pb_dec_fixed32 using float (failures here may be caused by imperfect rounding)")
+        TEST((s = S("\x00\x00\x00\x00"), pb_dec_fixed32(&s, &f, &d) && d == 0.0f))
+        TEST((s = S("\x00\x00\xc6\x42"), pb_dec_fixed32(&s, &f, &d) && d == 99.0f))
+        TEST((s = S("\x4e\x61\x3c\xcb"), pb_dec_fixed32(&s, &f, &d) && d == -12345678.0f))
+        TEST((s = S("\x00"), !pb_dec_fixed32(&s, &f, &d) && d == -12345678.0f))
     }
     
     {
         pb_istream_t s;
-        pb_field_t f = {1, PB_LTYPE_FIXED, 0, 0, 8, 0, 0};
+        pb_field_t f = {1, PB_LTYPE_FIXED64, 0, 0, 8, 0, 0};
         double d;
         
-        COMMENT("Test pb_dec_fixed using double (failures here may be caused by imperfect rounding)")
-        TEST((s = S("\x00\x00\x00\x00\x00\x00\x00\x00"), pb_dec_fixed(&s, &f, &d) && d == 0.0))
-        TEST((s = S("\x00\x00\x00\x00\x00\xc0\x58\x40"), pb_dec_fixed(&s, &f, &d) && d == 99.0))
-        TEST((s = S("\x00\x00\x00\xc0\x29\x8c\x67\xc1"), pb_dec_fixed(&s, &f, &d) && d == -12345678.0f))
+        COMMENT("Test pb_dec_fixed64 using double (failures here may be caused by imperfect rounding)")
+        TEST((s = S("\x00\x00\x00\x00\x00\x00\x00\x00"), pb_dec_fixed64(&s, &f, &d) && d == 0.0))
+        TEST((s = S("\x00\x00\x00\x00\x00\xc0\x58\x40"), pb_dec_fixed64(&s, &f, &d) && d == 99.0))
+        TEST((s = S("\x00\x00\x00\xc0\x29\x8c\x67\xc1"), pb_dec_fixed64(&s, &f, &d) && d == -12345678.0f))
     }
     
     {
@@ -224,6 +207,8 @@ int main()
         IntegerArray dest;
         
         COMMENT("Testing pb_decode with packed int32 field")
+        TEST((s = S("\x0A\x00"), pb_decode(&s, IntegerArray_fields, &dest)
+            && dest.data_count == 0))
         TEST((s = S("\x0A\x01\x01"), pb_decode(&s, IntegerArray_fields, &dest)
             && dest.data_count == 1 && dest.data[0] == 1))
         TEST((s = S("\x0A\x0A\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A"), pb_decode(&s, IntegerArray_fields, &dest)