1.1 --- a/tests/test_map.cpp Mon Apr 17 21:47:34 2023 +0200 1.2 +++ b/tests/test_map.cpp Tue Apr 18 18:01:41 2023 +0200 1.3 @@ -124,12 +124,16 @@ 1.4 EXPECT_EQ(map->item_size, 1); 1.5 EXPECT_EQ(map->size, 0); 1.6 EXPECT_EQ(map->allocator, &allocator); 1.7 - EXPECT_FALSE(map->store_pointers); 1.8 + EXPECT_FALSE(map->store_pointer); 1.9 + EXPECT_EQ(map->cmpfunc, nullptr); 1.10 + EXPECT_EQ(map->simple_destructor, nullptr); 1.11 + EXPECT_EQ(map->advanced_destructor, nullptr); 1.12 + EXPECT_EQ(map->destructor_data, nullptr); 1.13 cxMapStorePointers(map); 1.14 - EXPECT_TRUE(map->store_pointers); 1.15 + EXPECT_TRUE(map->store_pointer); 1.16 EXPECT_EQ(map->item_size, sizeof(void *)); 1.17 cxMapStoreObjects(map); 1.18 - EXPECT_FALSE(map->store_pointers); 1.19 + EXPECT_FALSE(map->store_pointer); 1.20 1.21 cxMapDestroy(map); 1.22 EXPECT_TRUE(allocator.verify()); 1.23 @@ -145,7 +149,7 @@ 1.24 } 1.25 EXPECT_EQ(map->size, 0); 1.26 EXPECT_EQ(map->allocator, &allocator); 1.27 - EXPECT_TRUE(map->store_pointers); 1.28 + EXPECT_TRUE(map->store_pointer); 1.29 EXPECT_EQ(map->item_size, sizeof(void *)); 1.30 1.31 cxMapDestroy(map); 1.32 @@ -302,11 +306,11 @@ 1.33 auto map = cxHashMapCreate(&allocator, sizeof(cxstring), 8); 1.34 1.35 // define some strings 1.36 - cxstring s1 = CX_STR("this"); 1.37 - cxstring s2 = CX_STR("is"); 1.38 - cxstring s3 = CX_STR("a"); 1.39 - cxstring s4 = CX_STR("test"); 1.40 - cxstring s5 = CX_STR("setup"); 1.41 + auto s1 = CX_STR("this"); 1.42 + auto s2 = CX_STR("is"); 1.43 + auto s3 = CX_STR("a"); 1.44 + auto s4 = CX_STR("test"); 1.45 + auto s5 = CX_STR("setup"); 1.46 1.47 // put them into the map 1.48 cxMapPut(map, cx_hash_key_str("s1"), &s1); 1.49 @@ -339,3 +343,4 @@ 1.50 cxMapDestroy(map); 1.51 EXPECT_TRUE(allocator.verify()); 1.52 } 1.53 +