Fix util::ecs tests

This commit is contained in:
Nikita Lisitsa 2022-01-20 20:32:22 +03:00
parent 11b2d002ba
commit e5ba642c5d

View file

@ -63,10 +63,10 @@ namespace
int call_count = 0;
void operator()(test_component_1::data &, test_component_2::data &, components const & cs)
void operator()(test_component_1::data &, test_component_2::data &, context const & ctx)
{
expect_equal(std::get<test_component_1>(cs).species_value_1, expected_value_1);
expect_equal(std::get<test_component_2>(cs).species_value_2, expected_value_2);
expect_equal(ctx.get<test_component_1>().species_value_1, expected_value_1);
expect_equal(ctx.get<test_component_2>().species_value_2, expected_value_2);
++call_count;
}
@ -78,19 +78,19 @@ test_case(util_ecs_species__impl_component)
{
using namespace psemek::util::ecs_detail;
species_impl<test_component_1> species("species 1", test_component_1{10});
species_impl<test_component_1> species("species 1", 0, test_component_1{10});
expect_different_ptr(species.get_species_component<test_component_1>(), nullptr);
expect_equal(species.get_species_component<test_component_1>()->species_value_1, 10);
expect_equal_ptr(species.get_species_component<test_component_2>(), nullptr);
species_impl<test_component_2> species_2("species 2", test_component_2{20});
species_impl<test_component_2> species_2("species 2", 1, test_component_2{20});
expect_equal_ptr(species_2.get_species_component<test_component_1>(), nullptr);
expect_different_ptr(species_2.get_species_component<test_component_2>(), nullptr);
expect_equal(species_2.get_species_component<test_component_2>()->species_value_2, 20);
species_impl<test_component_1, test_component_2> species_12("species 12", test_component_1{100}, test_component_2{200});
species_impl<test_component_1, test_component_2> species_12("species 12", 2, test_component_1{100}, test_component_2{200});
expect_different_ptr(species_12.get_species_component<test_component_1>(), nullptr);
expect_equal(species_12.get_species_component<test_component_1>()->species_value_1, 100);
@ -102,7 +102,7 @@ test_case(util_ecs_species__impl_entity)
{
using namespace psemek::util::ecs_detail;
species_impl<test_component_1> species("species", test_component_1{10});
species_impl<test_component_1> species("species", 0, test_component_1{10});
expect_equal(species.entity_count(), 0);