From 2e6f84f33cb3de2fd4caa15b22953d84cbf56597 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 31 Jan 2019 21:25:26 +0100
Subject: [PATCH] Convert the unit tests of xbt::dict to Catch2.

---
 src/xbt/dict.cpp              | 420 ----------------------------------
 src/xbt/dict_test.cpp         | 394 +++++++++++++++++++++++++++++++
 tools/cmake/Tests.cmake       |   1 +
 tools/cmake/UnitTesting.cmake |   1 -
 4 files changed, 395 insertions(+), 421 deletions(-)
 create mode 100644 src/xbt/dict_test.cpp

diff --git a/src/xbt/dict.cpp b/src/xbt/dict.cpp
index 7a295c5b72..178b151bc7 100644
--- a/src/xbt/dict.cpp
+++ b/src/xbt/dict.cpp
@@ -452,423 +452,3 @@ void xbt_dict_postexit()
     dict_elm_mallocator = nullptr;
   }
 }
-
-#ifdef SIMGRID_TEST
-#include "simgrid/Exception.hpp"
-#include "src/internal_config.h"
-#include "xbt.h"
-#include "xbt/ex.h"
-#include <ctime>
-
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
-
-XBT_TEST_SUITE("dict", "Dict data container");
-
-static void debugged_add_ext(xbt_dict_t head, const char* key, const char* data_to_fill)
-{
-  char *data = xbt_strdup(data_to_fill);
-
-  xbt_test_log("Add %s under %s", data_to_fill, key);
-
-  xbt_dict_set(head, key, data, nullptr);
-  if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) {
-    xbt_dict_dump(head, [](void* s) { fputs((char*)s, stdout); });
-    fflush(stdout);
-  }
-}
-
-static void debugged_add(xbt_dict_t head, const char* key)
-{
-  debugged_add_ext(head, key, key);
-}
-
-static xbt_dict_t new_fixture()
-{
-  xbt_test_add("Fill in the dictionnary");
-
-  xbt_dict_t head = xbt_dict_new_homogeneous(&free);
-  debugged_add(head, "12");
-  debugged_add(head, "12a");
-  debugged_add(head, "12b");
-  debugged_add(head, "123");
-  debugged_add(head, "123456");
-  debugged_add(head, "1234");
-  debugged_add(head, "123457");
-
-  return head;
-}
-
-static void search_ext(xbt_dict_t head, const char *key, const char *data)
-{
-  xbt_test_add("Search %s", key);
-  char *found = (char*) xbt_dict_get(head, key);
-  xbt_test_log("Found %s", found);
-  if (data) {
-    xbt_test_assert(found, "data do not match expectations: found nullptr while searching for %s", data);
-    if (found)
-      xbt_test_assert(not strcmp(data, found), "data do not match expectations: found %s while searching for %s", found,
-                      data);
-  } else {
-    xbt_test_assert(not found, "data do not match expectations: found %s while searching for nullptr", found);
-  }
-}
-
-static void search(xbt_dict_t head, const char *key)
-{
-  search_ext(head, key, key);
-}
-
-static void debugged_remove(xbt_dict_t head, const char* key)
-{
-  xbt_test_add("Remove '%s'", key);
-  xbt_dict_remove(head, key);
-}
-
-static void traverse(xbt_dict_t head)
-{
-  xbt_dict_cursor_t cursor = nullptr;
-  char *key;
-  char *data;
-  int i = 0;
-
-  xbt_dict_foreach(head, cursor, key, data) {
-    if (not key || not data || strcmp(key, data)) {
-      xbt_test_log("Seen #%d:  %s->%s", ++i, key, data);
-    } else {
-      xbt_test_log("Seen #%d:  %s", ++i, key);
-    }
-    xbt_test_assert(key && data && strcmp(key, data) == 0, "Key(%s) != value(%s). Aborting", key, data);
-  }
-}
-
-static void search_not_found(xbt_dict_t head, const char *data)
-{
-  int ok = 0;
-  xbt_test_add("Search %s (expected not to be found)", data);
-
-  try {
-    data = (const char*) xbt_dict_get(head, data);
-    THROWF(unknown_error, 0, "Found something which shouldn't be there (%s)", data);
-  }
-  catch(xbt_ex& e) {
-    if (e.category != not_found_error)
-      xbt_test_exception(e);
-    ok = 1;
-  }
-  xbt_test_assert(ok, "Exception not raised");
-}
-
-static void count(xbt_dict_t dict, int length)
-{
-  xbt_test_add("Count elements (expecting %d)", length);
-  xbt_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length);
-
-  xbt_dict_cursor_t cursor;
-  char *key;
-  void *data;
-  int effective = 0;
-  xbt_dict_foreach(dict, cursor, key, data)
-      effective++;
-
-  xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length);
-}
-
-static void count_check_get_key(xbt_dict_t dict, int length)
-{
-  xbt_dict_cursor_t cursor;
-  char *key;
-  void *data;
-  int effective = 0;
-
-  xbt_test_add("Count elements (expecting %d), and test the getkey function", length);
-  xbt_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length);
-
-  xbt_dict_foreach(dict, cursor, key, data) {
-    effective++;
-    char* key2 = xbt_dict_get_key(dict, data);
-    xbt_assert(not strcmp(key, key2), "The data was registered under %s instead of %s as expected", key2, key);
-  }
-
-  xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length);
-}
-
-XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve and traverse homogeneous dicts")
-{
-  xbt_test_add("Traversal the null dictionary");
-  traverse(nullptr);
-
-  xbt_test_add("Traversal and search the empty dictionary");
-  xbt_dict_t head = xbt_dict_new_homogeneous(&free);
-  traverse(head);
-  try {
-    debugged_remove(head, "12346");
-  }
-  catch(xbt_ex& e) {
-    if (e.category != not_found_error)
-      xbt_test_exception(e);
-  }
-  xbt_dict_free(&head);
-
-  xbt_test_add("Traverse the full dictionary");
-  head = new_fixture();
-  count_check_get_key(head, 7);
-
-  debugged_add_ext(head, "toto", "tutu");
-  search_ext(head, "toto", "tutu");
-  debugged_remove(head, "toto");
-
-  search(head, "12a");
-  traverse(head);
-
-  xbt_test_add("Free the dictionary (twice)");
-  xbt_dict_free(&head);
-  xbt_dict_free(&head);
-
-  /* CHANGING */
-  head = new_fixture();
-  count_check_get_key(head, 7);
-  xbt_test_add("Change 123 to 'Changed 123'");
-  xbt_dict_set(head, "123", xbt_strdup("Changed 123"), nullptr);
-  count_check_get_key(head, 7);
-
-  xbt_test_add("Change 123 back to '123'");
-  xbt_dict_set(head, "123", xbt_strdup("123"), nullptr);
-  count_check_get_key(head, 7);
-
-  xbt_test_add("Change 12a to 'Dummy 12a'");
-  xbt_dict_set(head, "12a", xbt_strdup("Dummy 12a"), nullptr);
-  count_check_get_key(head, 7);
-
-  xbt_test_add("Change 12a to '12a'");
-  xbt_dict_set(head, "12a", xbt_strdup("12a"), nullptr);
-  count_check_get_key(head, 7);
-
-  xbt_test_add("Traverse the resulting dictionary");
-  traverse(head);
-
-  /* RETRIEVE */
-  xbt_test_add("Search 123");
-  char* data = (char*)xbt_dict_get(head, "123");
-  xbt_test_assert(data && strcmp("123", data) == 0);
-
-  search_not_found(head, "Can't be found");
-  search_not_found(head, "123 Can't be found");
-  search_not_found(head, "12345678 NOT");
-
-  search(head, "12a");
-  search(head, "12b");
-  search(head, "12");
-  search(head, "123456");
-  search(head, "1234");
-  search(head, "123457");
-
-  xbt_test_add("Traverse the resulting dictionary");
-  traverse(head);
-
-  xbt_test_add("Free the dictionary twice");
-  xbt_dict_free(&head);
-  xbt_dict_free(&head);
-
-  xbt_test_add("Traverse the resulting dictionary");
-  traverse(head);
-}
-
-XBT_TEST_UNIT("remove_homogeneous", test_dict_remove, "Removing some values from homogeneous dicts")
-{
-  xbt_dict_t head = new_fixture();
-  count(head, 7);
-  xbt_test_add("Remove non existing data");
-  try {
-    debugged_remove(head, "Does not exist");
-  }
-  catch(xbt_ex& e) {
-    if (e.category != not_found_error)
-      xbt_test_exception(e);
-  }
-  traverse(head);
-
-  xbt_dict_free(&head);
-
-  xbt_test_add("Remove each data manually (traversing the resulting dictionary each time)");
-  head = new_fixture();
-  debugged_remove(head, "12a");
-  traverse(head);
-  count(head, 6);
-  debugged_remove(head, "12b");
-  traverse(head);
-  count(head, 5);
-  debugged_remove(head, "12");
-  traverse(head);
-  count(head, 4);
-  debugged_remove(head, "123456");
-  traverse(head);
-  count(head, 3);
-  try {
-    debugged_remove(head, "12346");
-  }
-  catch(xbt_ex& e) {
-    if (e.category != not_found_error)
-      xbt_test_exception(e);
-    traverse(head);
-  }
-  debugged_remove(head, "1234");
-  traverse(head);
-  debugged_remove(head, "123457");
-  traverse(head);
-  debugged_remove(head, "123");
-  traverse(head);
-  try {
-    debugged_remove(head, "12346");
-  }
-  catch(xbt_ex& e) {
-    if (e.category != not_found_error)
-      xbt_test_exception(e);
-  }
-  traverse(head);
-
-  xbt_test_add("Free dict, create new fresh one, and then reset the dict");
-  xbt_dict_free(&head);
-  head = new_fixture();
-  xbt_dict_reset(head);
-  count(head, 0);
-  traverse(head);
-
-  xbt_test_add("Free the dictionary twice");
-  xbt_dict_free(&head);
-  xbt_dict_free(&head);
-}
-
-XBT_TEST_UNIT("nulldata", test_dict_nulldata, "nullptr data management")
-{
-  xbt_dict_t head = new_fixture();
-
-  xbt_test_add("Store nullptr under 'null'");
-  xbt_dict_set(head, "null", nullptr, nullptr);
-  search_ext(head, "null", nullptr);
-
-  xbt_test_add("Check whether I see it while traversing...");
-  {
-    xbt_dict_cursor_t cursor = nullptr;
-    char *key;
-    int found = 0;
-    char* data;
-
-    xbt_dict_foreach(head, cursor, key, data) {
-      if (not key || not data || strcmp(key, data)) {
-        xbt_test_log("Seen:  %s->%s", key, data);
-      } else {
-        xbt_test_log("Seen:  %s", key);
-      }
-
-      if (key && strcmp(key, "null") == 0)
-        found = 1;
-    }
-    xbt_test_assert(found, "the key 'null', associated to nullptr is not found");
-  }
-  xbt_dict_free(&head);
-}
-
-#define NB_ELM 20000
-#define SIZEOFKEY 1024
-static int countelems(xbt_dict_t head)
-{
-  xbt_dict_cursor_t cursor;
-  char *key;
-  void *data;
-  int res = 0;
-
-  xbt_dict_foreach(head, cursor, key, data) {
-    res++;
-  }
-  return res;
-}
-
-XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
-{
-  srand((unsigned int) time(nullptr));
-
-  for (int i = 0; i < 10; i++) {
-    xbt_test_add("CRASH test number %d (%d to go)", i + 1, 10 - i - 1);
-    xbt_test_log("Fill the struct, count its elems and frees the structure");
-    xbt_test_log("using 1000 elements with %d chars long randomized keys.", SIZEOFKEY);
-    xbt_dict_t head = xbt_dict_new_homogeneous(free);
-    for (int j = 0; j < 1000; j++) {
-      char* data = nullptr;
-      char* key  = (char*)xbt_malloc(SIZEOFKEY);
-
-      do {
-        for (int k         = 0; k < SIZEOFKEY - 1; k++)
-          key[k] = rand() % ('z' - 'a') + 'a';
-        key[SIZEOFKEY - 1] = '\0';
-        data = (char*) xbt_dict_get_or_null(head, key);
-      } while (data != nullptr);
-
-      xbt_dict_set(head, key, key, nullptr);
-      data = (char*) xbt_dict_get(head, key);
-      xbt_test_assert(not strcmp(key, data), "Retrieved value (%s) != Injected value (%s)", key, data);
-
-      count(head, j + 1);
-    }
-    traverse(head);
-    xbt_dict_free(&head);
-    xbt_dict_free(&head);
-  }
-
-  xbt_dict_t head = xbt_dict_new_homogeneous(&free);
-  xbt_test_add("Fill %d elements, with keys being the number of element", NB_ELM);
-  for (int j = 0; j < NB_ELM; j++) {
-    char* key = (char*)xbt_malloc(10);
-
-    snprintf(key,10, "%d", j);
-    xbt_dict_set(head, key, key, nullptr);
-  }
-
-  xbt_test_add("Count the elements (retrieving the key and data for each)");
-  xbt_test_log("There is %d elements", countelems(head));
-
-  xbt_test_add("Search my %d elements 20 times", NB_ELM);
-  char* key = (char*)xbt_malloc(10);
-  for (int i = 0; i < 20; i++) {
-    for (int j = 0; j < NB_ELM; j++) {
-      snprintf(key,10, "%d", j);
-      void* data = xbt_dict_get(head, key);
-      xbt_test_assert(not strcmp(key, (char*)data), "with get, key=%s != data=%s", key, (char*)data);
-      data = xbt_dict_get_ext(head, key, strlen(key));
-      xbt_test_assert(not strcmp(key, (char*)data), "with get_ext, key=%s != data=%s", key, (char*)data);
-    }
-  }
-  free(key);
-
-  xbt_test_add("Remove my %d elements", NB_ELM);
-  key = (char*) xbt_malloc(10);
-  for (int j = 0; j < NB_ELM; j++) {
-    snprintf(key,10, "%d", j);
-    xbt_dict_remove(head, key);
-  }
-  free(key);
-
-  xbt_test_add("Free the object (twice)");
-  xbt_dict_free(&head);
-  xbt_dict_free(&head);
-}
-
-XBT_TEST_UNIT("ext", test_dict_int, "Test dictionnary with int keys")
-{
-  xbt_dict_t dict = xbt_dict_new_homogeneous(nullptr);
-  int count = 500;
-
-  xbt_test_add("Insert elements");
-  for (int i = 0; i < count; ++i)
-    xbt_dict_set_ext(dict, (char*) &i, sizeof(i), (void*) (intptr_t) i, nullptr);
-  xbt_test_assert(xbt_dict_size(dict) == (unsigned) count, "Bad number of elements in the dictionnary");
-
-  xbt_test_add("Check elements");
-  for (int i = 0; i < count; ++i) {
-    int res = (int) (intptr_t) xbt_dict_get_ext(dict, (char*) &i, sizeof(i));
-    xbt_test_assert(xbt_dict_size(dict) == (unsigned) count, "Unexpected value at index %i, expected %i but was %i", i, i, res);
-  }
-
-  xbt_test_add("Free the array");
-  xbt_dict_free(&dict);
-}
-#endif                          /* SIMGRID_TEST */
diff --git a/src/xbt/dict_test.cpp b/src/xbt/dict_test.cpp
new file mode 100644
index 0000000000..6cd12ea5d9
--- /dev/null
+++ b/src/xbt/dict_test.cpp
@@ -0,0 +1,394 @@
+/* dict - a generic dictionary, variation over hash table                   */
+
+/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include "xbt/dict.h"
+
+#include "simgrid/Exception.hpp"
+#include <cstdio>
+#include <cstring>
+
+#include "catch.hpp"
+
+#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;
+
+static void debugged_add_ext(xbt_dict_t head, const char* key, const char* data_to_fill)
+{
+  char* data = xbt_strdup(data_to_fill);
+
+  INFO("Add " << STR(data_to_fill) << " under " << STR(key));
+
+  xbt_dict_set(head, key, data, nullptr);
+}
+
+static void debugged_add(xbt_dict_t head, const char* key)
+{
+  debugged_add_ext(head, key, key);
+}
+
+static xbt_dict_t new_fixture()
+{
+  INFO("Fill in the dictionary");
+
+  xbt_dict_t head = xbt_dict_new_homogeneous(&free);
+  debugged_add(head, "12");
+  debugged_add(head, "12a");
+  debugged_add(head, "12b");
+  debugged_add(head, "123");
+  debugged_add(head, "123456");
+  debugged_add(head, "1234");
+  debugged_add(head, "123457");
+
+  return head;
+}
+
+static void search_ext(xbt_dict_t head, const char* key, const char* data)
+{
+  INFO("Search " << STR(key));
+  char* found = (char*)xbt_dict_get(head, key);
+  INFO("Found " << STR(found));
+  if (data) {
+    REQUIRE(found); // data do not match expectations: found null while searching for data
+    if (found)
+      REQUIRE(not strcmp(data, found)); // data do not match expectations: found another string while searching for data
+  } else {
+    REQUIRE(not found); // data do not match expectations: found something while searching for null
+  }
+}
+
+static void search(xbt_dict_t head, const char* key)
+{
+  search_ext(head, key, key);
+}
+
+static void debugged_remove(xbt_dict_t head, const char* key)
+{
+  INFO("Remove '" << STR(key) << "'");
+  xbt_dict_remove(head, key);
+}
+
+static void traverse(xbt_dict_t head)
+{
+  xbt_dict_cursor_t cursor = nullptr;
+  char* key;
+  char* data;
+  int i = 0;
+
+  xbt_dict_foreach (head, cursor, key, data) {
+    if (not key || not data || strcmp(key, data)) {
+      INFO("Seen #" << ++i << ": " << STR(key) << "->" << STR(data));
+    } else {
+      INFO("Seen #" << ++i << ": " << STR(key));
+    }
+    REQUIRE((key && data && strcmp(key, data) == 0)); //  key != value
+  }
+}
+
+static void search_not_found(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));
+}
+
+static void count(xbt_dict_t dict, int length)
+{
+  INFO("Count elements (expecting " << length << ")");
+  REQUIRE(xbt_dict_length(dict) == length); // Announced length differs
+
+  xbt_dict_cursor_t cursor;
+  char* key;
+  void* data;
+  int effective = 0;
+  xbt_dict_foreach (dict, cursor, key, data)
+    effective++;
+
+  REQUIRE(effective == length); // Effective length differs
+}
+
+static void count_check_get_key(xbt_dict_t dict, int length)
+{
+  xbt_dict_cursor_t cursor;
+  char* key;
+  void* data;
+  int effective = 0;
+
+  INFO("Count elements (expecting " << length << "), and test the getkey function");
+  REQUIRE(xbt_dict_length(dict) == length); // Announced length differs
+
+  xbt_dict_foreach (dict, cursor, key, data) {
+    effective++;
+    char* key2 = xbt_dict_get_key(dict, data);
+    xbt_assert(not strcmp(key, key2), "The data was registered under %s instead of %s as expected", key2, key);
+  }
+
+  REQUIRE(effective == length); // Effective length differs
+}
+
+static int countelems(xbt_dict_t head)
+{
+  xbt_dict_cursor_t cursor;
+  char* key;
+  void* data;
+  int res = 0;
+
+  xbt_dict_foreach (head, cursor, key, data) {
+    res++;
+  }
+  return res;
+}
+
+TEST_CASE("xbt::dict: dict data container", "dict")
+{
+
+  SECTION("Basic usage: change, retrieve and traverse homogeneous dicts")
+  {
+    INFO("Traversal the null dictionary");
+    traverse(nullptr);
+
+    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"));
+    xbt_dict_free(&head);
+
+    INFO("Traverse the full dictionary");
+    head = new_fixture();
+    count_check_get_key(head, 7);
+
+    debugged_add_ext(head, "toto", "tutu");
+    search_ext(head, "toto", "tutu");
+    debugged_remove(head, "toto");
+
+    search(head, "12a");
+    traverse(head);
+
+    INFO("Free the dictionary (twice)");
+    xbt_dict_free(&head);
+    xbt_dict_free(&head);
+
+    /* CHANGING */
+    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);
+    count_check_get_key(head, 7);
+
+    INFO("Change 123 back to '123'");
+    xbt_dict_set(head, "123", xbt_strdup("123"), nullptr);
+    count_check_get_key(head, 7);
+
+    INFO("Change 12a to 'Dummy 12a'");
+    xbt_dict_set(head, "12a", xbt_strdup("Dummy 12a"), nullptr);
+    count_check_get_key(head, 7);
+
+    INFO("Change 12a to '12a'");
+    xbt_dict_set(head, "12a", xbt_strdup("12a"), nullptr);
+    count_check_get_key(head, 7);
+
+    INFO("Traverse the resulting dictionary");
+    traverse(head);
+
+    /* RETRIEVE */
+    INFO("Search 123");
+    char* data = (char*)xbt_dict_get(head, "123");
+    REQUIRE((data && strcmp("123", data) == 0));
+
+    search_not_found(head, "Can't be found");
+    search_not_found(head, "123 Can't be found");
+    search_not_found(head, "12345678 NOT");
+
+    search(head, "12a");
+    search(head, "12b");
+    search(head, "12");
+    search(head, "123456");
+    search(head, "1234");
+    search(head, "123457");
+
+    INFO("Traverse the resulting dictionary");
+    traverse(head);
+
+    INFO("Free the dictionary twice");
+    xbt_dict_free(&head);
+    xbt_dict_free(&head);
+
+    INFO("Traverse the resulting dictionary");
+    traverse(head);
+  }
+
+  SECTION("Removing some values from homogeneous dicts")
+  {
+    xbt_dict_t head = new_fixture();
+    count(head, 7);
+    INFO("Remove non existing data");
+    REQUIRE_THROWS_XBT_EX(debugged_remove(head, "Does not exist"));
+    traverse(head);
+
+    xbt_dict_free(&head);
+
+    INFO("Remove each data manually (traversing the resulting dictionary each time)");
+    head = new_fixture();
+    debugged_remove(head, "12a");
+    traverse(head);
+    count(head, 6);
+    debugged_remove(head, "12b");
+    traverse(head);
+    count(head, 5);
+    debugged_remove(head, "12");
+    traverse(head);
+    count(head, 4);
+    debugged_remove(head, "123456");
+    traverse(head);
+    count(head, 3);
+    REQUIRE_THROWS_XBT_EX(debugged_remove(head, "12346"));
+    traverse(head);
+    debugged_remove(head, "1234");
+    traverse(head);
+    debugged_remove(head, "123457");
+    traverse(head);
+    debugged_remove(head, "123");
+    traverse(head);
+    REQUIRE_THROWS_XBT_EX(debugged_remove(head, "12346"));
+    traverse(head);
+
+    INFO("Free dict, create new fresh one, and then reset the dict");
+    xbt_dict_free(&head);
+    head = new_fixture();
+    xbt_dict_reset(head);
+    count(head, 0);
+    traverse(head);
+
+    INFO("Free the dictionary twice");
+    xbt_dict_free(&head);
+    xbt_dict_free(&head);
+  }
+
+  SECTION("nullptr data management")
+  {
+    xbt_dict_t head = new_fixture();
+
+    INFO("Store nullptr under 'null'");
+    xbt_dict_set(head, "null", nullptr, nullptr);
+    search_ext(head, "null", nullptr);
+
+    INFO("Check whether I see it while traversing...");
+    {
+      xbt_dict_cursor_t cursor = nullptr;
+      char* key;
+      int found = 0;
+      char* data;
+
+      xbt_dict_foreach (head, cursor, key, data) {
+        if (not key || not data || strcmp(key, data)) {
+          INFO("Seen: " << STR(key) << "->" << STR(data));
+        } else {
+          INFO("Seen: " << STR(key));
+        }
+        if (key && strcmp(key, "null") == 0)
+          found = 1;
+      }
+      REQUIRE(found); // the key 'null', associated to nullptr is not found
+    }
+    xbt_dict_free(&head);
+  }
+
+  SECTION("Crash test")
+  {
+    srand((unsigned int)time(nullptr));
+
+    for (int i = 0; i < 10; i++) {
+      INFO("CRASH test number " << i + 1 << " (" << 10 - i - 1 << " to go)");
+      INFO("Fill the struct, count its elems and frees the structure");
+      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;
+        char* key  = (char*)xbt_malloc(SIZEOFKEY);
+
+        do {
+          for (int k = 0; k < SIZEOFKEY - 1; k++) {
+            key[k] = rand() % ('z' - 'a') + 'a';
+          }
+          key[SIZEOFKEY - 1] = '\0';
+          data               = (char*)xbt_dict_get_or_null(head, key);
+        } while (data != nullptr);
+
+        xbt_dict_set(head, key, key, nullptr);
+        data = (char*)xbt_dict_get(head, key);
+        REQUIRE(not strcmp(key, data)); // Retrieved value != Injected value
+
+        count(head, j + 1);
+      }
+      traverse(head);
+      xbt_dict_free(&head);
+      xbt_dict_free(&head);
+    }
+
+    xbt_dict_t head = xbt_dict_new_homogeneous(&free);
+    INFO("Fill " << NB_ELM << " elements, with keys being the number of element");
+    for (int j = 0; j < NB_ELM; j++) {
+      char* key = (char*)xbt_malloc(10);
+
+      snprintf(key, 10, "%d", j);
+      xbt_dict_set(head, key, key, nullptr);
+    }
+
+    INFO("Count the elements (retrieving the key and data for each)");
+    INFO("There is " << countelems(head) << " elements");
+
+    INFO("Search my " << NB_ELM << " elements 20 times");
+    char* key = (char*)xbt_malloc(10);
+    for (int i = 0; i < 20; i++) {
+      for (int j = 0; j < NB_ELM; j++) {
+        snprintf(key, 10, "%d", j);
+        void* data = xbt_dict_get(head, key);
+        REQUIRE(not strcmp(key, (char*)data)); // with get, key != data
+        data = xbt_dict_get_ext(head, key, strlen(key));
+        REQUIRE(not strcmp(key, (char*)data)); // with get_ext, key != data
+      }
+    }
+    xbt_free(key);
+
+    INFO("Remove my " << NB_ELM << " elements");
+    key = (char*)xbt_malloc(10);
+    for (int j = 0; j < NB_ELM; j++) {
+      snprintf(key, 10, "%d", j);
+      xbt_dict_remove(head, key);
+    }
+    xbt_free(key);
+
+    INFO("Free the object (twice)");
+    xbt_dict_free(&head);
+    xbt_dict_free(&head);
+  }
+
+  SECTION("Test dictionnary 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
+
+    INFO("Check elements");
+    for (int i = 0; i < count; ++i) {
+      xbt_dict_get_ext(dict, (char*)&i, sizeof(i));
+      REQUIRE(xbt_dict_size(dict) == (unsigned)count); // Unexpected value at index i
+    }
+
+    INFO("Free the array");
+    xbt_dict_free(&dict);
+  }
+}
diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 213f233ce6..9122e2476b 100644
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -124,6 +124,7 @@ ADD_TEST(testall                                 ${CMAKE_BINARY_DIR}/testall)
 
 # New tests should use the Catch Framework
 set(UNIT_TESTS  src/surf/trace_mgr_test.cpp
+                src/xbt/dict_test.cpp
                 src/xbt/dynar_test.cpp)
 if (SIMGRID_HAVE_MC)
   set(UNIT_TESTS ${UNIT_TESTS} src/mc/sosp/mc_snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
diff --git a/tools/cmake/UnitTesting.cmake b/tools/cmake/UnitTesting.cmake
index a23de9d30d..85e80f5411 100644
--- a/tools/cmake/UnitTesting.cmake
+++ b/tools/cmake/UnitTesting.cmake
@@ -6,7 +6,6 @@
 
 set(FILES_CONTAINING_UNITTESTS
   src/xbt/cunit.cpp
-  src/xbt/dict.cpp
   src/xbt/xbt_str.cpp
   src/xbt/config.cpp
 )
-- 
2.20.1