Sun, 16 Apr 2023 21:09:25 +0200
work around some MSC problems
| 556 | 1 | /* |
| 2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
| 3 | * | |
| 4 | * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved. | |
| 5 | * | |
| 6 | * Redistribution and use in source and binary forms, with or without | |
| 7 | * modification, are permitted provided that the following conditions are met: | |
| 8 | * | |
| 9 | * 1. Redistributions of source code must retain the above copyright | |
| 10 | * notice, this list of conditions and the following disclaimer. | |
| 11 | * | |
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
| 13 | * notice, this list of conditions and the following disclaimer in the | |
| 14 | * documentation and/or other materials provided with the distribution. | |
| 15 | * | |
| 16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
| 17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
| 18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
| 19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | |
| 20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
| 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
| 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
| 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
| 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
| 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
| 26 | * POSSIBILITY OF SUCH DAMAGE. | |
| 27 | */ | |
| 28 | ||
| 29 | #include "cx/hash_map.h" | |
| 30 | #include "cx/utils.h" | |
|
658
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
31 | #include "cx/string.h" |
| 556 | 32 | #include "util_allocator.h" |
| 33 | ||
| 34 | #include <gtest/gtest.h> | |
| 35 | #include <unordered_map> | |
| 36 | #include <unordered_set> | |
| 37 | ||
| 38 | struct map_operation { | |
| 39 | enum { | |
| 40 | put, rm | |
| 41 | } op; | |
| 42 | char const *key; | |
| 43 | char const *value; | |
| 44 | }; | |
| 45 | ||
| 46 | auto generate_map_operations() -> std::vector<map_operation> { | |
| 47 | return { | |
| 48 | {map_operation::put, "key 1", "test"}, | |
| 49 | {map_operation::put, "key 2", "blub"}, | |
| 50 | {map_operation::put, "key 3", "hallo"}, | |
| 51 | {map_operation::put, "key 2", "foobar"}, | |
| 52 | {map_operation::put, "key 4", "value 4"}, | |
| 53 | {map_operation::put, "key 5", "value 5"}, | |
| 54 | {map_operation::put, "key 6", "value 6"}, | |
| 55 | {map_operation::rm, "key 4", nullptr}, | |
| 56 | {map_operation::put, "key 7", "value 7"}, | |
| 57 | {map_operation::put, "key 8", "value 8"}, | |
| 58 | {map_operation::rm, "does not exist", nullptr}, | |
| 59 | {map_operation::put, "key 9", "value 9"}, | |
| 60 | {map_operation::put, "key 6", "other value"}, | |
| 61 | {map_operation::put, "key 7", "something else"}, | |
| 62 | {map_operation::rm, "key 8", nullptr}, | |
| 63 | {map_operation::rm, "key 2", nullptr}, | |
| 64 | {map_operation::put, "key 8", "new value"}, | |
| 65 | }; | |
| 66 | } | |
| 67 | ||
| 68 | static void verify_map_contents( | |
| 69 | CxMap *map, | |
| 70 | std::unordered_map<std::string, std::string> const &refmap | |
| 71 | ) { | |
| 72 | // verify key iterator | |
| 73 | { | |
| 74 | auto keyiter = cxMapIteratorKeys(map); | |
| 75 | std::unordered_set<std::string> keys; | |
|
563
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
76 | cx_foreach(CxHashKey*, elem, keyiter) { |
| 604 | 77 | keys.insert(std::string(elem->data.cstr, elem->len)); |
| 556 | 78 | } |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
79 | EXPECT_EQ(keyiter.index, map->size); |
| 556 | 80 | ASSERT_EQ(keys.size(), map->size); |
| 81 | for (auto &&k: keys) { | |
| 82 | EXPECT_NE(refmap.find(k), refmap.end()); | |
| 83 | } | |
| 84 | } | |
| 85 | ||
| 86 | // verify value iterator | |
| 87 | { | |
| 88 | auto valiter = cxMapIteratorValues(map); | |
| 89 | std::unordered_set<std::string> values; // we use that the values in our test data are unique strings | |
| 90 | cx_foreach(char const*, elem, valiter) { | |
| 91 | values.insert(std::string(elem)); | |
| 92 | } | |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
93 | EXPECT_EQ(valiter.index, map->size); |
| 556 | 94 | ASSERT_EQ(values.size(), map->size); |
| 95 | for (auto &&v: values) { | |
| 96 | EXPECT_NE(std::find_if(refmap.begin(), refmap.end(), | |
| 97 | [v](auto const &e) { return e.second == v; }), refmap.end()); | |
| 98 | } | |
| 99 | } | |
| 100 | ||
| 101 | // verify pair iterator | |
| 102 | { | |
| 103 | auto pairiter = cxMapIterator(map); | |
| 104 | std::unordered_map<std::string, std::string> pairs; | |
| 105 | cx_foreach(CxMapEntry*, entry, pairiter) { | |
| 604 | 106 | pairs[std::string(entry->key->data.cstr, entry->key->len)] = std::string((char *) entry->value); |
| 556 | 107 | } |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
108 | EXPECT_EQ(pairiter.index, map->size); |
| 556 | 109 | ASSERT_EQ(pairs.size(), refmap.size()); |
| 110 | for (auto &&p: pairs) { | |
| 111 | ASSERT_EQ(p.second, refmap.at(p.first)); | |
| 112 | } | |
| 113 | } | |
| 114 | } | |
| 115 | ||
| 116 | TEST(CxHashMap, Create) { | |
| 117 | CxTestingAllocator allocator; | |
|
658
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
118 | auto map = cxHashMapCreate(&allocator, 1, 0); |
| 556 | 119 | auto hmap = reinterpret_cast<struct cx_hash_map_s *>(map); |
| 120 | EXPECT_GT(hmap->bucket_count, 0); | |
| 121 | cx_for_n(i, hmap->bucket_count) { | |
| 122 | EXPECT_EQ(hmap->buckets[i], nullptr); | |
| 123 | } | |
|
677
b09aae58bba4
refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents:
669
diff
changeset
|
124 | EXPECT_EQ(map->item_size, 1); |
| 556 | 125 | EXPECT_EQ(map->size, 0); |
| 126 | EXPECT_EQ(map->allocator, &allocator); | |
|
658
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
127 | EXPECT_FALSE(map->store_pointers); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
128 | cxMapStorePointers(map); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
129 | EXPECT_TRUE(map->store_pointers); |
|
677
b09aae58bba4
refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents:
669
diff
changeset
|
130 | EXPECT_EQ(map->item_size, sizeof(void *)); |
|
658
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
131 | cxMapStoreObjects(map); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
132 | EXPECT_FALSE(map->store_pointers); |
| 556 | 133 | |
| 134 | cxMapDestroy(map); | |
| 135 | EXPECT_TRUE(allocator.verify()); | |
| 136 | } | |
| 137 | ||
|
668
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
138 | TEST(CxHashMap, CreateForStoringPointers) { |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
139 | CxTestingAllocator allocator; |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
140 | auto map = cxHashMapCreate(&allocator, CX_STORE_POINTERS, 0); |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
141 | auto hmap = reinterpret_cast<struct cx_hash_map_s *>(map); |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
142 | EXPECT_GT(hmap->bucket_count, 0); |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
143 | cx_for_n(i, hmap->bucket_count) { |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
144 | EXPECT_EQ(hmap->buckets[i], nullptr); |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
145 | } |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
146 | EXPECT_EQ(map->size, 0); |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
147 | EXPECT_EQ(map->allocator, &allocator); |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
148 | EXPECT_TRUE(map->store_pointers); |
|
677
b09aae58bba4
refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents:
669
diff
changeset
|
149 | EXPECT_EQ(map->item_size, sizeof(void *)); |
|
668
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
150 | |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
151 | cxMapDestroy(map); |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
152 | EXPECT_TRUE(allocator.verify()); |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
153 | } |
|
d7129285ac32
add CX_STORE_POINTERS special item size for maps
Mike Becker <universe@uap-core.de>
parents:
659
diff
changeset
|
154 | |
| 556 | 155 | TEST(CxHashMap, BasicOperations) { |
| 156 | // create the map | |
| 157 | CxTestingAllocator allocator; | |
|
669
dce9b8450656
add docs for CX_STORE_POINTERS and remove cxHashMapCreateForPointers()
Mike Becker <universe@uap-core.de>
parents:
668
diff
changeset
|
158 | auto map = cxHashMapCreate(&allocator, CX_STORE_POINTERS, 8); |
| 556 | 159 | |
| 160 | // create a reference map | |
| 161 | std::unordered_map<std::string, std::string> refmap; | |
| 162 | ||
| 163 | // generate operations | |
| 164 | auto ops = generate_map_operations(); | |
| 165 | ||
| 166 | // verify iterators for empty map | |
| 167 | verify_map_contents(map, refmap); | |
| 168 | ||
| 169 | // execute operations and verify results | |
| 170 | for (auto &&op: ops) { | |
|
563
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
171 | CxHashKey key = cx_hash_key_str(op.key); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
172 | key.hash = 0; // force the hash map to compute the hash |
| 556 | 173 | if (op.op == map_operation::put) { |
| 174 | // execute a put operation and verify that the exact value can be read back | |
| 175 | refmap[std::string(op.key)] = std::string(op.value); | |
| 176 | int result = cxMapPut(map, key, (void *) op.value); | |
| 177 | EXPECT_EQ(result, 0); | |
| 178 | auto added = cxMapGet(map, key); | |
| 179 | EXPECT_EQ(memcmp(op.value, added, strlen(op.value)), 0); | |
| 180 | } else { | |
| 181 | // execute a remove and verify that the removed element was returned (or nullptr) | |
| 182 | auto found = refmap.find(op.key); | |
|
659
4a06fd63909a
split cxMapRemove() to cxMapRemoveAndGet()
Mike Becker <universe@uap-core.de>
parents:
658
diff
changeset
|
183 | auto removed = cxMapRemoveAndGet(map, key); |
| 556 | 184 | if (found == refmap.end()) { |
| 185 | EXPECT_EQ(removed, nullptr); | |
| 186 | } else { | |
| 187 | EXPECT_EQ(std::string((char *) removed), found->second); | |
| 188 | refmap.erase(found); | |
| 189 | } | |
| 190 | } | |
| 191 | // compare the current map state with the reference map | |
| 192 | verify_map_contents(map, refmap); | |
| 193 | } | |
| 194 | ||
| 195 | // destroy the map and verify the memory (de)allocations | |
| 196 | cxMapDestroy(map); | |
| 197 | EXPECT_TRUE(allocator.verify()); | |
| 198 | } | |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
199 | |
|
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
200 | TEST(CxHashMap, RemoveViaIterator) { |
|
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
201 | CxTestingAllocator allocator; |
|
669
dce9b8450656
add docs for CX_STORE_POINTERS and remove cxHashMapCreateForPointers()
Mike Becker <universe@uap-core.de>
parents:
668
diff
changeset
|
202 | auto map = cxHashMapCreate(&allocator, CX_STORE_POINTERS, 4); |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
203 | |
|
563
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
204 | cxMapPut(map, cx_hash_key_str("key 1"), (void *) "val 1"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
205 | cxMapPut(map, cx_hash_key_str("key 2"), (void *) "val 2"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
206 | cxMapPut(map, cx_hash_key_str("key 3"), (void *) "val 3"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
207 | cxMapPut(map, cx_hash_key_str("key 4"), (void *) "val 4"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
208 | cxMapPut(map, cx_hash_key_str("key 5"), (void *) "val 5"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
209 | cxMapPut(map, cx_hash_key_str("key 6"), (void *) "val 6"); |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
210 | |
|
630
ac5e7f789048
separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents:
604
diff
changeset
|
211 | auto iter = cxMapMutIterator(map); |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
212 | cx_foreach(CxMapEntry*, entry, iter) { |
|
630
ac5e7f789048
separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents:
604
diff
changeset
|
213 | if (entry->key->data.cstr[4] % 2 == 1) cxIteratorFlagRemoval(iter); |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
214 | } |
|
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
215 | EXPECT_EQ(map->size, 3); |
|
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
216 | EXPECT_EQ(iter.index, map->size); |
|
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
217 | |
|
563
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
218 | EXPECT_EQ(cxMapGet(map, cx_hash_key_str("key 1")), nullptr); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
219 | EXPECT_NE(cxMapGet(map, cx_hash_key_str("key 2")), nullptr); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
220 | EXPECT_EQ(cxMapGet(map, cx_hash_key_str("key 3")), nullptr); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
221 | EXPECT_NE(cxMapGet(map, cx_hash_key_str("key 4")), nullptr); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
222 | EXPECT_EQ(cxMapGet(map, cx_hash_key_str("key 5")), nullptr); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
223 | EXPECT_NE(cxMapGet(map, cx_hash_key_str("key 6")), nullptr); |
|
561
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
224 | |
|
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
225 | cxMapDestroy(map); |
|
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
226 | EXPECT_TRUE(allocator.verify()); |
|
bb17790af41e
#199 test removing via iterator
Mike Becker <universe@uap-core.de>
parents:
556
diff
changeset
|
227 | } |
|
562
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
228 | |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
229 | TEST(CxHashMap, RehashNotRequired) { |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
230 | CxTestingAllocator allocator; |
|
669
dce9b8450656
add docs for CX_STORE_POINTERS and remove cxHashMapCreateForPointers()
Mike Becker <universe@uap-core.de>
parents:
668
diff
changeset
|
231 | auto map = cxHashMapCreate(&allocator, CX_STORE_POINTERS, 8); |
|
562
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
232 | |
|
563
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
233 | cxMapPut(map, cx_hash_key_str("key 1"), (void *) "val 1"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
234 | cxMapPut(map, cx_hash_key_str("key 2"), (void *) "val 2"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
235 | cxMapPut(map, cx_hash_key_str("key 3"), (void *) "val 3"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
236 | cxMapPut(map, cx_hash_key_str("key 4"), (void *) "val 4"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
237 | cxMapPut(map, cx_hash_key_str("key 5"), (void *) "val 5"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
238 | cxMapPut(map, cx_hash_key_str("key 6"), (void *) "val 6"); |
|
562
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
239 | |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
240 | // 6/8 does not exceed 0.75, therefore the function should not rehash |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
241 | int result = cxMapRehash(map); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
242 | EXPECT_EQ(result, 0); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
243 | EXPECT_EQ(reinterpret_cast<struct cx_hash_map_s *>(map)->bucket_count, 8); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
244 | |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
245 | cxMapDestroy(map); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
246 | EXPECT_TRUE(allocator.verify()); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
247 | } |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
248 | |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
249 | TEST(CxHashMap, Rehash) { |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
250 | CxTestingAllocator allocator; |
|
669
dce9b8450656
add docs for CX_STORE_POINTERS and remove cxHashMapCreateForPointers()
Mike Becker <universe@uap-core.de>
parents:
668
diff
changeset
|
251 | auto map = cxHashMapCreate(&allocator, CX_STORE_POINTERS, 8); |
|
562
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
252 | |
|
563
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
253 | cxMapPut(map, cx_hash_key_str("key 1"), (void *) "val 1"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
254 | cxMapPut(map, cx_hash_key_str("key 2"), (void *) "val 2"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
255 | cxMapPut(map, cx_hash_key_str("key 3"), (void *) "val 3"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
256 | cxMapPut(map, cx_hash_key_str("key 4"), (void *) "val 4"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
257 | cxMapPut(map, cx_hash_key_str("key 5"), (void *) "val 5"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
258 | cxMapPut(map, cx_hash_key_str("key 6"), (void *) "val 6"); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
259 | cxMapPut(map, cx_hash_key_str("key 7"), (void *) "val 7"); |
|
562
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
260 | |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
261 | int result = cxMapRehash(map); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
262 | EXPECT_EQ(result, 0); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
263 | EXPECT_EQ(reinterpret_cast<struct cx_hash_map_s *>(map)->bucket_count, 17); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
264 | EXPECT_EQ(map->size, 7); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
265 | |
|
563
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
266 | EXPECT_EQ(strcmp((char *) cxMapGet(map, cx_hash_key_str("key 1")), "val 1"), 0); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
267 | EXPECT_EQ(strcmp((char *) cxMapGet(map, cx_hash_key_str("key 2")), "val 2"), 0); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
268 | EXPECT_EQ(strcmp((char *) cxMapGet(map, cx_hash_key_str("key 3")), "val 3"), 0); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
269 | EXPECT_EQ(strcmp((char *) cxMapGet(map, cx_hash_key_str("key 4")), "val 4"), 0); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
270 | EXPECT_EQ(strcmp((char *) cxMapGet(map, cx_hash_key_str("key 5")), "val 5"), 0); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
271 | EXPECT_EQ(strcmp((char *) cxMapGet(map, cx_hash_key_str("key 6")), "val 6"), 0); |
|
69a83fad8a35
improve hash key handling
Mike Becker <universe@uap-core.de>
parents:
562
diff
changeset
|
272 | EXPECT_EQ(strcmp((char *) cxMapGet(map, cx_hash_key_str("key 7")), "val 7"), 0); |
|
562
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
273 | |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
274 | cxMapDestroy(map); |
|
fd3368c20413
#189 #199 implement and test map rehash
Mike Becker <universe@uap-core.de>
parents:
561
diff
changeset
|
275 | EXPECT_TRUE(allocator.verify()); |
|
594
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
276 | } |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
277 | |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
278 | TEST(CxHashMap, Clear) { |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
279 | CxTestingAllocator allocator; |
|
669
dce9b8450656
add docs for CX_STORE_POINTERS and remove cxHashMapCreateForPointers()
Mike Becker <universe@uap-core.de>
parents:
668
diff
changeset
|
280 | auto map = cxHashMapCreate(&allocator, CX_STORE_POINTERS, 0); |
| 595 | 281 | |
|
594
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
282 | cxMapPut(map, cx_hash_key_str("key 1"), (void *) "val 1"); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
283 | cxMapPut(map, cx_hash_key_str("key 2"), (void *) "val 2"); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
284 | cxMapPut(map, cx_hash_key_str("key 3"), (void *) "val 3"); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
285 | |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
286 | EXPECT_EQ(map->size, 3); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
287 | |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
288 | cxMapClear(map); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
289 | |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
290 | EXPECT_EQ(map->size, 0); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
291 | EXPECT_EQ(cxMapGet(map, cx_hash_key_str("key 1")), nullptr); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
292 | EXPECT_EQ(cxMapGet(map, cx_hash_key_str("key 2")), nullptr); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
293 | EXPECT_EQ(cxMapGet(map, cx_hash_key_str("key 3")), nullptr); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
294 | |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
295 | cxMapDestroy(map); |
|
d90cfa6721f9
add test for cxMapClear()
Mike Becker <universe@uap-core.de>
parents:
563
diff
changeset
|
296 | EXPECT_TRUE(allocator.verify()); |
|
658
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
297 | } |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
298 | |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
299 | TEST(CxHashMap, StoreUcxStrings) { |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
300 | // create the map |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
301 | CxTestingAllocator allocator; |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
302 | auto map = cxHashMapCreate(&allocator, sizeof(cxstring), 8); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
303 | |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
304 | // define some strings |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
305 | cxstring s1 = CX_STR("this"); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
306 | cxstring s2 = CX_STR("is"); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
307 | cxstring s3 = CX_STR("a"); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
308 | cxstring s4 = CX_STR("test"); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
309 | cxstring s5 = CX_STR("setup"); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
310 | |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
311 | // put them into the map |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
312 | cxMapPut(map, cx_hash_key_str("s1"), &s1); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
313 | cxMapPut(map, cx_hash_key_str("s2"), &s2); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
314 | cxMapPut(map, cx_hash_key_str("s3"), &s3); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
315 | cxMapPut(map, cx_hash_key_str("s4"), &s4); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
316 | |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
317 | // overwrite a value |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
318 | cxMapPut(map, cx_hash_key_str("s1"), &s5); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
319 | |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
320 | // look up a string |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
321 | auto s3p = reinterpret_cast<cxstring *>(cxMapGet(map, cx_hash_key_str("s3"))); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
322 | EXPECT_EQ(s3p->length, s3.length); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
323 | EXPECT_EQ(s3p->ptr, s3.ptr); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
324 | EXPECT_NE(s3p, &s3); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
325 | |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
326 | // remove a string |
|
659
4a06fd63909a
split cxMapRemove() to cxMapRemoveAndGet()
Mike Becker <universe@uap-core.de>
parents:
658
diff
changeset
|
327 | cxMapRemove(map, cx_hash_key_str("s2")); |
|
658
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
328 | |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
329 | // iterate |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
330 | auto ref = std::vector{s5.ptr, s3.ptr, s4.ptr}; |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
331 | auto iter = cxMapIteratorValues(map); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
332 | cx_foreach(cxstring*, s, iter) { |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
333 | auto found = std::find(ref.begin(), ref.end(), s->ptr); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
334 | ASSERT_NE(found, ref.end()); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
335 | ref.erase(found); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
336 | } |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
337 | EXPECT_EQ(ref.size(), 0); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
338 | |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
339 | cxMapDestroy(map); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
340 | EXPECT_TRUE(allocator.verify()); |
|
56c62780582e
make hashmap store objects instead of pointers by default - fixes #239
Mike Becker <universe@uap-core.de>
parents:
653
diff
changeset
|
341 | } |