X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38ffc837c5692a4d52e7610a67453a5335434bbd..3e9453209f1da7deb92fe629428e49f3528217bd:/src/kernel/routing/FatTreeZone_test.cpp diff --git a/src/kernel/routing/FatTreeZone_test.cpp b/src/kernel/routing/FatTreeZone_test.cpp index 171314f91b..14ad3e6d8c 100644 --- a/src/kernel/routing/FatTreeZone_test.cpp +++ b/src/kernel/routing/FatTreeZone_test.cpp @@ -1,108 +1,87 @@ -/* 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 "NetZone_test.hpp" // CreateHost callback #include "simgrid/kernel/routing/FatTreeZone.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/NetZone.hpp" - -namespace { -class EngineWrapper { -public: - explicit EngineWrapper(std::string name) : argv(&name[0]), e(&argc, &argv) {} - int argc = 1; - char* argv; - simgrid::s4u::Engine e; -}; - -std::pair -create_host(simgrid::s4u::NetZone* zone, const std::vector& /*coord*/, int id) -{ - const 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::FatTreeZone: Creating Zone", "") { - using namespace simgrid::s4u; - EngineWrapper e("test"); - ClusterCallbacks callbacks(create_host); - REQUIRE(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 2}}, callbacks, 1e9, 10, + simgrid::s4u::Engine e("test"); + simgrid::s4u::ClusterCallbacks callbacks(CreateHost{}); + REQUIRE(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 2}}, callbacks, 1e9, 10, simgrid::s4u::Link::SharingPolicy::SHARED)); } TEST_CASE("kernel::routing::FatTreeZone: Invalid params", "") { - using namespace simgrid::s4u; - EngineWrapper e("test"); - ClusterCallbacks callbacks(create_host); + simgrid::s4u::Engine e("test"); + simgrid::s4u::ClusterCallbacks callbacks(CreateHost{}); SECTION("0 levels") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {0, {4, 4}, {1, 2}, {1, 2}}, callbacks, 1e9, - 10, simgrid::s4u::Link::SharingPolicy::SHARED), + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {0, {4, 4}, {1, 2}, {1, 2}}, callbacks, 1e9, 10, + simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } SECTION("Invalid down links") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4}, {1, 2}, {1, 2}}, callbacks, 1e9, 10, + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {2, {4}, {1, 2}, {1, 2}}, callbacks, 1e9, 10, simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } SECTION("Invalid up links") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4, 4}, {1}, {1, 2}}, callbacks, 1e9, 10, + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 4}, {1}, {1, 2}}, callbacks, 1e9, 10, simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } SECTION("Invalid link count") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1}}, callbacks, 1e9, 10, + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1}}, callbacks, 1e9, 10, simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } SECTION("Down links with zeroes") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4, 0}, {1, 2}, {1, 2}}, callbacks, 1e9, - 10, simgrid::s4u::Link::SharingPolicy::SHARED), + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 0}, {1, 2}, {1, 2}}, callbacks, 1e9, 10, + simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } SECTION("Up links with zeroes") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4, 4}, {0, 2}, {1, 2}}, callbacks, 1e9, - 10, simgrid::s4u::Link::SharingPolicy::SHARED), + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 4}, {0, 2}, {1, 2}}, callbacks, 1e9, 10, + simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } SECTION("Link count with zeroes") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 0}}, callbacks, 1e9, - 10, simgrid::s4u::Link::SharingPolicy::SHARED), + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 0}}, callbacks, 1e9, 10, + simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } SECTION("0 bandwidth") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 2}}, callbacks, 0, 10, + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 2}}, callbacks, 0, 10, simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } SECTION("Negative latency") { - REQUIRE_THROWS_AS(create_fatTree_zone("test", e.e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 2}}, callbacks, 1e9, + REQUIRE_THROWS_AS(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 2}}, callbacks, 1e9, -10, simgrid::s4u::Link::SharingPolicy::SHARED), std::invalid_argument); } -} \ No newline at end of file +}