Make the Catch2-SimGrid integration available to more tests

[simgrid.git] / teshsuite / s4u / activity-lifecycle / testing_comm.cpp

diff --git a/teshsuite/s4u/activity-lifecycle/testing_comm.cpp b/teshsuite/s4u/activity-lifecycle/testing_comm.cpp
index bbcfbd7..44b4900 100644 (file)
--- a/teshsuite/s4u/activity-lifecycle/testing_comm.cpp
+++ b/teshsuite/s4u/activity-lifecycle/testing_comm.cpp
@@ -1,23 +1,11 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2022. 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 "activity-lifecycle.hpp"
+#include "catch_simgrid.hpp"
 #include <array>
 
-// Normally, we should be able use Catch2's REQUIRE_THROWS_AS(...), but it generates errors with Address Sanitizer.
-// They're certainly false positive. Nevermind and use this simpler replacement.
-#define REQUIRE_NETWORK_FAILURE(...)                                                                                   \
-  do {                                                                                                                 \
-    try {                                                                                                              \
-      __VA_ARGS__;                                                                                                     \
-      FAIL("Expected exception NetworkFailureException not caught");                                                   \
-    } catch (simgrid::NetworkFailureException const&) {                                                                \
-      XBT_VERB("got expected NetworkFailureException");                                                                \
-    }                                                                                                                  \
-  } while (0)
-
 static void test_link_off_helper(double delay)
 {
   const double start = simgrid::s4u::Engine::get_clock();
@@ -31,7 +19,7 @@ static void test_link_off_helper(double delay)
       simgrid::s4u::this_actor::sleep_until(milestone[i]);
       REQUIRE_NETWORK_FAILURE({
         INFO("get(" << ('A' + i) << ")");
-        simgrid::s4u::Mailbox::by_name("mb")->get();
+        simgrid::s4u::Mailbox::by_name("mb")->get<int>();
       });
     }
     simgrid::s4u::this_actor::sleep_until(milestone[4]);
@@ -89,7 +77,7 @@ TEST_CASE("Activity lifecycle: comm activities")
 
     simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
       assert_exit(true, 5);
-      void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+      char* payload = simgrid::s4u::Mailbox::by_name("mb")->get<char>();
       xbt_free(payload);
       recv_done = true;
     });
@@ -118,7 +106,7 @@ TEST_CASE("Activity lifecycle: comm activities")
     simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
       assert_exit(true, 3);
       simgrid::s4u::this_actor::sleep_for(2);
-      void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+      char* payload = simgrid::s4u::Mailbox::by_name("mb")->get<char>();
       xbt_free(payload);
       recv_done = true;
     });
@@ -148,7 +136,7 @@ TEST_CASE("Activity lifecycle: comm activities")
 
     simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
       assert_exit(true, 3);
-      void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+      char* payload = simgrid::s4u::Mailbox::by_name("mb")->get<char>();
       xbt_free(payload);
       recv_done = true;
     });
@@ -181,7 +169,7 @@ TEST_CASE("Activity lifecycle: comm activities")
     simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
       assert_exit(true, 2);
       REQUIRE_NETWORK_FAILURE({
-        void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+        char* payload = simgrid::s4u::Mailbox::by_name("mb")->get<char>();
         xbt_free(payload);
       });
       recv_done = true;
@@ -213,7 +201,7 @@ TEST_CASE("Activity lifecycle: comm activities")
                                                                &in_catch_before_on_exit, &in_catch_after_on_exit]() {
           assert_exit(false, 1);
           try {
-            simgrid::s4u::Mailbox::by_name("mb")->get();
+            simgrid::s4u::Mailbox::by_name("mb")->get<int>();
           } catch (simgrid::NetworkFailureException const&) {
             // Shouldn't get in here after the on_exit function
             in_catch_before_on_exit = not in_on_exit;
@@ -282,9 +270,9 @@ TEST_CASE("Activity lifecycle: comm activities")
     simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", all_hosts[1], []() {
       assert_exit(true, 2);
       int* data;
-      simgrid::s4u::CommPtr comm = simgrid::s4u::Mailbox::by_name("mb")->get_async((void**)&data);
+      simgrid::s4u::CommPtr comm                       = simgrid::s4u::Mailbox::by_name("mb")->get_async<int>(&data);
       std::vector<simgrid::s4u::CommPtr> pending_comms = {comm};
-      REQUIRE_NETWORK_FAILURE(simgrid::s4u::Comm::wait_any(&pending_comms));
+      REQUIRE_NETWORK_FAILURE(simgrid::s4u::Comm::wait_any(pending_comms));
     });
 
     simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], []() {