Simple definite maps test

Author: PJK

src/cbor_internal.c

@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <string.h>
 #include <math.h>
+#include <ldap.h>
 
 // TODO asserts
 // TODO check mallocs
@@ -110,19 +111,22 @@ void _cbor_builder_append(cbor_item_t * item, struct _cbor_decoder_context * ctx
 				if (cbor_map_is_definite(ctx->stack->top->item)) {
 					assert(ctx->stack->top->subitems > 0);
 					if (ctx->stack->top->subitems % 2) {
-						/* Even record, this is a key */
-						cbor_map_add(ctx->stack->top->item, (struct cbor_pair){ .key = item, .value = NULL });
-					} else {
 						// TODO this is fugly
 						cbor_map_handle(ctx->stack->top->item)[cbor_map_size(ctx->stack->top->item) - 1].value = item;
+					} else {
+						/* Even record, this is a key */
+						cbor_map_add(ctx->stack->top->item, (struct cbor_pair) {.key = item, .value = NULL});
 					}
 					ctx->stack->top->subitems--;
 					if (ctx->stack->top->subitems == 0) {
 						cbor_item_t *item = ctx->stack->top->item;
 						_cbor_stack_pop(ctx->stack);
 						_cbor_builder_append(item, ctx);
 					}
+				} else {
+					// TODO uh oh
 				}
+				break;
 			}
 		case CBOR_TYPE_TAG:
 			{

test/type_5_test.c

@@ -25,9 +25,30 @@ static void test_empty_map(void **state)
 }
 
 
+unsigned char simple_map[] = { 0xA2, 0x01, 0x02, 0x03, 0x04 }; /* {1: 2, 3: 4} */
+static void test_simple_map(void **state)
+{
+	map = cbor_load(simple_map, 5, CBOR_FLAGS_NONE, &res);
+	assert_non_null(map);
+	assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+	assert_true(cbor_isa_map(map));
+	assert_true(cbor_map_size(map) == 2);
+	assert_true(res.read == 5);
+	struct cbor_pair * handle = cbor_map_handle(map);
+	assert_uint8(handle[0].key, 1);
+	assert_uint8(handle[0].value, 2);
+	assert_uint8(handle[1].key, 3);
+	assert_uint8(handle[1].value, 4);
+	cbor_decref(&map);
+	assert_null(map);
+}
+
+
+
 int main(void) {
 	const UnitTest tests[] = {
 		unit_test(test_empty_map),
+		unit_test(test_simple_map)
 	};
 	return run_tests(tests);
 }