blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 02:20:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Location markers part2 clang-format fixes

Browse source
This commit is contained in:
AdenKoperczak 2024-12-14 10:16:18 -05:00
parent e62ef3a7f3
commit cac89129af
9 changed files with 79 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

37
test/source/scwx/qt/model/marker_model.test.cpp
View file

@ -10,7 +10,6 @@
#include <condition_variable>
#include <gtest/gtest.h>
namespace scwx
{
namespace qt
@ -37,7 +36,6 @@ static const boost::gil::rgba8_pixel_t defaultIconColor =
util::color::ToRgba8PixelT("#ffff0000");
static const std::string defaultIconName = "images/location-marker";
void CompareFiles(const std::string& file1, const std::string& file2)
{
std::ifstream ifs1 {file1};
@ -57,7 +55,8 @@ void CopyFile(const std::string& from, const std::string& to)
CompareFiles(from, to);
}
using TestFunction = void (std::shared_ptr<manager::MarkerManager>, MarkerModel &);
using TestFunction = void(std::shared_ptr<manager::MarkerManager>,
MarkerModel&);
void RunTest(const std::string& filename, TestFunction testFunction)
{
@ -126,7 +125,10 @@ TEST(MarkerModelTest, AddRemove)
RunTest(ONE_MARKERS_FILE,
[](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&)
{ manager->add_marker(types::MarkerInfo("Null", 0, 0, defaultIconName, defaultIconColor)); });
{
manager->add_marker(types::MarkerInfo(
"Null", 0, 0, defaultIconName, defaultIconColor));
});
RunTest(
EMPTY_MARKERS_FILE,
[](std::shared_ptr<manager::MarkerManager> manager, MarkerModel& model)
@ -150,11 +152,16 @@ TEST(MarkerModelTest, AddFive)
RunTest(FIVE_MARKERS_FILE,
[](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&)
{
manager->add_marker(types::MarkerInfo("Null", 0, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo("North", 90, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo("South", -90, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo("East", 0, 90, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo("West", 0, -90, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"Null", 0, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"North", 90, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"South", -90, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"East", 0, 90, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"West", 0, -90, defaultIconName, defaultIconColor));
});
std::filesystem::remove(TEMP_MARKERS_FILE);
@ -168,10 +175,14 @@ TEST(MarkerModelTest, AddFour)
RunTest(FIVE_MARKERS_FILE,
[](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&)
{
manager->add_marker(types::MarkerInfo("North", 90, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo("South", -90, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo("East", 0, 90, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo("West", 0, -90, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"North", 90, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"South", -90, 0, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"East", 0, 90, defaultIconName, defaultIconColor));
manager->add_marker(types::MarkerInfo(
"West", 0, -90, defaultIconName, defaultIconColor));
});
std::filesystem::remove(TEMP_MARKERS_FILE);