Tests on billy objects work now
This commit is contained in:
		
					parent
					
						
							
								7ed56f1b78
							
						
					
				
			
			
				commit
				
					
						166fa6007a
					
				
			
		
					 1 changed files with 30 additions and 22 deletions
				
			
		| 
						 | 
					@ -3,6 +3,7 @@
 | 
				
			||||||
#include <fstream>
 | 
					#include <fstream>
 | 
				
			||||||
#include "billy_objects.hpp"
 | 
					#include "billy_objects.hpp"
 | 
				
			||||||
#include "character_sheet.hpp"
 | 
					#include "character_sheet.hpp"
 | 
				
			||||||
 | 
					#include "generic_object.hpp"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
using namespace character;
 | 
					using namespace character;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,6 +20,13 @@ namespace character::test {
 | 
				
			||||||
    void from_json(const json &j, DummyObject &dummy) {
 | 
					    void from_json(const json &j, DummyObject &dummy) {
 | 
				
			||||||
        BillyObjects::from_json(j, dummy.objects);
 | 
					        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);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_CASE("[C] Serialize empty BillyObjects", "[serialize][0]") {
 | 
					TEST_CASE("[C] Serialize empty BillyObjects", "[serialize][0]") {
 | 
				
			||||||
| 
						 | 
					@ -44,10 +52,12 @@ TEST_CASE("[C] Serialize full BillyObjects", "[serialize][1]") {
 | 
				
			||||||
    test::DummyObject dummy_object;
 | 
					    test::DummyObject dummy_object;
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        CharacterSheet sheet;
 | 
					        CharacterSheet sheet;
 | 
				
			||||||
        gestionnaire.push_object(weapons::Sword, sheet);
 | 
					        REQUIRE(gestionnaire.insert_object(sheet, weapons::Sword));
 | 
				
			||||||
        gestionnaire.push_object(tools::Fourche, sheet);
 | 
					        REQUIRE(gestionnaire.insert_object(sheet, tools::Fourche));
 | 
				
			||||||
        gestionnaire.push_object(equipments::MedicKit, sheet);
 | 
					        REQUIRE(gestionnaire.insert_object(sheet, equipments::MedicKit));
 | 
				
			||||||
        dummy_object.objects = sheet.get_objects();
 | 
					        for (const auto &[obj_type, _]: sheet.get_objects()) {
 | 
				
			||||||
 | 
					            dummy_object.objects.emplace(obj_type, test::get_obj(obj_type));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    json serializer;
 | 
					    json serializer;
 | 
				
			||||||
| 
						 | 
					@ -78,7 +88,7 @@ TEST_CASE("[D] Deserialize empty BillyObjects", "[deserialize][0]") {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_CASE("[D] Deserialize full BillyObjects", "[deserialize][1]") {
 | 
					TEST_CASE("[D] Deserialize full BillyObjects", "[deserialize][1]") {
 | 
				
			||||||
    BillyObjects gestionnaire{};
 | 
					//    BillyObjects gestionnaire{};
 | 
				
			||||||
    test::DummyObject dummy_object;
 | 
					    test::DummyObject dummy_object;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const auto deserializer = []() -> json {
 | 
					    const auto deserializer = []() -> json {
 | 
				
			||||||
| 
						 | 
					@ -90,21 +100,18 @@ TEST_CASE("[D] Deserialize full BillyObjects", "[deserialize][1]") {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    REQUIRE_FALSE(dummy_object.objects.empty());
 | 
					    REQUIRE_FALSE(dummy_object.objects.empty());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    REQUIRE_FALSE(std::holds_alternative<tools>(dummy_object.objects[0]));
 | 
					    REQUIRE_NOTHROW(dummy_object.objects.at(weapons::Sword));
 | 
				
			||||||
    REQUIRE(std::holds_alternative<weapons>(dummy_object.objects[0]));
 | 
					    REQUIRE(std::get<weapons>(dummy_object.objects.at(weapons::Sword)->get_type()) == weapons::Sword);
 | 
				
			||||||
    REQUIRE(std::get<weapons>(dummy_object.objects[0]) == weapons::Sword);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    REQUIRE_FALSE(std::holds_alternative<weapons>(dummy_object.objects[1]));
 | 
					    REQUIRE_NOTHROW(dummy_object.objects.at(tools::Fourche));
 | 
				
			||||||
    REQUIRE(std::holds_alternative<tools>(dummy_object.objects[1]));
 | 
					    REQUIRE(std::get<tools>(dummy_object.objects.at(tools::Fourche)->get_type()) == tools::Fourche);
 | 
				
			||||||
    REQUIRE(std::get<tools>(dummy_object.objects[1]) == tools::Fourche);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    REQUIRE_FALSE(std::holds_alternative<weapons>(dummy_object.objects[2]));
 | 
					    REQUIRE_NOTHROW(dummy_object.objects.at(equipments::MedicKit));
 | 
				
			||||||
    REQUIRE(std::holds_alternative<equipments>(dummy_object.objects[2]));
 | 
					    REQUIRE(std::get<equipments>(dummy_object.objects.at(equipments::MedicKit)->get_type()) == equipments::MedicKit);
 | 
				
			||||||
    REQUIRE(std::get<equipments>(dummy_object.objects[2]) == equipments::MedicKit);
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_CASE("[D] Pushing popping BillyObjects", "[pushpop][0]") {
 | 
					TEST_CASE("[D] Pushing popping BillyObjects", "[pushpop][0]") {
 | 
				
			||||||
    constexpr std::array<BillyObjects::billyObject, 12> all_objects{
 | 
					    constexpr std::array<billyEnums, 12> all_objects{
 | 
				
			||||||
            weapons::Sword,
 | 
					            weapons::Sword,
 | 
				
			||||||
            weapons::Lance,
 | 
					            weapons::Lance,
 | 
				
			||||||
            weapons::Morgenstern,
 | 
					            weapons::Morgenstern,
 | 
				
			||||||
| 
						 | 
					@ -123,22 +130,22 @@ TEST_CASE("[D] Pushing popping BillyObjects", "[pushpop][0]") {
 | 
				
			||||||
    CharacterSheet sheet;
 | 
					    CharacterSheet sheet;
 | 
				
			||||||
    REQUIRE(sheet.get_objects().empty());
 | 
					    REQUIRE(sheet.get_objects().empty());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    REQUIRE_NOTHROW(gestionnaire.push_object(weapons::Sword, sheet));
 | 
					    REQUIRE(gestionnaire.insert_object(sheet, weapons::Sword));
 | 
				
			||||||
    REQUIRE_FALSE(sheet.get_objects().empty());
 | 
					    REQUIRE_FALSE(sheet.get_objects().empty());
 | 
				
			||||||
    REQUIRE(std::holds_alternative<weapons>(sheet.get_objects().back()));
 | 
					    REQUIRE_NOTHROW(sheet.get_objects().at(weapons::Sword));
 | 
				
			||||||
    REQUIRE(std::get<weapons>(sheet.get_objects().back()) == weapons::Sword);
 | 
					    REQUIRE(std::get<weapons>(sheet.get_objects().at(weapons::Sword)->get_type()) == weapons::Sword);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    REQUIRE_NOTHROW(gestionnaire.pop_object(sheet));
 | 
					    REQUIRE_NOTHROW(gestionnaire.erase_object(sheet, weapons::Sword));
 | 
				
			||||||
    REQUIRE(sheet.get_objects().empty());
 | 
					    REQUIRE(sheet.get_objects().empty());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for (std::size_t j = 0; j < all_objects.size(); j += 3) {
 | 
					    for (std::size_t j = 0; j < all_objects.size(); j += 3) {
 | 
				
			||||||
        for (std::size_t i = 0; i < 3; ++i) {
 | 
					        for (std::size_t i = 0; i < 3; ++i) {
 | 
				
			||||||
            REQUIRE_NOTHROW(gestionnaire.push_object(all_objects[i + j], sheet));
 | 
					            REQUIRE_NOTHROW(gestionnaire.insert_object(sheet, all_objects[i + j]));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        REQUIRE_FALSE(sheet.get_objects().empty());
 | 
					        REQUIRE_FALSE(sheet.get_objects().empty());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for (std::size_t i = 0; i < 3; ++i) {
 | 
					        for (std::size_t i = 0; i < 3; ++i) {
 | 
				
			||||||
            REQUIRE_NOTHROW(gestionnaire.pop_object(sheet));
 | 
					            REQUIRE_NOTHROW(gestionnaire.erase_object(sheet, all_objects[i + j]));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        REQUIRE(sheet.get_objects().empty());
 | 
					        REQUIRE(sheet.get_objects().empty());
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					@ -146,7 +153,8 @@ TEST_CASE("[D] Pushing popping BillyObjects", "[pushpop][0]") {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_CASE("[D] Printing Billy's objects", "[printing]") {
 | 
					TEST_CASE("[D] Printing Billy's objects", "[printing]") {
 | 
				
			||||||
    for (const auto &object: BillyObjects::all_objects) {
 | 
					    for (const auto &object: BillyObjects::all_objects) {
 | 
				
			||||||
        REQUIRE_NOTHROW(BillyObjects::billy_object_to_string(object));
 | 
					        const std::unique_ptr<GenericObject> obj = test::get_obj(object);
 | 
				
			||||||
 | 
					        REQUIRE_NOTHROW(BillyObjects::billy_object_to_string(obj));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue