X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19e1048a7009c4144b0f361ad85fb9dff44761ea..63fdbfa257867cde545185eaa0eb7a6505506a89:/src/kernel/routing/DijkstraZone_test.cpp diff --git a/src/kernel/routing/DijkstraZone_test.cpp b/src/kernel/routing/DijkstraZone_test.cpp index d222e968d5..9a1c89a0de 100644 --- a/src/kernel/routing/DijkstraZone_test.cpp +++ b/src/kernel/routing/DijkstraZone_test.cpp @@ -1,16 +1,16 @@ -/* 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/DijkstraZone.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 +#include "src/kernel/resource/LinkImpl.hpp" TEST_CASE("kernel::routing::DijkstraZone: Creating Zone", "") { @@ -25,12 +25,11 @@ TEST_CASE("kernel::routing::DijkstraZone: mix new routes and hosts", "") 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{link}, true)); + REQUIRE_NOTHROW(zone->add_route(cpu, nic,{link})); } }