X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08e7455d67920bbd7a87f440d00f2c1e071314a0..3e9453209f1da7deb92fe629428e49f3528217bd:/src/xbt/random_test.cpp

diff --git a/src/xbt/random_test.cpp b/src/xbt/random_test.cpp
index 76bf59e387..e5f23befb4 100644
--- a/src/xbt/random_test.cpp
+++ b/src/xbt/random_test.cpp
@@ -1,13 +1,13 @@
-/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2019-2023. 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 "src/include/catch.hpp"
+#include "src/3rd-party/catch.hpp"
 #include "xbt/log.h"
 #include "xbt/random.hpp"
-#include <random>
 #include <cmath>
+#include <random>
 
 #define EpsilonApprox(a) Catch::Matchers::WithinAbs((a), 100 * std::numeric_limits<double>::epsilon())
 
@@ -21,6 +21,18 @@ TEST_CASE("xbt::random: Random Number Generation")
     REQUIRE(simgrid::xbt::random::uniform_int(1, 6) == 4);
     REQUIRE_THAT(simgrid::xbt::random::uniform_real(0, 1), EpsilonApprox(0.31637556043369124970));
     REQUIRE_THAT(simgrid::xbt::random::normal(0, 2), EpsilonApprox(1.62746784745133976635));
+
+    constexpr int imin = std::numeric_limits<int>::min();
+    constexpr int imax = std::numeric_limits<int>::max();
+    REQUIRE(simgrid::xbt::random::uniform_int(0, 0) == 0);
+    REQUIRE(simgrid::xbt::random::uniform_int(imin, imin) == imin);
+    REQUIRE(simgrid::xbt::random::uniform_int(imax, imax) == imax);
+
+    REQUIRE(simgrid::xbt::random::uniform_int(-6, -1) == -3);
+    REQUIRE(simgrid::xbt::random::uniform_int(-10, 10) == 7);
+    REQUIRE(simgrid::xbt::random::uniform_int(imin, 2) == -163525263);
+    REQUIRE(simgrid::xbt::random::uniform_int(-2, imax) == 1605979225);
+    REQUIRE(simgrid::xbt::random::uniform_int(imin, imax) == 659577591);
   }
 
   SECTION("Using XBT_RNG_std")
@@ -31,10 +43,10 @@ TEST_CASE("xbt::random: Random Number Generation")
     simgrid::xbt::random::set_implem_std();
     simgrid::xbt::random::set_mersenne_seed(12345);
 
-    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);
+    std::exponential_distribution distA(25.0);
+    std::uniform_int_distribution distB(1, 6);
+    std::uniform_real_distribution distC(0.0, 1.0);
+    std::normal_distribution distD(0.0, 2.0);
 
     REQUIRE_THAT(simgrid::xbt::random::exponential(25), EpsilonApprox(distA(gen)));
     REQUIRE(simgrid::xbt::random::uniform_int(1, 6) == distB(gen));