From 32f8b93583b1c70a963874af8d5146aa06cdf467 Mon Sep 17 00:00:00 2001 From: Guillaume Le Pape Date: Sat, 30 Dec 2023 17:40:06 +0100 Subject: [PATCH] Some refactoring --- src/utils/src/id.cpp | 2 +- test/weapon_test.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/utils/src/id.cpp b/src/utils/src/id.cpp index 317bdc6..c683c4f 100644 --- a/src/utils/src/id.cpp +++ b/src/utils/src/id.cpp @@ -5,7 +5,7 @@ std::string generate() { std::random_device rd; auto seed_data = std::array{}; std::generate(std::begin(seed_data), std::end(seed_data), std::ref(rd)); - std::seed_seq seq(std::begin(seed_data), std::end(seed_data)); + std::seed_seq seq(std::cbegin(seed_data), std::cend(seed_data)); std::mt19937 generator(seq); uuids::uuid_random_generator gen{generator}; diff --git a/test/weapon_test.cpp b/test/weapon_test.cpp index 50ea399..6b13309 100644 --- a/test/weapon_test.cpp +++ b/test/weapon_test.cpp @@ -4,12 +4,14 @@ #include #include +#include #include "elevation/action/add_weapon.h" #include "elevation/action/use_weapon.h" #include "elevation/data_files/languages.h" #include "elevation/entity/player.h" #include "elevation/entity/plug.h" + namespace elevation { TEST(weapon_test, UseWeapon) { entity::Player player("Guillaume", 0); @@ -20,15 +22,13 @@ TEST(weapon_test, UseWeapon) { EXPECT_EQ(player.pseudo(), "Guillaume"); - std::vector weaponsName; - std::transform(std::cbegin(player.weapons()), std::cend(player.weapons()), - std::back_inserter(weaponsName), - [](const auto& weapon) { return weapon.name; }); - std::vector expectWeaponNames = {"Poing", "AK47"}; - EXPECT_EQ(weaponsName.size(), expectWeaponNames.size()); - for (std::size_t i = 0; i < weaponsName.size(); ++i) { - EXPECT_EQ(weaponsName[i], expectWeaponNames[i]); + + EXPECT_EQ(player.weapons().size(), expectWeaponNames.size()); + + for (const auto& [playerWeapon, expectWeaponName] : + ranges::views::zip(player.weapons(), expectWeaponNames)) { + EXPECT_EQ(playerWeapon.name, expectWeaponName); } }