#define STR(str) ((str) ? (str) : "(null)")
-#define REQUIRE_THROWS_XBT_EX(...) \
- REQUIRE_THROWS_MATCHES((__VA_ARGS__), xbt_ex, Catch::Matchers::Predicate<xbt_ex>( \
- [](xbt_ex const& e) { return e.category == not_found_error; }, \
- "category not_found_error"))
-
static constexpr int NB_ELM = 20000;
static constexpr int SIZEOFKEY = 1024;
INFO("Add " << STR(data_to_fill) << " under " << STR(key));
- xbt_dict_set(head, key, data, nullptr);
+ xbt_dict_set(head, key, data);
}
static void debugged_add(xbt_dict_t head, const char* key)
return head;
}
-static void search_ext(xbt_dict_t head, const char* key, const char* data)
+static void search_ext(const_xbt_dict_t head, const char* key, const char* data)
{
INFO("Search " << STR(key));
char* found = (char*)xbt_dict_get(head, key);
}
}
-static void search(xbt_dict_t head, const char* key)
+static void search(const_xbt_dict_t head, const char* key)
{
search_ext(head, key, key);
}
xbt_dict_remove(head, key);
}
-static void traverse(xbt_dict_t head)
+static void traverse(const_xbt_dict_t head)
{
xbt_dict_cursor_t cursor = nullptr;
char* key;
}
}
-static void search_not_found(xbt_dict_t head, const char* data)
+static void search_not_found(const_xbt_dict_t head, const char* data)
{
INFO("Search " << STR(data) << " (expected not to be found)");
- REQUIRE_THROWS_XBT_EX(data = (const char*)xbt_dict_get(head, data));
+ REQUIRE_THROWS_AS(xbt_dict_get(head, data), std::out_of_range);
}
-static void count(xbt_dict_t dict, int length)
+static void count(const_xbt_dict_t dict, int length)
{
INFO("Count elements (expecting " << length << ")");
REQUIRE(xbt_dict_length(dict) == length); // Announced length differs
REQUIRE(effective == length); // Effective length differs
}
-static void count_check_get_key(xbt_dict_t dict, int length)
+static void count_check_get_key(const_xbt_dict_t dict, int length)
{
xbt_dict_cursor_t cursor;
char* key;
REQUIRE(effective == length); // Effective length differs
}
-static int countelems(xbt_dict_t head)
+static int countelems(const_xbt_dict_t head)
{
xbt_dict_cursor_t cursor;
char* key;
TEST_CASE("xbt::dict: dict data container", "dict")
{
-
SECTION("Basic usage: change, retrieve and traverse homogeneous dicts")
{
INFO("Traversal the null dictionary");
INFO("Traversal and search the empty dictionary");
xbt_dict_t head = xbt_dict_new_homogeneous(&free);
traverse(head);
- REQUIRE_THROWS_XBT_EX(debugged_remove(head, "12346"));
+ REQUIRE_THROWS_AS(debugged_remove(head, "12346"), std::out_of_range);
xbt_dict_free(&head);
INFO("Traverse the full dictionary");
head = new_fixture();
count_check_get_key(head, 7);
INFO("Change 123 to 'Changed 123'");
- xbt_dict_set(head, "123", xbt_strdup("Changed 123"), nullptr);
+ xbt_dict_set(head, "123", xbt_strdup("Changed 123"));
count_check_get_key(head, 7);
INFO("Change 123 back to '123'");
- xbt_dict_set(head, "123", xbt_strdup("123"), nullptr);
+ xbt_dict_set(head, "123", xbt_strdup("123"));
count_check_get_key(head, 7);
INFO("Change 12a to 'Dummy 12a'");
- xbt_dict_set(head, "12a", xbt_strdup("Dummy 12a"), nullptr);
+ xbt_dict_set(head, "12a", xbt_strdup("Dummy 12a"));
count_check_get_key(head, 7);
INFO("Change 12a to '12a'");
- xbt_dict_set(head, "12a", xbt_strdup("12a"), nullptr);
+ xbt_dict_set(head, "12a", xbt_strdup("12a"));
count_check_get_key(head, 7);
INFO("Traverse the resulting dictionary");
/* RETRIEVE */
INFO("Search 123");
- char* data = (char*)xbt_dict_get(head, "123");
+ const char* data = (char*)xbt_dict_get(head, "123");
REQUIRE((data && strcmp("123", data) == 0));
search_not_found(head, "Can't be found");
xbt_dict_t head = new_fixture();
count(head, 7);
INFO("Remove non existing data");
- REQUIRE_THROWS_XBT_EX(debugged_remove(head, "Does not exist"));
+ REQUIRE_THROWS_AS(debugged_remove(head, "Does not exist"), std::out_of_range);
traverse(head);
xbt_dict_free(&head);
debugged_remove(head, "123456");
traverse(head);
count(head, 3);
- REQUIRE_THROWS_XBT_EX(debugged_remove(head, "12346"));
+ REQUIRE_THROWS_AS(debugged_remove(head, "12346"), std::out_of_range);
traverse(head);
debugged_remove(head, "1234");
traverse(head);
traverse(head);
debugged_remove(head, "123");
traverse(head);
- REQUIRE_THROWS_XBT_EX(debugged_remove(head, "12346"));
+ REQUIRE_THROWS_AS(debugged_remove(head, "12346"), std::out_of_range);
traverse(head);
INFO("Free dict, create new fresh one, and then reset the dict");
xbt_dict_t head = new_fixture();
INFO("Store nullptr under 'null'");
- xbt_dict_set(head, "null", nullptr, nullptr);
+ xbt_dict_set(head, "null", nullptr);
search_ext(head, "null", nullptr);
INFO("Check whether I see it while traversing...");
INFO("using 1000 elements with " << SIZEOFKEY << " chars long randomized keys.");
xbt_dict_t head = xbt_dict_new_homogeneous(free);
for (int j = 0; j < 1000; j++) {
- char* data = nullptr;
+ const char* data = nullptr;
char* key = (char*)xbt_malloc(SIZEOFKEY);
do {
data = (char*)xbt_dict_get_or_null(head, key);
} while (data != nullptr);
- xbt_dict_set(head, key, key, nullptr);
+ xbt_dict_set(head, key, key);
data = (char*)xbt_dict_get(head, key);
REQUIRE(not strcmp(key, data)); // Retrieved value != Injected value
char* key = (char*)xbt_malloc(10);
snprintf(key, 10, "%d", j);
- xbt_dict_set(head, key, key, nullptr);
+ xbt_dict_set(head, key, key);
}
INFO("Count the elements (retrieving the key and data for each)");
xbt_dict_free(&head);
}
- SECTION("Test dictionnary with int keys")
+ SECTION("Test dictionary with int keys")
{
xbt_dict_t dict = xbt_dict_new_homogeneous(nullptr);
int count = 500;
INFO("Insert elements");
for (int i = 0; i < count; ++i)
- xbt_dict_set_ext(dict, (char*)&i, sizeof(i), (void*)(intptr_t)i, nullptr);
- REQUIRE(xbt_dict_size(dict) == (unsigned)count); // Bad number of elements in the dictionnary
+ xbt_dict_set_ext(dict, (char*)&i, sizeof(i), (void*)(intptr_t)i);
+ REQUIRE(xbt_dict_size(dict) == (unsigned)count); // Bad number of elements in the dictionary
INFO("Check elements");
for (int i = 0; i < count; ++i) {