test: more decoding tests

Pierre-Alexandre Meyer · Pierre-Alexandre Meyer · commit b368bbd069cc · 2011-07-21T16:35:16.000-07:00
They still fail at negative values though:

Running TestSuite
varint tests run: 7 assertions passed
Test failure: expected -1 (?), got -4 (?)
FAIL: test/smile_tests

Signed-off-by: Pierre-Alexandre Meyer &lt;pierre@ning.com&gt;
diff --git a/c/src/smile_decode.c b/c/src/smile_decode.c
@@ -136,13 +136,13 @@ void smile_decode_value(u8** orig_data, struct content_handler* handler)
         if (length == 0) {
             // 32-bit
             handler->start_value();
-            handler->number_value(varint_decode(orig_data));
+            handler->number_value(zzvarint_decode(orig_data));
             (*orig_data)++;
             handler->end_value();
         } else if (length == 1) {
             // 64-bit
             handler->start_value();
-            handler->number_value(varint_decode(orig_data));
+            handler->number_value(zzvarint_decode(orig_data));
             (*orig_data)++;
             handler->end_value();
         } else if (length == 2) {
diff --git a/c/src/smile_utils.c b/c/src/smile_utils.c
@@ -16,23 +16,28 @@
 
 #include "smile_utils.h"
 
-long varint_decode(u8 **msg)
+long zzvarint_decode(u8 **msg)
 {
-    // TODO - it doesn't work yet
-    return 0L;
+    return ZZ_DECODE(varint_decode(msg));
 }
 
-long varint_decode_buffer(u8* input)
+long varint_decode(u8 **msg)
 {
-    u8* msg = input;
     long x = 0;
-    while(!(*msg & 0x80)) {
+    while(!(**msg & 0x80)) {
         x <<= 7;
-        x |= *msg;
-        msg++;
+        x |= **msg;
+        (*msg)++;
     }
     // last byte only has 6 payload bits
     x <<= 6;
-    x |= (*msg & 0x3F);
+    x |= (**msg & 0x3F);
     return x;
 }
+
+// For testing
+long varint_decode_buffer(u8* input)
+{
+    u8* msg = input;
+    varint_decode(&msg);
+}
diff --git a/c/src/smile_utils.h b/c/src/smile_utils.h
@@ -5,6 +5,7 @@
 
 #define ZZ_DECODE(n) ((n >> 1) ^ (-(n & 1)))
 
+long zzvarint_decode(u8**);
 long varint_decode(u8**);
 long varint_decode_buffer(u8*);
 
diff --git a/c/test/test_decode.c b/c/test/test_decode.c
@@ -49,14 +49,14 @@ inline void noop()
 {
 }
 
-inline void number(long number)
+static long expected_long = 0;
+static char* expected_string = NULL;
+
+inline void number(long actual)
 {
-    // TODO
-    //printf("%lu\n", number);
+    ASSERT_EQUAL(expected_long, actual)
 }
 
-static char* expected_string = NULL;
-
 inline void string(const u8* ch, int start, int length)
 {
     //printf("%s (%s)\n", ch, expected_string);
@@ -91,7 +91,7 @@ void test_decode_smile()
 
     expected_string = "eventDate";
     smile_decode_key((u8**) &ip, &handler);
-    // TODO
+    expected_long = 1311225160270;
     smile_decode_value((u8**) &ip, &handler);
 
     expected_string = "eventGranularity";
@@ -101,7 +101,7 @@ void test_decode_smile()
 
     expected_string = "int";
     smile_decode_key((u8**) &ip, &handler);
-    // TODO
+    expected_long = 1242;
     smile_decode_value((u8**) &ip, &handler);
 
     expected_string = "string";
@@ -111,12 +111,12 @@ void test_decode_smile()
 
     expected_string = "negative";
     smile_decode_key((u8**) &ip, &handler);
-    // TODO
+    expected_long = -1;
     smile_decode_value((u8**) &ip, &handler);
 
     expected_string = "long";
     smile_decode_key((u8**) &ip, &handler);
-    // TODO
+    expected_long = 123456789;
     smile_decode_value((u8**) &ip, &handler);
 }
 
