X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bba53ea25d34a4a00503a939b5abe0b4edaad467..3e9453209f1da7deb92fe629428e49f3528217bd:/src/kernel/routing/TorusZone_test.cpp

diff --git a/src/kernel/routing/TorusZone_test.cpp b/src/kernel/routing/TorusZone_test.cpp
index c741931d76..c401bae5f8 100644
--- a/src/kernel/routing/TorusZone_test.cpp
+++ b/src/kernel/routing/TorusZone_test.cpp
@@ -1,76 +1,49 @@
-/* Copyright (c) 2017-2021. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2017-2023. 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 "catch.hpp"
+#include "src/3rd-party/catch.hpp"
 
-#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "NetZone_test.hpp" // CreateHost callback
 #include "simgrid/kernel/routing/TorusZone.hpp"
 #include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/NetZone.hpp"
-#include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp" // RouteCreationArgs and friends
-
-namespace {
-class EngineWrapper {
-  int argc = 1;
-  char* argv;
-
-public:
-  simgrid::s4u::Engine e;
-  explicit EngineWrapper(std::string name) : argv(&name[0]), e(&argc, &argv) {}
-};
-
-std::pair<simgrid::kernel::routing::NetPoint*, simgrid::kernel::routing::NetPoint*>
-create_host(simgrid::s4u::NetZone* zone, const std::vector<unsigned int>& coord, int id)
-{
-  simgrid::s4u::Host* host = zone->create_host(std::to_string(id), 1e9)->seal();
-  return std::make_pair(host->get_netpoint(), nullptr);
-}
-} // namespace
 
 TEST_CASE("kernel::routing::TorusZone: Creating Zone", "")
 {
-  using namespace simgrid::s4u;
-  EngineWrapper e("test");
-  auto create_host = [](NetZone* zone, const std::vector<unsigned int>& coord,
-                        int id) -> std::pair<simgrid::kernel::routing::NetPoint*, simgrid::kernel::routing::NetPoint*> {
-    Host* host = zone->create_host(std::to_string(id), 1e9)->seal();
-    return std::make_pair(host->get_netpoint(), nullptr);
-  };
-  REQUIRE(create_torus_zone("test", e.e.get_netzone_root(), {3, 3, 3}, 1e9, 10,
-                            simgrid::s4u::Link::SharingPolicy::SHARED, create_host));
+  simgrid::s4u::Engine e("test");
+  simgrid::s4u::ClusterCallbacks callbacks(CreateHost{});
+  REQUIRE(create_torus_zone("test", e.get_netzone_root(), {3, 3, 3}, callbacks, 1e9, 10,
+                            simgrid::s4u::Link::SharingPolicy::SHARED));
 }
 
 TEST_CASE("kernel::routing::TorusZone: Invalid params", "")
 {
-  using namespace simgrid::s4u;
-  EngineWrapper e("test");
+  simgrid::s4u::Engine e("test");
+  simgrid::s4u::ClusterCallbacks callbacks(CreateHost{});
 
   SECTION("Empty dimensions")
   {
-    REQUIRE_THROWS_AS(create_torus_zone("test", e.e.get_netzone_root(), {}, 1e9, 10,
-                                        simgrid::s4u::Link::SharingPolicy::SHARED, create_host),
+    REQUIRE_THROWS_AS(create_torus_zone("test", e.get_netzone_root(), {}, callbacks, 1e9, 10,
+                                        simgrid::s4u::Link::SharingPolicy::SHARED),
                       std::invalid_argument);
   }
   SECTION("One 0 dimension")
   {
-    REQUIRE_THROWS_AS(create_torus_zone("test", e.e.get_netzone_root(), {3, 0, 2}, 1e9, 10,
-                                        simgrid::s4u::Link::SharingPolicy::SHARED, create_host),
+    REQUIRE_THROWS_AS(create_torus_zone("test", e.get_netzone_root(), {3, 0, 2}, callbacks, 1e9, 10,
+                                        simgrid::s4u::Link::SharingPolicy::SHARED),
                       std::invalid_argument);
   }
   SECTION("Invalid bandwidth")
   {
-    REQUIRE_THROWS_AS(create_torus_zone("test", e.e.get_netzone_root(), {3, 2, 2}, 0, 10,
-                                        simgrid::s4u::Link::SharingPolicy::SHARED, create_host),
+    REQUIRE_THROWS_AS(create_torus_zone("test", e.get_netzone_root(), {3, 2, 2}, callbacks, 0, 10,
+                                        simgrid::s4u::Link::SharingPolicy::SHARED),
                       std::invalid_argument);
   }
   SECTION("Invalid latency")
   {
-    REQUIRE_THROWS_AS(create_torus_zone("test", e.e.get_netzone_root(), {3, 2, 2}, 1e9, -10,
-                                        simgrid::s4u::Link::SharingPolicy::SHARED, create_host),
+    REQUIRE_THROWS_AS(create_torus_zone("test", e.get_netzone_root(), {3, 2, 2}, callbacks, 1e9, -10,
+                                        simgrid::s4u::Link::SharingPolicy::SHARED),
                       std::invalid_argument);
   }
-}
\ No newline at end of file
+}