pnoltes commented on code in PR #470:
URL: https://github.com/apache/celix/pull/470#discussion_r1389236742
##########
libs/utils/gtest/src/HashMapTestSuite.cc:
##########
@@ -534,25 +514,159 @@ TEST_F(HashMapTestSuite, IterateWithRemoveTest) {
auto iter2 = celix_longHashMap_begin(lMap);
while (!celix_longHashMapIterator_isEnd(&iter2)) {
if (iter2.index % 2 == 0) {
- //note only removing entries where the iter index is even
+ // note only removing entries where the iter index is even
celix_longHashMapIterator_remove(&iter2);
} else {
celix_longHashMapIterator_next(&iter2);
}
}
EXPECT_EQ(3, celix_longHashMap_size(lMap));
EXPECT_TRUE(celix_longHashMapIterator_isEnd(&iter2));
- celix_longHashMapIterator_next(&iter2); //calling next on end iter, does
nothing
+ celix_longHashMapIterator_next(&iter2); // calling next on end iter, does
nothing
EXPECT_TRUE(celix_longHashMapIterator_isEnd(&iter2));
celix_longHashMap_destroy(lMap);
}
-TEST_F(HashMapTestSuite, StringHashMapCleanup) {
+TEST_F(HashMapTestSuite, IterateEndTest) {
+ auto* sMap1 = createStringHashMap(0);
+ auto* sMap2 = createStringHashMap(6);
+ auto* lMap1 = createLongHashMap(0);
+ auto* lMap2 = createLongHashMap(6);
+
+ auto sIter1 = celix_stringHashMap_end(sMap1);
+ auto sIter2 = celix_stringHashMap_end(sMap2);
+ auto lIter1 = celix_longHashMap_end(lMap1);
+ auto lIter2 = celix_longHashMap_end(lMap2);
+
+ EXPECT_EQ(sIter1.index, 0);
+ EXPECT_EQ(sIter2.index, 6);
+ EXPECT_EQ(lIter1.index, 0);
+ EXPECT_EQ(lIter2.index, 6);
+ EXPECT_TRUE(celix_stringHashMapIterator_isEnd(&sIter1));
+ EXPECT_TRUE(celix_stringHashMapIterator_isEnd(&sIter2));
+ EXPECT_TRUE(celix_longHashMapIterator_isEnd(&lIter1));
+ EXPECT_TRUE(celix_longHashMapIterator_isEnd(&lIter2));
+
+ celix_stringHashMap_destroy(sMap1);
+ celix_stringHashMap_destroy(sMap2);
+ celix_longHashMap_destroy(lMap1);
+ celix_longHashMap_destroy(lMap2);
+}
+
+TEST_F(HashMapTestSuite, EqualsTest) {
+ auto* sMap = createStringHashMap(2);
+ auto sIter1 = celix_stringHashMap_begin(sMap);
+ auto sIter2 = celix_stringHashMap_begin(sMap);
+
+ // Test equal iterators
+ EXPECT_TRUE(celix_stringHashMapIterator_equals(&sIter1, &sIter2));
+
+ // Test unequal iterators after only 1 modification
+ celix_stringHashMapIterator_next(&sIter1);
+ EXPECT_FALSE(celix_stringHashMapIterator_equals(&sIter1, &sIter2));
+
+ // Test equal iterators after both modification
+ celix_stringHashMapIterator_next(&sIter2);
+ EXPECT_TRUE(celix_stringHashMapIterator_equals(&sIter1, &sIter2));
+
+ // Same for long hash map
+ auto* lMap = createLongHashMap(1);
+ auto lIter1 = celix_longHashMap_begin(lMap);
+ auto lIter2 = celix_longHashMap_begin(lMap);
+
+ // Test equal iterators
+ EXPECT_TRUE(celix_longHashMapIterator_equals(&lIter1, &lIter2));
+
+ // Test unequal iterators after only 1 modification
+ celix_longHashMapIterator_next(&lIter1);
+ EXPECT_FALSE(celix_longHashMapIterator_equals(&lIter1, &lIter2));
+
+ // Test equal iterators after both modification
+ celix_longHashMapIterator_next(&lIter2);
+ EXPECT_TRUE(celix_longHashMapIterator_equals(&lIter1, &lIter2));
+
+ celix_stringHashMap_destroy(sMap);
+ celix_longHashMap_destroy(lMap);
+}
+
+TEST_F(HashMapTestSuite, EqualsZeroSizeMapTest) {
+ // Because map size is 0, begin iter should equal end iter
+ auto* sMap = createStringHashMap(0);
+ auto sIter1 = celix_stringHashMap_begin(sMap);
+ auto sEnd = celix_stringHashMap_end(sMap);
+ EXPECT_TRUE(celix_stringHashMapIterator_equals(&sIter1, &sEnd));
+
+ // Because map size is 0, begin iter should equal end iter
+ auto* lMap = createLongHashMap(0);
+ auto lIter1 = celix_longHashMap_begin(lMap);
+ auto lEnd = celix_longHashMap_end(lMap);
+ EXPECT_TRUE(celix_longHashMapIterator_equals(&lIter1, &lEnd));
+
+ celix_stringHashMap_destroy(sMap);
+ celix_longHashMap_destroy(lMap);
+}
+
+TEST_F(HashMapTestSuite, StoreKeysWeaklyTest) {
+ celix_string_hash_map_create_options_t opts{};
+ opts.removedCallbackData = (void*)0x1;
+ opts.storeKeysWeakly = true;
+ opts.removedKeyCallback = [](void* data, char* key) {
+ EXPECT_EQ(data, (void*)0x1);
+ free(key);
+ };
+ auto* sMap = celix_stringHashMap_createWithOptions(&opts);
+ EXPECT_FALSE(celix_stringHashMap_putLong(sMap, celix_utils_strdup("key1"),
1)); // new key -> takes ownership
Review Comment:
The tests have been updated for the changed return type.
But I think the `pts.removedKeyCallback` documentation is still valid and
not changed, or am I missing something?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@celix.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
