16395524851

Committed 20 Jul 2025 03:17AM UTC coverage: 94.204% (-0.004%) from 94.208%

Build # 16395524851

Build Type

push

github

Committed by

web-flow

Commit Message

Add clang-tidy modernize checks (#741)

* Add clang-tidy modernize checks

* Remove duplicated lines

* Formatting

* Formatting tweaks

* More formatting tweaks

Coverage Stats

365 of 428 new or added lines in 30 files covered. (85.28%)

22168 of 23532 relevant lines covered (94.2%)

56303.36 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

80.0

/src/mappers/resources/resource_mapper_tests.cpp

#include <external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h>
#include <external/commonItems/external/googletest/googletest/include/gtest/gtest.h>

#include "src/mappers/resources/resource_mapper.h"

constexpr float kTolerance = 0.0001F;

namespace mappers
{

TEST(MappersResourcesResourceMapperTests, EmptyMapperNoInfo)
{
   std::map<std::string, ResourceScore> empty{};
   ResourceMapper mapper(empty);

   std::vector<vic3::Building> buildings{{"building_iron_mine", 1, 1.0F, 1.0F, {}}};
   EXPECT_NEAR(mapper.CalculateScore("some_resource", buildings), 0.0F, kTolerance);
   EXPECT_NEAR(mapper.WorldTotal("some_resource"), 0.0F, kTolerance);
}

TEST(MappersResourcesResourceMapperTests, ScoresAreCalculated)
{
   std::map<std::string, ResourceScore> steel{
       {"steel", {.base = {{"building_iron_mine", 1.0F}}, .bonus_buildings = {}, .bonus = 0.0F, .total = 1.0F}},
   };
   ResourceMapper mapper(steel);

   std::vector<vic3::Building> buildings{{"building_iron_mine", 1, 1.0F, 1.0F, {}}};
   EXPECT_NEAR(mapper.CalculateScore("steel", buildings), 1.0F, kTolerance);
   EXPECT_NEAR(mapper.CalculateScore("oil", buildings), 0.0F, kTolerance);
   EXPECT_NEAR(mapper.WorldTotal("steel"), 1.0F, kTolerance);
   EXPECT_NEAR(mapper.WorldTotal("oil"), 0.0F, kTolerance);
}

TEST(MappersResourcesResourceMapperTests, BonusIsAppliedAndCapped)
{
   std::map<std::string, ResourceScore> scores{
       {
           "steel",
           {
               .base = {{"building_iron_mine", 1.0F}},
               .bonus_buildings = {"building_coal_mine"},
               .bonus = 0.1F,
               .total = 0.0F,
           },
       },
       {
           "oil",
           {
               .base = {{"building_oil_rig", 1.0F}},
               .bonus_buildings = {"building_coal_mine"},
               .bonus = 0.1F,
               .total = 0.0F,
           },
       },
   };
   ResourceMapper mapper(scores);

   std::vector<vic3::Building> buildings{
       {"building_iron_mine", 1, 1.0F, 1.0F, {}},
       {"building_oil_rig", 1, 0.1F, 1.0F, {}},
       {
           "building_coal_mine",
           1,
           0.5F,
           1.0F,
           {},
       },
   };
   EXPECT_NEAR(mapper.CalculateScore("steel", buildings), 1.05F, kTolerance);
   EXPECT_NEAR(mapper.CalculateScore("oil", buildings), 0.11F, kTolerance);
   EXPECT_NEAR(mapper.CalculateScore("tungsten", buildings), 0.0F, kTolerance);
}

}  // namespace mappers

1	#include <external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h>
2	#include <external/commonItems/external/googletest/googletest/include/gtest/gtest.h>
3
4	#include "src/mappers/resources/resource_mapper.h"
5
6	constexpr float kTolerance = 0.0001F;
7
8	namespace mappers
9	{
10
11	TEST(MappersResourcesResourceMapperTests, EmptyMapperNoInfo)	4✔
12	{
13	std::map<std::string, ResourceScore> empty{};	1✔
14	ResourceMapper mapper(empty);	1✔
15
16	std::vector<vic3::Building> buildings{{"building_iron_mine", 1, 1.0F, 1.0F, {}}};	2✔
17	EXPECT_NEAR(mapper.CalculateScore("some_resource", buildings), 0.0F, kTolerance);	1✔
18	EXPECT_NEAR(mapper.WorldTotal("some_resource"), 0.0F, kTolerance);	1✔
19	}	3✔
20
21	TEST(MappersResourcesResourceMapperTests, ScoresAreCalculated)	4✔
22	{
23	std::map<std::string, ResourceScore> steel{
NEW 24	{"steel", {.base = {{"building_iron_mine", 1.0F}}, .bonus_buildings = {}, .bonus = 0.0F, .total = 1.0F}},	×
25	};	3✔
26	ResourceMapper mapper(steel);	1✔
27
28	std::vector<vic3::Building> buildings{{"building_iron_mine", 1, 1.0F, 1.0F, {}}};	2✔
29	EXPECT_NEAR(mapper.CalculateScore("steel", buildings), 1.0F, kTolerance);	1✔
30	EXPECT_NEAR(mapper.CalculateScore("oil", buildings), 0.0F, kTolerance);	1✔
31	EXPECT_NEAR(mapper.WorldTotal("steel"), 1.0F, kTolerance);	1✔
32	EXPECT_NEAR(mapper.WorldTotal("oil"), 0.0F, kTolerance);	1✔
33	}	6✔
34
35	TEST(MappersResourcesResourceMapperTests, BonusIsAppliedAndCapped)	4✔
36	{
37	std::map<std::string, ResourceScore> scores{
38	{
39	"steel",
40	{
NEW 41	.base = {{"building_iron_mine", 1.0F}},	×
42	.bonus_buildings = {"building_coal_mine"},
43	.bonus = 0.1F,
44	.total = 0.0F,
45	},
46	},
47	{
48	"oil",
49	{
NEW 50	.base = {{"building_oil_rig", 1.0F}},	×
51	.bonus_buildings = {"building_coal_mine"},
52	.bonus = 0.1F,
53	.total = 0.0F,
54	},
55	},
56	};	7✔
57	ResourceMapper mapper(scores);	1✔
58
59	std::vector<vic3::Building> buildings{
60	{"building_iron_mine", 1, 1.0F, 1.0F, {}},	×
61	{"building_oil_rig", 1, 0.1F, 1.0F, {}},	×
62	{
63	"building_coal_mine",
NEW 64	1,	×
65	0.5F,
66	1.0F,
67	{},
68	},
69	};	4✔
70	EXPECT_NEAR(mapper.CalculateScore("steel", buildings), 1.05F, kTolerance);	1✔
71	EXPECT_NEAR(mapper.CalculateScore("oil", buildings), 0.11F, kTolerance);	1✔
72	EXPECT_NEAR(mapper.CalculateScore("tungsten", buildings), 0.0F, kTolerance);	1✔
73	}	9✔
74
75	} // namespace mappers

ParadoxGameConverters / Vic3ToHoI4 / 16395524851

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous