Josh Steadmon <steadmon@xxxxxxxxxx> writes:
>> +static void t_put(struct hashmap *map, int ignore_case)
>> +{
>> + struct test_entry *entry;
>> + const char *key_val[][2] = { { "key1", "value1" },
>> + { "key2", "value2" },
>> + { "fooBarFrotz", "value3" } };
>> +
>> + for (size_t i = 0; i < ARRAY_SIZE(key_val); i++) {
>> + entry = alloc_test_entry(ignore_case, key_val[i][0], key_val[i][1]);
>> + check(hashmap_put_entry(map, entry, ent) == NULL);
>> + }
>> +
>> + entry = alloc_test_entry(ignore_case, "foobarfrotz", "value4");
>> + entry = hashmap_put_entry(map, entry, ent);
>> + check(ignore_case ? entry != NULL : entry == NULL);
>> + free(entry);
>> +
>> + check_int(map->tablesize, ==, 64);
>> + check_int(hashmap_get_size(map), ==,
>> + ignore_case ? ARRAY_SIZE(key_val) : ARRAY_SIZE(key_val) + 1);
>> +}
>
> Ahhh, so you're using the same function for both case-sensitive and
> -insensitive tests. So I guess TEST_RUN isn't useful here after all.
> Personally I'd still rather get rid of setup(), but I don't feel super
> strongly about it.
Consulting the table with "fooBarFrotz" and checking what gets
returned (expect "value3" for !icase, or "value4" for icase) is one
of the things that are missing. In fact, the values stored are not
even checked with the above test at all.
>> +static void t_replace(struct hashmap *map, int ignore_case)
>> +{
>> + struct test_entry *entry;
>> +
>> + entry = alloc_test_entry(ignore_case, "key1", "value1");
>> + check(hashmap_put_entry(map, entry, ent) == NULL);
>> +
>> + entry = alloc_test_entry(ignore_case, ignore_case ? "Key1" : "key1",
>> + "value2");
>> + entry = hashmap_put_entry(map, entry, ent);
>> + if (check(entry != NULL))
>> + check_str(get_value(entry), "value1");
>> + free(entry);
>> +
>> + entry = alloc_test_entry(ignore_case, "fooBarFrotz", "value3");
>> + check(hashmap_put_entry(map, entry, ent) == NULL);
>> +
>> + entry = alloc_test_entry(ignore_case,
>> + ignore_case ? "foobarfrotz" : "fooBarFrotz",
>> + "value4");
Curious. If the hashmap is set up for icase use, do callers still
need to downcase the key? Shouldn't the library take care of that?
After all, test_entry_cmp() when the hashmap is being used in icase
mode does strcasecmp() anyway.
>> + entry = hashmap_put_entry(map, entry, ent);
>> + if (check(entry != NULL))
>> + check_str(get_value(entry), "value3");
Here the stored value is checked, which is good.
>> + free(entry);
>> +}
>> +
>> +static void t_get(struct hashmap *map, int ignore_case)
>> +{
>> + struct test_entry *entry;
>> + const char *key_val[][2] = { { "key1", "value1" },
>> + { "key2", "value2" },
>> + { "fooBarFrotz", "value3" },
>> + { ignore_case ? "key4" : "foobarfrotz", "value4" } };
>> + const char *query[][2] = {
>> + { ignore_case ? "Key1" : "key1", "value1" },
>> + { ignore_case ? "keY2" : "key2", "value2" },
>> + { ignore_case ? "foobarfrotz" : "fooBarFrotz", "value3" }
>> + };
>> +
>> + for (size_t i = 0; i < ARRAY_SIZE(key_val); i++) {
>> + entry = alloc_test_entry(ignore_case, key_val[i][0], key_val[i][1]);
>> + check(hashmap_put_entry(map, entry, ent) == NULL);
>> + }
>> +
>> + for (size_t i = 0; i < ARRAY_SIZE(query); i++) {
>> + entry = get_test_entry(map, ignore_case, query[i][0]);
>> + if (check(entry != NULL))
>> + check_str(get_value(entry), query[i][1]);
>> + }
>> +
>> + check(get_test_entry(map, ignore_case, "notInMap") == NULL);
>> +}
It is getting dubious if it is worth having t_put, when t_get does
so similar things and more.
Same comment applies wrt icase, and not limited to t_get() but all
the remaining test functions (elided).
Thanks.
