Fix benchmarks random integer generator input check

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/benchmarks/benchmarks-utils.js b/benchmarks/benchmarks-utils.js
index 0a964d7b60e0cfbca7caa3cdd3650b5af7e27bbc..c04162e1a617d704708b56496040640947e22171 100644 (file)
--- a/benchmarks/benchmarks-utils.js
+++ b/benchmarks/benchmarks-utils.js
@@ -31,14 +31,11 @@ function jsonIntegerSerialization (n) {
 }
 
 function generateRandomInteger (max = Number.MAX_SAFE_INTEGER, min = 0) {
-  if (max < 0) {
+  if (max < min || max < 0 || min < 0) {
     throw new RangeError('Invalid interval')
   }
   max = Math.floor(max)
   if (min != null && min !== 0) {
-    if (max < min || min < 0) {
-      throw new RangeError('Invalid interval')
-    }
     min = Math.ceil(min)
     return Math.floor(Math.random() * (max - min + 1)) + min
   }

diff --git a/tests/test-utils.js b/tests/test-utils.js
index f4cb38b23cb1ca63c5c6e17109af45d59f66dc0d..116b1942b96829273eedb2d08ff83691ff61aa6f 100644 (file)
--- a/tests/test-utils.js
+++ b/tests/test-utils.js
@@ -37,14 +37,11 @@ class TestUtils {
   }
 
   static generateRandomInteger (max = Number.MAX_SAFE_INTEGER, min = 0) {
-    if (max < 0) {
+    if (max < min || max < 0 || min < 0) {
       throw new RangeError('Invalid interval')
     }
     max = Math.floor(max)
     if (min != null && min !== 0) {
-      if (max < min || min < 0) {
-        throw new RangeError('Invalid interval')
-      }
       min = Math.ceil(min)
       return Math.floor(Math.random() * (max - min + 1)) + min
     }