X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12ff962f066e304dbaa22cafcd6d5c7adb67c33c..HEAD:/src/kernel/routing/FloydZone_test.cpp?ds=sidebyside

diff --git a/src/kernel/routing/FloydZone_test.cpp b/src/kernel/routing/FloydZone_test.cpp
index 94e0a52897..f4fbe4a7d1 100644
--- a/src/kernel/routing/FloydZone_test.cpp
+++ b/src/kernel/routing/FloydZone_test.cpp
@@ -1,46 +1,34 @@
-/* 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/FloydZone.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
-#include "src/surf/network_interface.hpp" //LinkImpl
-
-namespace {
-class EngineWrapper {
-  int argc = 1;
-  char* argv;
-  simgrid::s4u::Engine e;
-
-public:
-  explicit EngineWrapper(std::string name) : argv(&name[0]), e(&argc, &argv) {}
-};
-} // namespace
+#include "src/kernel/resource/LinkImpl.hpp"
 
 TEST_CASE("kernel::routing::FloydZone: Creating Zone", "")
 {
-  EngineWrapper e("test");
+  simgrid::s4u::Engine e("test");
 
   REQUIRE(simgrid::s4u::create_floyd_zone("test"));
 }
 
 TEST_CASE("kernel::routing::FloydZone: mix new routes and hosts", "")
 {
-  EngineWrapper e("test");
+  simgrid::s4u::Engine e("test");
   auto* zone = simgrid::s4u::create_floyd_zone("test");
 
-  const simgrid::s4u::Host* nic = zone->create_host("nic", 1e9)->seal();
-  simgrid::s4u::Link* link      = zone->create_link("my_link", 1e6)->seal();
+  const simgrid::s4u::Host* nic  = zone->create_host("nic", 1e9);
+  const simgrid::s4u::Link* link = zone->create_link("my_link", 1e6);
   for (int i = 0; i < 10; i++) {
     std::string cpu_name          = "CPU" + std::to_string(i);
-    const simgrid::s4u::Host* cpu = zone->create_host(cpu_name, 1e9)->seal();
-    REQUIRE_NOTHROW(zone->add_route(cpu->get_netpoint(), nic->get_netpoint(), nullptr, nullptr,
-                                    std::vector<simgrid::s4u::Link*>{link}, true));
+    const simgrid::s4u::Host* cpu = zone->create_host(cpu_name, 1e9);
+    REQUIRE_NOTHROW(zone->add_route(cpu, nic, {link}));
   }
-}
\ No newline at end of file
+}