Update copyright lines for 2023.

[simgrid.git] / src / kernel / routing / DijkstraZone_test.cpp

diff --git a/src/kernel/routing/DijkstraZone_test.cpp b/src/kernel/routing/DijkstraZone_test.cpp
index b989488..688dd02 100644 (file)
--- a/src/kernel/routing/DijkstraZone_test.cpp
+++ b/src/kernel/routing/DijkstraZone_test.cpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -10,38 +10,27 @@
 #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::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
+}