- map_t *ht = map_alloc(map_type_);
-
- ASSERT_EQUAL( 0, map_count(ht) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_add(ht,"a",2,10) );
- ASSERT_EQUAL( 1, map_count(ht) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_add(ht,"b",2,20) );
- ASSERT_EQUAL( 2, map_count(ht) );
- ASSERT_EQUAL( 20, map_get(ht,"b",2) );
- ASSERT_EQUAL( 10, map_set(ht,"a",2,11) );
- ASSERT_EQUAL( 20, map_set(ht,"b",2,21) );
- ASSERT_EQUAL( 2, map_count(ht) );
- ASSERT_EQUAL( 21, map_add(ht,"b",2,22) );
- ASSERT_EQUAL( 11, map_remove(ht,"a",2) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_get(ht,"a",2) );
- ASSERT_EQUAL( 1, map_count(ht) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(ht,"a",2) );
- ASSERT_EQUAL( 21, map_remove(ht,"b",2) );
- ASSERT_EQUAL( 0, map_count(ht) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(ht,"b",2) );
- ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(ht,"c",2) );
- ASSERT_EQUAL( 0, map_count(ht) );
+ map_t *map = map_alloc(map_type_);
+
+ ASSERT_EQUAL( 0, map_count(map) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_add(map,"a",2,10) );
+ ASSERT_EQUAL( 1, map_count(map) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_add(map,"b",2,20) );
+ ASSERT_EQUAL( 2, map_count(map) );
+ ASSERT_EQUAL( 20, map_get(map,"b",2) );
+ ASSERT_EQUAL( 10, map_set(map,"a",2,11) );
+ ASSERT_EQUAL( 20, map_set(map,"b",2,21) );
+ ASSERT_EQUAL( 2, map_count(map) );
+ ASSERT_EQUAL( 21, map_add(map,"b",2,22) );
+ ASSERT_EQUAL( 11, map_remove(map,"a",2) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_get(map,"a",2) );
+ ASSERT_EQUAL( 1, map_count(map) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(map,"a",2) );
+ ASSERT_EQUAL( 21, map_remove(map,"b",2) );
+ ASSERT_EQUAL( 0, map_count(map) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(map,"b",2) );
+ ASSERT_EQUAL( DOES_NOT_EXIST, map_remove(map,"c",2) );
+ ASSERT_EQUAL( 0, map_count(map) );