A first version of the xbt/random module

[simgrid.git] / src / xbt / dict_test.cpp

diff --git a/src/xbt/dict_test.cpp b/src/xbt/dict_test.cpp
index 6cd12ea..bd54663 100644 (file)
--- a/src/xbt/dict_test.cpp
+++ b/src/xbt/dict_test.cpp
@@ -10,16 +10,12 @@
 #include "simgrid/Exception.hpp"
 #include <cstdio>
 #include <cstring>
+#include <random>
 
 #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;
 
@@ -86,11 +82,7 @@ static void traverse(xbt_dict_t head)
   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));
-    }
+    INFO("Seen #" << ++i << ": " << STR(key) << "->" << STR(data));
     REQUIRE((key && data && strcmp(key, data) == 0)); //  key != value
   }
 }
@@ -98,7 +90,7 @@ static void traverse(xbt_dict_t head)
 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));
+  REQUIRE_THROWS_AS(xbt_dict_get(head, data), std::out_of_range);
 }
 
 static void count(xbt_dict_t dict, int length)
@@ -159,7 +151,7 @@ TEST_CASE("xbt::dict: dict data container", "dict")
     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");
@@ -231,7 +223,7 @@ TEST_CASE("xbt::dict: dict data container", "dict")
     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);
@@ -250,7 +242,7 @@ TEST_CASE("xbt::dict: dict data container", "dict")
     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);
@@ -258,7 +250,7 @@ TEST_CASE("xbt::dict: dict data container", "dict")
     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");
@@ -282,29 +274,25 @@ TEST_CASE("xbt::dict: dict data container", "dict")
     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_cursor_t cursor = nullptr;
+    char* key;
+    bool found = false;
+    char* data;
+
+    xbt_dict_foreach (head, cursor, key, data) {
+      INFO("Seen: " << STR(key) << "->" << STR(data));
+      if (key && strcmp(key, "null") == 0)
+        found = true;
     }
+    REQUIRE(found); // the key 'null', associated to nullptr is not found
+
     xbt_dict_free(&head);
   }
 
   SECTION("Crash test")
   {
-    srand((unsigned int)time(nullptr));
+    std::random_device rd;
+    std::default_random_engine rnd_engine(rd());
 
     for (int i = 0; i < 10; i++) {
       INFO("CRASH test number " << i + 1 << " (" << 10 - i - 1 << " to go)");
@@ -317,7 +305,7 @@ TEST_CASE("xbt::dict: dict data container", "dict")
 
         do {
           for (int k = 0; k < SIZEOFKEY - 1; k++) {
-            key[k] = rand() % ('z' - 'a') + 'a';
+            key[k] = rnd_engine() % ('z' - 'a') + 'a';
           }
           key[SIZEOFKEY - 1] = '\0';
           data               = (char*)xbt_dict_get_or_null(head, key);