tidying up tests

STEllAR-GROUP · Dec 14, 2023 · 323904c · 323904c
1 parent 4fa59fd
commit 323904c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocate.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocate.cpp
@@ -27,7 +27,7 @@ using hpx::experimental::uninitialized_relocate;
 std::mutex m;
 
 template <typename F>
-void lazy_mutex_op(F&& f)
+void simple_mutex_operation(F&& f)
 {
     std::lock_guard<std::mutex> lk(m);
     f();
@@ -53,7 +53,7 @@ struct counted_struct
       : data(data)
     {
         // Check that we are not constructing an object on top of another
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             HPX_TEST(!made.count(this));
             made.insert(this);
         });
@@ -76,7 +76,7 @@ struct counted_struct
         }
 
         // Check that we are not constructing an object on top of another
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             // Unless we are testing overlapping relocation
             // we should not be move-constructing an object on top of another
             if constexpr (!overlapping_test)
@@ -93,7 +93,7 @@ struct counted_struct
 
         // Check that the object was constructed
         // and not already destroyed
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             HPX_TEST(made.count(this));
             made.erase(this);
         });

diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocate_backward.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocate_backward.cpp
@@ -14,9 +14,9 @@
 #include <set>
 #include <utility>
 
-constexpr int N = 50;    // number of objects to construct
-constexpr int M = 20;    // number of objects to relocate
-constexpr int K = 10;    // number of objects to relocate before throwing
+constexpr int N = 500;    // number of objects to construct
+constexpr int M = 200;    // number of objects to relocate
+constexpr int K = 100;    // number of objects to relocate before throwing
 
 static_assert(N > M);
 static_assert(M > K);
@@ -27,7 +27,7 @@ using hpx::experimental::uninitialized_relocate_backward;
 std::mutex m;
 
 template <typename F>
-void lazy_mutex_op(F&& f)
+void simple_mutex_operation(F&& f)
 {
     std::lock_guard<std::mutex> lk(m);
     f();
@@ -53,7 +53,7 @@ struct counted_struct
       : data(data)
     {
         // Check that we are not constructing an object on top of another
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             HPX_TEST(!made.count(this));
             made.insert(this);
         });
@@ -76,7 +76,7 @@ struct counted_struct
         }
 
         // Check that we are not constructing an object on top of another
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             // Unless we are testing overlapping relocation
             // we should not be move-constructing an object on top of another
             if constexpr (!overlapping_test)
@@ -93,7 +93,7 @@ struct counted_struct
 
         // Check that the object was constructed
         // and not already destroyed
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             HPX_TEST(made.count(this));
             made.erase(this);
         });

diff --git a/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocaten.cpp b/libs/core/algorithms/tests/unit/algorithms/uninitialized_relocaten.cpp
@@ -27,7 +27,7 @@ using hpx::experimental::uninitialized_relocate_n;
 std::mutex m;
 
 template <typename F>
-void lazy_mutex_op(F&& f)
+void simple_mutex_operation(F&& f)
 {
     std::lock_guard<std::mutex> lk(m);
     f();
@@ -53,7 +53,7 @@ struct counted_struct
       : data(data)
     {
         // Check that we are not constructing an object on top of another
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             HPX_TEST(!made.count(this));
             made.insert(this);
         });
@@ -76,7 +76,7 @@ struct counted_struct
         }
 
         // Check that we are not constructing an object on top of another
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             // Unless we are testing overlapping relocation
             // we should not be move-constructing an object on top of another
             if constexpr (!overlapping_test)
@@ -93,7 +93,7 @@ struct counted_struct
 
         // Check that the object was constructed
         // and not already destroyed
-        lazy_mutex_op([&]() {
+        simple_mutex_operation([&]() {
             HPX_TEST(made.count(this));
             made.erase(this);
         });