tests updated to be independent of RNG details

diff --git a/tests/base/function_parser_09.cc b/tests/base/function_parser_09.cc
index 46028ef688751910cced3f48a36b411da157a177..1cadc4368c9c95dfcb24c215283b25fd5100d528 100644 (file)
--- a/tests/base/function_parser_09.cc
+++ b/tests/base/function_parser_09.cc
@@ -41,15 +41,30 @@ eval(const std::string &exp)
 }
 
 
+bool
+satisfies_randomness(std::vector<double> &v)
+{
+  // check that consecutive numbers are not the same
+  for (unsigned int i = 1; i < v.size(); ++i)
+    if (v[i - 1] == v[i])
+      return false;
+  // Check that the numbers are between 0 and 1
+  return std::all_of(v.begin(), v.end(), [](double n) {
+    return (n >= 0.) && (n <= 1.);
+  });
+}
+
+
 int
 main()
 {
   initlog();
 
-  double random = eval("rand()"); // random seed
+  std::vector<double> rands{eval("rand_seed(10)"),
+                            eval("rand()"),
+                            eval("rand_seed(10)"),
+                            eval("rand_seed(10)")};
 
-  if (0.0 <= random && random <= 1.0)
+  if (satisfies_randomness(rands))
     deallog << "OK" << std::endl;
-
-  deallog << eval("rand_seed(10)") << std::endl;
 }

diff --git a/tests/base/function_parser_09.with_muparser=true.output b/tests/base/function_parser_09.with_muparser=true.output
index 03a86172f4202fb25a3fcb382bf5484272b96c51..0fd8fc12f0b442283edd8868867114c242b04d11 100644 (file)
--- a/tests/base/function_parser_09.with_muparser=true.output
+++ b/tests/base/function_parser_09.with_muparser=true.output
@@ -1,3 +1,2 @@
 
 DEAL::OK
-DEAL::0.298761

diff --git a/tests/base/function_parser_10.cc b/tests/base/function_parser_10.cc
index bbc51fe5ec8fbd12cd4874ac7f0cf57fdd87f2e5..452417855df172be0cfe7c33c7d2fd7a598fd3dd 100644 (file)
--- a/tests/base/function_parser_10.cc
+++ b/tests/base/function_parser_10.cc
@@ -37,15 +37,30 @@ eval(const std::string &exp)
 }
 
 
+bool
+satisfies_randomness(std::vector<double> &v)
+{
+  // check that consecutive numbers are not the same
+  for (unsigned int i = 1; i < v.size(); ++i)
+    if (v[i - 1] == v[i])
+      return false;
+  // Check that the numbers are between 0 and 1
+  return std::all_of(v.begin(), v.end(), [](double n) {
+    return (n >= 0.) && (n <= 1.);
+  });
+}
+
+
 int
 main()
 {
   initlog();
 
-  double random = eval("rand()"); // random seed
+  std::vector<double> rands{eval("rand_seed(10)"),
+                            eval("rand()"),
+                            eval("rand_seed(10)"),
+                            eval("rand_seed(10)")};
 
-  if (0.0 <= random && random <= 1.0)
+  if (satisfies_randomness(rands))
     deallog << "OK" << std::endl;
-
-  deallog << eval("rand_seed(10)") << std::endl;
 }

diff --git a/tests/base/function_parser_10.with_muparser=true.output b/tests/base/function_parser_10.with_muparser=true.output
index 03a86172f4202fb25a3fcb382bf5484272b96c51..0fd8fc12f0b442283edd8868867114c242b04d11 100644 (file)
--- a/tests/base/function_parser_10.with_muparser=true.output
+++ b/tests/base/function_parser_10.with_muparser=true.output
@@ -1,3 +1,2 @@
 
 DEAL::OK
-DEAL::0.298761