use catch2 way of doing this

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

diff --git a/src/xbt/random_test.cpp b/src/xbt/random_test.cpp
index c93049b8b0eebb35815242aa26fd1edf71fcd737..c35943ed01b28a639aaeb9b0a5a98761e08b7cac 100644 (file)
--- a/src/xbt/random_test.cpp
+++ b/src/xbt/random_test.cpp
@@ -6,16 +6,38 @@
 #include "src/include/catch.hpp"
 #include "xbt/log.h"
 #include "xbt/random.hpp"
+#include <random>
+#include <cmath>
+
+#define EPSILON (100*std::numeric_limits<double>::epsilon())
 
 TEST_CASE("xbt::random: Random Number Generation")
 {
-  SECTION("Random")
+  SECTION("Using XBT_RNG_xbt")
   {
     simgrid::xbt::random::set_mersenne_seed(12345);
-
-    REQUIRE(simgrid::xbt::random::exponential(25) == 0.00291934351538427348);
+    REQUIRE(simgrid::xbt::random::exponential(25) == Approx(0.00291934351538427348).epsilon(EPSILON));
     REQUIRE(simgrid::xbt::random::uniform_int(1, 6) == 4);
-    REQUIRE(simgrid::xbt::random::uniform_real(0, 1) == 0.31637556043369124970);
-    REQUIRE(simgrid::xbt::random::normal(0, 2) == 1.62746784745133976635);
+    REQUIRE(simgrid::xbt::random::uniform_real(0, 1) == Approx(0.31637556043369124970).epsilon(EPSILON));
+    REQUIRE(simgrid::xbt::random::normal(0, 2) == Approx(1.62746784745133976635).epsilon(EPSILON));
+  }
+
+  SECTION("Using XBT_RNG_std")
+  {
+    std::mt19937 gen;
+    gen.seed(12345);
+
+    simgrid::xbt::random::set_mersenne_seed(12345);
+    simgrid::xbt::random::set_implem_std();
+
+    std::exponential_distribution<> distA(25);
+    std::uniform_int_distribution<> distB(1, 6);
+    std::uniform_real_distribution<> distC(0, 1);
+    std::normal_distribution<> distD(0, 2);
+
+    REQUIRE(simgrid::xbt::random::exponential(25) == Approx(distA(gen)).epsilon(EPSILON));
+    REQUIRE(simgrid::xbt::random::uniform_int(1, 6) == distB(gen));
+    REQUIRE(simgrid::xbt::random::uniform_real(0, 1) == Approx(distC(gen)).epsilon(EPSILON));
+    REQUIRE(simgrid::xbt::random::normal(0, 2) == Approx(distD(gen)).epsilon(EPSILON));
   }
 }