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 47b6657..44b4900 100644 (file)
--- a/teshsuite/s4u/activity-lifecycle/testing_comm.cpp
+++ b/teshsuite/s4u/activity-lifecycle/testing_comm.cpp
@@ -1,9 +1,10 @@
-/* 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>
 
 static void test_link_off_helper(double delay)
 {
@@ -11,18 +12,15 @@ static void test_link_off_helper(double delay)
 
   simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", all_hosts[1], [&start]() {
     assert_exit(true, 9);
-    double milestone[5] = {0.5, 3.5, 4.5, 7.5, 9.0};
-    for (int i = 0; i < 5; i++)
-      milestone[i] += start;
+    std::array<double, 5> milestone{{0.5, 3.5, 4.5, 7.5, 9.0}};
+    for (double& m : milestone)
+      m += start;
     for (int i = 0; i < 4; i++) {
       simgrid::s4u::this_actor::sleep_until(milestone[i]);
-      try {
-        XBT_VERB("get(%c)", 'A' + i);
-        simgrid::s4u::Mailbox::by_name("mb")->get();
-        return;
-      } catch (simgrid::NetworkFailureException const&) {
-        XBT_VERB("got expected NetworkFailureException");
-      }
+      REQUIRE_NETWORK_FAILURE({
+        INFO("get(" << ('A' + i) << ")");
+        simgrid::s4u::Mailbox::by_name("mb")->get<int>();
+      });
     }
     simgrid::s4u::this_actor::sleep_until(milestone[4]);
   });
@@ -30,9 +28,9 @@ static void test_link_off_helper(double delay)
   simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], [&start]() {
     assert_exit(true, 9);
     int data            = 42;
-    double milestone[5] = {1.5, 2.5, 5.5, 6.5, 9.0};
-    for (int i = 0; i < 5; i++)
-      milestone[i] += start;
+    std::array<double, 5> milestone{{1.5, 2.5, 5.5, 6.5, 9.0}};
+    for (double& m : milestone)
+      m += start;
     for (int i = 0; i < 2; i++) {
       simgrid::s4u::this_actor::sleep_until(milestone[i]);
       XBT_VERB("dsend(%c)", 'A' + i);
@@ -40,13 +38,10 @@ static void test_link_off_helper(double delay)
     }
     for (int i = 2; i < 4; i++) {
       simgrid::s4u::this_actor::sleep_until(milestone[i]);
-      try {
-        XBT_VERB("put(%c)", 'A' + i);
+      REQUIRE_NETWORK_FAILURE({
+        INFO("put(" << ('A' + i) << ")");
         simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000);
-        return;
-      } catch (simgrid::NetworkFailureException const&) {
-        XBT_VERB("got expected NetworkFailureException");
-      }
+      });
     }
     simgrid::s4u::this_actor::sleep_until(milestone[4]);
   });
@@ -82,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;
     });
@@ -111,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;
     });
@@ -141,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;
     });
@@ -173,9 +168,10 @@ TEST_CASE("Activity lifecycle: comm activities")
 
     simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
       assert_exit(true, 2);
-      void* payload = nullptr;
-      REQUIRE_THROWS_AS(payload = simgrid::s4u::Mailbox::by_name("mb")->get(), simgrid::NetworkFailureException);
-      xbt_free(payload);
+      REQUIRE_NETWORK_FAILURE({
+        char* payload = simgrid::s4u::Mailbox::by_name("mb")->get<char>();
+        xbt_free(payload);
+      });
       recv_done = true;
     });
 
@@ -205,9 +201,9 @@ 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
+            // Shouldn't get in here after the on_exit function
             in_catch_before_on_exit = not in_on_exit;
             in_catch_after_on_exit  = in_on_exit;
           }
@@ -219,7 +215,7 @@ TEST_CASE("Activity lifecycle: comm activities")
     simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], [&send_done]() {
       assert_exit(true, 1);
       int data = 42;
-      REQUIRE_THROWS_AS(simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000), simgrid::NetworkFailureException);
+      REQUIRE_NETWORK_FAILURE(simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000));
       send_done = true;
     });
 
@@ -274,16 +270,15 @@ TEST_CASE("Activity lifecycle: comm activities")
     simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", all_hosts[1], []() {
       assert_exit(true, 2);
       int* data;
-      std::vector<simgrid::s4u::CommPtr> pending_comms;
-      simgrid::s4u::CommPtr comm = simgrid::s4u::Mailbox::by_name("mb")->get_async((void**)&data);
-      pending_comms.push_back(comm);
-      REQUIRE_THROWS_AS(simgrid::s4u::Comm::wait_any(&pending_comms), simgrid::NetworkFailureException);
+      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));
     });
 
     simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], []() {
       assert_exit(true, 2);
       int data = 42;
-      REQUIRE_THROWS_AS(simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000), simgrid::NetworkFailureException);
+      REQUIRE_NETWORK_FAILURE(simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000));
     });
 
     simgrid::s4u::this_actor::sleep_for(2.0);