13090188366

Committed 26 Jan 2025 07:59AM UTC coverage: 95.116% (-0.03%) from 95.146%

Build # 13090188366

Build Type

push

github

Committed by

web-flow

Commit Message

Eliminate warnings (#701)

* Externals in angle brackets.

* Commons from lib

* Update to preview versions of externals.

* Update fronter

* Switch to std::filesystem::path

* Unused variables

* Type conversion stuff.

* constness

* Missing headers

* Prefix increment, not postfix

* Check optional

* Remove a stray extern

* explicit

* Return an error case.

* Default value

* Enforce warnings.

* Disable some unfixable warnings.

* Update commons

* Formatting

* Fix a test

* Use fixed common

* Fix tests.

* Formatting

* Update to merged versions

* Make codefactor happier.

Run Details

965 of 1008 new or added lines in 120 files covered. (95.73%)

2 existing lines in 2 files now uncovered.

20428 of 21477 relevant lines covered (95.12%)

61689.32 hits per line

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

96.0

/src/mappers/flags/flag_mapper_tests.cpp

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

#include <filesystem>

#include "src/mappers/flags/flag_mapper.h"



using std::filesystem::path;



namespace
{

path CreateTestFolders(std::string_view test_name)
{
   const path test_path(test_name);

   path flag_folder = "output" / test_path / "gfx/flags";
   remove_all(flag_folder);
   create_directories(flag_folder);
   create_directories(flag_folder / "small");
   create_directories(flag_folder / "medium");
   return flag_folder;
}

}  // namespace



namespace mappers
{

TEST(MappersFlagsFlagMapper, SingleFlagsAreCopied)
{
   const path base_folder = CreateTestFolders("SingleFlagsAreCopied");
   FlagMapper flag_mapper(path(base_folder),
       std::map<std::string, path>{
           {"ABC", path("test_files/hoi4_world/flags/gfx/flags/ABC.tga")},
           {"DEF", path("test_files/hoi4_world/flags/gfx/flags/DEF.tga")},
       },
       {});
   EXPECT_TRUE(flag_mapper.CopyFlag("TAG"));
   // Won't override existing flag.
   EXPECT_FALSE(flag_mapper.CopyFlag("DEF"));
   // Refuses to use DEF since it exists, so it's now out of flags.
   EXPECT_FALSE(flag_mapper.CopyFlag("Z00"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "TAG.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/TAG.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/TAG.tga"));
   EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "Z00.tga"));
   EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "DEF.tga"));
}


TEST(MappersFlagsFlagMapper, MultipleFlagsAreCopied)
{
   const path base_folder = CreateTestFolders("MultipleFlagsAreCopied");
   FlagMapper flag_mapper(path(base_folder),
       std::map<std::string, path>{
           {"ABC", path("test_files/hoi4_world/flags/gfx/flags/ABC.tga")},
           {"DEF", path("test_files/hoi4_world/flags/gfx/flags/DEF.tga")},
       },
       {});
   auto tags = std::vector<std::string>{"TAG", "Z00"};
   EXPECT_TRUE(flag_mapper.CopyFlags(tags));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "TAG.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/TAG.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/TAG.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "Z00.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/Z00.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/Z00.tga"));
   EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "DEF.tga"));
}


TEST(MappersFlagsFlagMapper, ExistingFlagsAreNotCopied)
{
   const path base_folder = CreateTestFolders("ExistingFlagsAreNotCopied");
   FlagMapper flag_mapper(path(base_folder),
       std::map<std::string, path>{
           {"ABC", path("test_files/hoi4_world/flags/gfx/flags/ABC.tga")},
           {"DEF", path("test_files/hoi4_world/flags/gfx/flags/DEF.tga")},
       },
       {});
   auto tags = std::vector<std::string>{"TAG", "Z00", "DEF"};
   // Will return false because there aren't enough flags for Z00.
   EXPECT_FALSE(flag_mapper.CopyFlags(tags));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "TAG.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/TAG.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/TAG.tga"));
   EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "Z00.tga"));
   EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "DEF.tga"));
}


TEST(MappersFlagsFlagMapper, CustomFlagsAreNotCopied)
{
   const path base_folder = CreateTestFolders("CustomFlagsAreNotCopied");
   FlagMapper flag_mapper(path(base_folder),
       std::map<std::string, path>{{"ABC", path("test_files/hoi4_world/flags/gfx/flags/ABC.tga")},
           {"DEF", path("test_files/hoi4_world/flags/gfx/flags/DEF.tga")}},
       {"TAG"});
   auto tags = std::vector<std::string>{"TAG", "Z00", "DEF"};
   // TAG has a custom flag so Z00 can be assigned one.
   EXPECT_TRUE(flag_mapper.CopyFlags(tags));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "Z00.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/Z00.tga"));
   EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/Z00.tga"));
   EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "TAG.tga"));
   EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "ABC.tga"));
   EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "DEF.tga"));
}

}  // namespace mappers

1	#include <external/commonItems/OSCompatibilityLayer.h>
2	#include <external/commonItems/external/googletest/googlemock/include/gmock/gmock-matchers.h>
3	#include <external/commonItems/external/googletest/googletest/include/gtest/gtest.h>
4	#include <external/fmt/include/fmt/format.h>
5
6	#include <filesystem>
7
8	#include "src/mappers/flags/flag_mapper.h"
9
10
11
12	using std::filesystem::path;
13
14
15
16	namespace
17	{
18
19	path CreateTestFolders(std::string_view test_name)	4✔
20	{
21	const path test_path(test_name);	4✔
22
23	path flag_folder = "output" / test_path / "gfx/flags";	4✔
24	remove_all(flag_folder);	4✔
25	create_directories(flag_folder);	4✔
26	create_directories(flag_folder / "small");	4✔
27	create_directories(flag_folder / "medium");	4✔
28	return flag_folder;	8✔
29	}	4✔
30
31	} // namespace
32
33
34
35	namespace mappers
36	{
37
38	TEST(MappersFlagsFlagMapper, SingleFlagsAreCopied)	4✔
39	{
40	const path base_folder = CreateTestFolders("SingleFlagsAreCopied");	1✔
41	FlagMapper flag_mapper(path(base_folder),	2✔
42	std::map<std::string, path>{	5✔
NEW 43	{"ABC", path("test_files/hoi4_world/flags/gfx/flags/ABC.tga")},	×
44	{"DEF", path("test_files/hoi4_world/flags/gfx/flags/DEF.tga")},	1✔
45	},	3✔
46	{});	3✔
47	EXPECT_TRUE(flag_mapper.CopyFlag("TAG"));	1✔
48	// Won't override existing flag.
49	EXPECT_FALSE(flag_mapper.CopyFlag("DEF"));	1✔
50	// Refuses to use DEF since it exists, so it's now out of flags.
51	EXPECT_FALSE(flag_mapper.CopyFlag("Z00"));	1✔
52	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "TAG.tga"));	1✔
53	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/TAG.tga"));	1✔
54	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/TAG.tga"));	1✔
55	EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "Z00.tga"));	1✔
56	EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "DEF.tga"));	1✔
57	}	2✔
58
59
60	TEST(MappersFlagsFlagMapper, MultipleFlagsAreCopied)	4✔
61	{
62	const path base_folder = CreateTestFolders("MultipleFlagsAreCopied");	1✔
63	FlagMapper flag_mapper(path(base_folder),	2✔
64	std::map<std::string, path>{	5✔
NEW 65	{"ABC", path("test_files/hoi4_world/flags/gfx/flags/ABC.tga")},	×
66	{"DEF", path("test_files/hoi4_world/flags/gfx/flags/DEF.tga")},	1✔
67	},	3✔
68	{});	3✔
69	auto tags = std::vector<std::string>{"TAG", "Z00"};	3✔
70	EXPECT_TRUE(flag_mapper.CopyFlags(tags));	1✔
71	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "TAG.tga"));	1✔
72	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/TAG.tga"));	1✔
73	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/TAG.tga"));	1✔
74	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "Z00.tga"));	1✔
75	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/Z00.tga"));	1✔
76	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/Z00.tga"));	1✔
77	EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "DEF.tga"));	1✔
78	}	4✔
79
80
81	TEST(MappersFlagsFlagMapper, ExistingFlagsAreNotCopied)	4✔
82	{
83	const path base_folder = CreateTestFolders("ExistingFlagsAreNotCopied");	1✔
84	FlagMapper flag_mapper(path(base_folder),	2✔
85	std::map<std::string, path>{	5✔
NEW 86	{"ABC", path("test_files/hoi4_world/flags/gfx/flags/ABC.tga")},	×
87	{"DEF", path("test_files/hoi4_world/flags/gfx/flags/DEF.tga")},	1✔
88	},	3✔
89	{});	3✔
90	auto tags = std::vector<std::string>{"TAG", "Z00", "DEF"};	4✔
91	// Will return false because there aren't enough flags for Z00.
92	EXPECT_FALSE(flag_mapper.CopyFlags(tags));	1✔
93	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "TAG.tga"));	1✔
94	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/TAG.tga"));	1✔
95	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/TAG.tga"));	1✔
96	EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "Z00.tga"));	1✔
97	EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "DEF.tga"));	1✔
98	}	4✔
99
100
101	TEST(MappersFlagsFlagMapper, CustomFlagsAreNotCopied)	4✔
102	{
103	const path base_folder = CreateTestFolders("CustomFlagsAreNotCopied");	1✔
104	FlagMapper flag_mapper(path(base_folder),	2✔
105	std::map<std::string, path>{{"ABC", path("test_files/hoi4_world/flags/gfx/flags/ABC.tga")},	5✔
106	{"DEF", path("test_files/hoi4_world/flags/gfx/flags/DEF.tga")}},	4✔
107	{"TAG"});	4✔
108	auto tags = std::vector<std::string>{"TAG", "Z00", "DEF"};	4✔
109	// TAG has a custom flag so Z00 can be assigned one.
110	EXPECT_TRUE(flag_mapper.CopyFlags(tags));	1✔
111	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "Z00.tga"));	1✔
112	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "small/Z00.tga"));	1✔
113	EXPECT_TRUE(commonItems::DoesFileExist(base_folder / "medium/Z00.tga"));	1✔
114	EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "TAG.tga"));	1✔
115	EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "ABC.tga"));	1✔
116	EXPECT_FALSE(commonItems::DoesFileExist(base_folder / "DEF.tga"));	1✔
117	}	5✔
118
119	} // namespace mappers

ParadoxGameConverters / Vic3ToHoI4 / 13090188366

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