Class method call for all task added

IvanPinezhaninov · Dec 25, 2023 · a528fca · a528fca
1 parent e9196f2
commit a528fca
Show file tree

Hide file tree

Showing 20 changed files with 911 additions and 282 deletions.
diff --git a/include/async_promise.hpp b/include/async_promise.hpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -36,6 +36,7 @@ include(Catch)
 
 set(HEADERS
   src/common.h
+  src/constants.h
   src/test_funcs.h
   src/test_struct.h
 )

diff --git a/tests/src/all.cpp b/tests/src/all.cpp
@@ -27,7 +27,162 @@
 #include "common.h"
 
 
-TEST_CASE("All void void", "[all]")
+TEST_CASE("All with class method void void", "[all]")
+{
+  test_struct test;
+
+  std::vector<void(test_struct::*)() const> methods
+  {
+    &test_struct::void_void,
+    &test_struct::void_void,
+  };
+
+  auto future = async::make_resolved_promise().all(methods, &test).run();
+
+  REQUIRE_NOTHROW(future.get());
+}
+
+
+TEST_CASE("All with class method error void void", "[all]")
+{
+  test_struct test;
+
+  std::vector<void(test_struct::*)() const> methods
+  {
+    &test_struct::void_void,
+    &test_struct::error_void_void,
+  };
+
+  auto future = async::make_resolved_promise().all(methods, &test).run();
+
+  REQUIRE_THROWS_MATCHES(future.get(), std::runtime_error, Catch::Matchers::Message(str2));
+}
+
+
+TEST_CASE("All with class method void string", "[all]")
+{
+  test_struct test;
+
+  std::vector<void(test_struct::*)(std::string) const> methods
+  {
+    &test_struct::void_string,
+    &test_struct::void_string,
+  };
+
+  auto future = async::make_resolved_promise(str1).all(methods, &test).run();
+
+  REQUIRE_NOTHROW(future.get());
+}
+
+
+TEST_CASE("All with class method error void string", "[all]")
+{
+  test_struct test;
+
+  std::vector<void(test_struct::*)(std::string) const> methods
+  {
+    &test_struct::void_string,
+    &test_struct::error_void_string,
+  };
+
+  auto future = async::make_resolved_promise(str1).all(methods, &test).run();
+
+  REQUIRE_THROWS_MATCHES(future.get(), std::runtime_error, Catch::Matchers::Message(str2));
+}
+
+
+TEST_CASE("All with class method string void", "[all]")
+{
+  test_struct test;
+
+  std::vector<std::string(test_struct::*)() const> methods
+  {
+    &test_struct::string_void1,
+    &test_struct::string_void2,
+  };
+
+  auto future = async::make_resolved_promise().all(methods, &test).run();
+
+  std::vector<std::string> res;
+  REQUIRE_NOTHROW(res = future.get());
+  REQUIRE_THAT(res, Catch::Matchers::RangeEquals(std::vector<std::string>{str1, str2}));
+}
+
+
+TEST_CASE("All with class method string void ignore arg", "[all]")
+{
+  test_struct test;
+
+  std::vector<std::string(test_struct::*)() const> methods
+  {
+    &test_struct::string_void1,
+    &test_struct::string_void2,
+  };
+
+  auto future = async::make_resolved_promise(str1).all(methods, &test).run();
+
+  std::vector<std::string> res;
+  REQUIRE_NOTHROW(res = future.get());
+  REQUIRE_THAT(res, Catch::Matchers::RangeEquals(std::vector<std::string>{str1, str2}));
+}
+
+
+TEST_CASE("All with class method error string void", "[all]")
+{
+  test_struct test;
+
+  std::vector<std::string(test_struct::*)() const> methods
+  {
+    &test_struct::string_void1,
+    &test_struct::error_string_void,
+  };
+
+  auto future = async::make_resolved_promise().all(methods, &test).run();
+
+  std::vector<std::string> res;
+  REQUIRE_THROWS_MATCHES(res = future.get(), std::runtime_error, Catch::Matchers::Message(str2));
+  REQUIRE(res.empty());
+}
+
+
+TEST_CASE("All with class method string string", "[all]")
+{
+  test_struct test;
+
+  std::vector<std::string(test_struct::*)(std::string) const> methods
+  {
+    &test_struct::string_string,
+    &test_struct::string_string,
+  };
+
+  auto future = async::make_resolved_promise(str1).all(methods, &test).run();
+
+  std::vector<std::string> res;
+  REQUIRE_NOTHROW(res = future.get());
+  REQUIRE_THAT(res, Catch::Matchers::RangeEquals(std::vector<std::string>{str1, str1}));
+}
+
+
+TEST_CASE("All with class method error string string", "[all]")
+{
+  test_struct test;
+
+  std::vector<std::string(test_struct::*)(std::string) const> methods
+  {
+    &test_struct::string_string,
+    &test_struct::error_string_string
+  };
+
+  auto future = async::make_resolved_promise(str1).all(methods, &test).run();
+
+  std::vector<std::string> res;
+  REQUIRE_THROWS_MATCHES(res = future.get(), std::runtime_error, Catch::Matchers::Message(str2));
+  REQUIRE(res.empty());
+}
+
+
+
+TEST_CASE("All with function void void", "[all]")
 {
   std::vector<void(*)()> funcs
   {
@@ -41,7 +196,7 @@ TEST_CASE("All void void", "[all]")
 }
 
 
-TEST_CASE("All error void void", "[all]")
+TEST_CASE("All with function error void void", "[all]")
 {
   std::vector<void(*)()> funcs
   {
@@ -55,7 +210,7 @@ TEST_CASE("All error void void", "[all]")
 }
 
 
-TEST_CASE("All void string", "[all]")
+TEST_CASE("All with function void string", "[all]")
 {
   std::vector<void(*)(std::string)> funcs
   {
@@ -69,7 +224,7 @@ TEST_CASE("All void string", "[all]")
 }
 
 
-TEST_CASE("All error void string", "[all]")
+TEST_CASE("All with function error void string", "[all]")
 {
   std::vector<void(*)(std::string)> funcs
   {
@@ -83,7 +238,7 @@ TEST_CASE("All error void string", "[all]")
 }
 
 
-TEST_CASE("All string void", "[all]")
+TEST_CASE("All with function string void", "[all]")
 {
   std::vector<std::string(*)()> funcs
   {
@@ -99,7 +254,7 @@ TEST_CASE("All string void", "[all]")
 }
 
 
-TEST_CASE("All string void ignore arg", "[all]")
+TEST_CASE("All with function string void ignore arg", "[all]")
 {
   std::vector<std::string(*)()> funcs
   {
@@ -115,7 +270,7 @@ TEST_CASE("All string void ignore arg", "[all]")
 }
 
 
-TEST_CASE("All error string void", "[all]")
+TEST_CASE("All with function error string void", "[all]")
 {
   std::vector<std::string(*)()> funcs
   {
@@ -131,7 +286,7 @@ TEST_CASE("All error string void", "[all]")
 }
 
 
-TEST_CASE("All string string", "[all]")
+TEST_CASE("All with function string string", "[all]")
 {
   std::vector<std::string(*)(std::string)> funcs
   {
@@ -147,7 +302,7 @@ TEST_CASE("All string string", "[all]")
 }
 
 
-TEST_CASE("All error string string", "[all]")
+TEST_CASE("All with function error string string", "[all]")
 {
   std::vector<std::string(*)(std::string)> funcs
   {

diff --git a/tests/src/any.cpp b/tests/src/any.cpp
@@ -45,7 +45,7 @@ TEST_CASE("Any error void void", "[any]")
 {
   std::vector<void(*)()> funcs
   {
-    [] () { throw std::runtime_error{str1}; },
+    [] () { throw std::runtime_error{str2}; },
     [] () {},
   };
 
@@ -87,7 +87,7 @@ TEST_CASE("Any error void string", "[any]")
 {
   std::vector<void(*)(std::string)> funcs
   {
-    [] (std::string) { throw std::runtime_error{str1}; },
+    [] (std::string) { throw std::runtime_error{str2}; },
     [] (std::string) {},
   };
 
@@ -147,15 +147,15 @@ TEST_CASE("Any error string void", "[any]")
 {
   std::vector<std::string(*)()> funcs
   {
-    [] () -> std::string { throw std::runtime_error{str1}; },
-    [] () { return std::string{str2}; },
+    [] () -> std::string { throw std::runtime_error{str2}; },
+    [] () { return std::string{str1}; },
   };
 
   auto future = async::make_resolved_promise().any(funcs).run();
 
   std::string res;
   REQUIRE_NOTHROW(res = future.get());
-  REQUIRE(res == str2);
+  REQUIRE(res == str1);
 }
 
 
@@ -192,15 +192,15 @@ TEST_CASE("Any error string string", "[any]")
 {
   std::vector<std::string(*)(std::string)> funcs
   {
-    [] (std::string str) -> std::string { throw std::runtime_error{str1}; },
-    [] (std::string str) { return std::string{str2}; },
+    [] (std::string str) -> std::string { throw std::runtime_error{str2}; },
+    [] (std::string str) { return std::string{str1}; },
   };
 
   auto future = async::make_resolved_promise(str1).any(funcs).run();
 
   std::string res;
   REQUIRE_NOTHROW(res = future.get());
-  REQUIRE(res == str2);
+  REQUIRE(res == str1);
 }
 
 

diff --git a/tests/src/common.h b/tests/src/common.h
@@ -18,11 +18,8 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#include "constants.h"
 #include "test_funcs.h"
 #include "test_struct.h"
 
-static constexpr auto aggregate_error_message = "All functions rejected";
-static constexpr auto str1 = "Hello World!";
-static constexpr auto str2 = "Hello Universe!";
-
 #endif // COMMON_H
diff --git a/tests/src/constants.h b/tests/src/constants.h
@@ -0,0 +1,25 @@
+/******************************************************************************
+**
+** Copyright (C) 2023 Ivan Pinezhaninov <ivan.pinezhaninov@gmail.com>
+**
+** This file is part of the async_promise - which can be found at
+** https://github.com/IvanPinezhaninov/async_promise/.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+** DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+** OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+** THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**
+******************************************************************************/
+
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
+static constexpr auto aggregate_error_message = "All functions rejected";
+static constexpr auto str1 = "Hello World!";
+static constexpr auto str2 = "Hello Universe!";
+
+#endif // CONSTANTS_H