X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12ff962f066e304dbaa22cafcd6d5c7adb67c33c..2fa31273f15799271677dad1a964997bc5a057f9:/src/kernel/routing/DijkstraZone_test.cpp

diff --git a/src/kernel/routing/DijkstraZone_test.cpp b/src/kernel/routing/DijkstraZone_test.cpp
index b9894887ca..6fbbd30f5a 100644
--- a/src/kernel/routing/DijkstraZone_test.cpp
+++ b/src/kernel/routing/DijkstraZone_test.cpp
@@ -12,36 +12,25 @@
 #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
-
 TEST_CASE("kernel::routing::DijkstraZone: Creating Zone", "")
 {
-  EngineWrapper e("test");
+  simgrid::s4u::Engine e("test");
 
-  REQUIRE(simgrid::s4u::create_dijkstra_zone("test", false));
-  REQUIRE(simgrid::s4u::create_dijkstra_zone("test2", true));
+  SECTION("Regular Dijkstra") { REQUIRE(simgrid::s4u::create_dijkstra_zone("test", false)); }
+  SECTION("DijkstraCache") { REQUIRE(simgrid::s4u::create_dijkstra_zone("test", true)); }
 }
 
 TEST_CASE("kernel::routing::DijkstraZone: mix new routes and hosts", "")
 {
-  EngineWrapper e("test");
+  simgrid::s4u::Engine e("test");
   auto* zone = simgrid::s4u::create_dijkstra_zone("test", false);
 
-  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)->seal();
+  const simgrid::s4u::Link* link = zone->create_link("my_link", 1e6)->seal();
   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));
+                                    {simgrid::s4u::LinkInRoute(link)}, true));
   }
-}
\ No newline at end of file
+}