Pcornat/BillySheet
1
0
Fork 0
Code Issues Pull requests Releases Activity

Compare commits

base: Pcornat:7a5d36f6ead66e695e3efd0c9d4a480ff6d2b13c
Branches Tags
Pcornat:master
..
compare: Pcornat:92575d7d085d36517f45da81a915da5130b42fd4
Branches Tags
Pcornat:master

No commits in common. "7a5d36f6ead66e695e3efd0c9d4a480ff6d2b13c" and "92575d7d085d36517f45da81a915da5130b42fd4" have entirely different histories.
7a5d36f6ea ... 92575d7d08

7 changed files with 82 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Unit testing/CMakeLists.txt
View file

@ -2,13 +2,11 @@ cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
project(UnitTest CXX)
include(CTest)
include(../external/catch2/extras/Catch.cmake)
add_executable(UnitTest
add_executable(UnitTest adummy.cpp
characteristics_tests.cpp
billy_objects_tests.cpp
sheet_tests.cpp
)
set_target_properties(Catch2 UnitTest PROPERTIES
@ -16,7 +14,7 @@ set_target_properties(Catch2 UnitTest PROPERTIES
CXX_STANDARD_REQUIRED ON
CXX_EXTENSIONS OFF
INTERPROCEDURAL_OPTIMIZATION_RELEASE ON
# UNITY_BUILD ON
UNITY_BUILD ON
)
target_include_directories(UnitTest PRIVATE ${CMAKE_SOURCE_DIR}/include)
target_compile_definitions(UnitTest PRIVATE ${DEF_COMP})

3
Unit testing/adummy.cpp Normal file
View file

@ -0,0 +1,3 @@
#define CATCH_CONFIG_MAIN
#include <catch2/catch_all.hpp>

22
Unit testing/billy_objects_tests.cpp
View file

@ -20,14 +20,12 @@ namespace character::test {
void from_json(const json &j, DummyObject &dummy) {
BillyObjects::from_json(j, dummy.objects);
}
static std::unique_ptr<GenericObject> get_obj(const billyEnums &object) noexcept {
return std::visit(overloaded{
[](const weapons &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Weapons>(arg)); },
[](const equipments &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Equipments>(arg)); },
[](const tools &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Tools>(arg)); },
},
object);
}, object);
}
}
@ -41,7 +39,9 @@ TEST_CASE("[C] Serialize empty BillyObjects", "[serialize][0]") {
serializer.clear();
REQUIRE_NOTHROW(tester.empty() == true);
REQUIRE(tester.empty()); {
REQUIRE(tester.empty());
{
std::ofstream file{ "billy_objects_empty.json" };
file << tester << std::flush;
}
@ -49,7 +49,8 @@ TEST_CASE("[C] Serialize empty BillyObjects", "[serialize][0]") {
TEST_CASE("[C] Serialize full BillyObjects", "[serialize][1]") {
BillyObjects gestionnaire{};
test::DummyObject dummy_object; {
test::DummyObject dummy_object;
{
CharacterSheet sheet;
REQUIRE(gestionnaire.insert_object(sheet, weapons::Sword));
REQUIRE(gestionnaire.insert_object(sheet, tools::Fourche));
@ -64,7 +65,9 @@ TEST_CASE("[C] Serialize full BillyObjects", "[serialize][1]") {
const auto &tester = serializer.at("sheet").at(BillyObjects::json_key);
REQUIRE_FALSE(tester.empty()); {
REQUIRE_FALSE(tester.empty());
{
std::ofstream file{ "billy_objects_full.json" };
file << tester << std::flush;
}
@ -85,6 +88,7 @@ TEST_CASE("[D] Deserialize empty BillyObjects", "[deserialize][0]") {
}
TEST_CASE("[D] Deserialize full BillyObjects", "[deserialize][1]") {
// BillyObjects gestionnaire{};
test::DummyObject dummy_object;
const auto deserializer = []() -> json {
@ -156,9 +160,9 @@ TEST_CASE("[D] Printing Billy's objects", "[printing]") {
TEST_CASE("[Z] Cleaning after all tests", "[cleaning]") {
namespace fs = std::filesystem;
const auto pwd = is_directory(fs::current_path())
? fs::directory_iterator(fs::current_path())
: fs::directory_iterator(fs::current_path().root_directory());
const auto pwd = is_directory(fs::current_path()) ?
fs::directory_iterator(fs::current_path()) :
fs::directory_iterator(fs::current_path().root_directory());
for (const auto &entry: pwd) {
if (entry.is_regular_file() && entry.path().extension() == ".json") {
fs::remove(entry);

31
Unit testing/sheet_tests.cpp
View file

@ -1,31 +0,0 @@
#include <catch2/catch_all.hpp>
#include <fstream>
#include <character_sheet.hpp>
using namespace character;
TEST_CASE("[E] Serialize sheet", "[serialize][0]") {
CharacterSheet sheet;
BillyObjects gestion{};
REQUIRE(gestion.insert_object(sheet, weapons::Sword));
REQUIRE(gestion.insert_object(sheet, weapons::Lance));
REQUIRE(gestion.insert_object(sheet, tools::Dagger));
BillyObjects::check_dagger_conditions(sheet);
BillyObjects::json serializer;
REQUIRE_NOTHROW(serializer["character_sheet"] = sheet); {
std::ofstream file{ "character_sheet.json" };
file << serializer << std::flush;
}
}
TEST_CASE("[F] Deserialize sheet", "[deserialize][0]") {
const auto deserializer = []() {
std::ifstream file{ "character_sheet.json" };
return json::parse(file);
}();
const auto sheet = deserializer.at("character_sheet").get<CharacterSheet>();
}

7
include/billy_objects.hpp
View file

@ -17,8 +17,7 @@
namespace character {
class CharacterSheet;
namespace characteristic {
namespace characteristic{
class Characteristic;
}
@ -62,7 +61,9 @@ namespace character {
[[nodiscard]] const std::minus<std::uint32_t> &get_minus_operation() const { return minus; }
static void check_dagger_conditions(CharacterSheet &sheet);
static void check_dagger_conditions(const CharacterSheet &sheet,
characteristic::Characteristic &localHabilete,
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation);
private:
std::plus<std::uint32_t> plus;

43
src/billy_objects.cpp
View file

@ -17,17 +17,11 @@ namespace character {
bool BillyObjects::insert_object(CharacterSheet &sheet, const billyEnums objType) noexcept {
if (sheet.objects.size() < 3) {
sheet.objects.emplace(objType,
std::visit(overloaded{
[](const weapons &arg) {
return std::unique_ptr<GenericObject>(std::make_unique<Weapons>(arg));
},
[](const equipments &arg) {
return std::unique_ptr<GenericObject>(std::make_unique<Equipments>(arg));
},
sheet.objects.emplace(objType, std::visit(overloaded{
[](const weapons &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Weapons>(arg)); },
[](const equipments &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Equipments>(arg)); },
[](const tools &arg) { return std::unique_ptr<GenericObject>(std::make_unique<Tools>(arg)); },
},
objType));
}, objType));
const auto &object = sheet.objects[objType];
sheet.available_objects.erase(objType);
@ -40,8 +34,7 @@ namespace character {
[&](const weapons &arg) { ++sheet.nb_weapons; },
[&](const equipments &arg) { ++sheet.nb_equipments; },
[&](const tools &arg) { ++sheet.nb_tools; },
},
objType);
}, objType);
change_carac(object, sheet, local_habilete, local_adresse, local_endurance, local_chance, plus);
return true;
}
@ -63,8 +56,7 @@ namespace character {
[&](const weapons &arg) { --sheet.nb_weapons; },
[&](const equipments &arg) { --sheet.nb_equipments; },
[&](const tools &arg) { --sheet.nb_tools; }
},
objToErase);
}, objToErase);
change_carac(obj, sheet, local_habilete, local_adresse, local_endurance, local_chance, minus);
}
}
@ -85,17 +77,19 @@ namespace character {
sheet.critique = operation(sheet.critique, arg->add_critique());
}
void BillyObjects::check_dagger_conditions(CharacterSheet &sheet) {
if (const auto it_dagger = sheet.get_objects().find(tools::Dagger); it_dagger != sheet.get_objects().cend()) {
const std::size_t count_weapons = std::count_if(sheet.get_objects().cbegin(),
sheet.get_objects().cend(),
void BillyObjects::check_dagger_conditions(const CharacterSheet &sheet,
Characteristic &localHabilete,
const std::function<std::uint32_t(std::uint32_t, std::uint32_t)> &operation) {
if (const auto it_dagger = sheet.objects.find(tools::Dagger); it_dagger != sheet.objects.cend()) {
const std::size_t count_weapons = std::count_if(sheet.objects.cbegin(),
sheet.objects.cend(),
[](container::const_reference node) {
return std::get_if<weapons>(&node.first) != nullptr;
}
);
if (const bool is_there_bow = sheet.get_objects().find(weapons::Bow) != sheet.get_objects().cend();
count_weapons > 1 || is_there_bow) {
sheet.habilete.materiel -= it_dagger->second->add_materiel(sheet.get_habilete().type);
});
const bool is_there_bow = sheet.objects.find(weapons::Bow) != sheet.objects.cend();
if (count_weapons > 1 || is_there_bow) {
localHabilete.materiel = operation(localHabilete.materiel,
-it_dagger->second->add_materiel(localHabilete.type));
}
}
}
@ -135,8 +129,7 @@ namespace character {
[&j](const tools tool) {
j.emplace_back(std::pair{ toolsHash, static_cast<std::uint8_t>(tool) });
}
},
object_type);
}, object_type);
}
}
}