mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 18:10:05 +00:00 
			
		
		
		
	Add part1 to part2 location marker conversion test
This commit is contained in:
		
							parent
							
								
									89ef256647
								
							
						
					
					
						commit
						3629dd36f2
					
				
					 1 changed files with 25 additions and 10 deletions
				
			
		|  | @ -26,6 +26,8 @@ static const std::string ONE_MARKERS_FILE = | ||||||
|    std::string(SCWX_TEST_DATA_DIR) + "/json/markers/markers-one.json"; |    std::string(SCWX_TEST_DATA_DIR) + "/json/markers/markers-one.json"; | ||||||
| static const std::string FIVE_MARKERS_FILE = | static const std::string FIVE_MARKERS_FILE = | ||||||
|    std::string(SCWX_TEST_DATA_DIR) + "/json/markers/markers-five.json"; |    std::string(SCWX_TEST_DATA_DIR) + "/json/markers/markers-five.json"; | ||||||
|  | static const std::string PART1_MARKER_FILE = | ||||||
|  |    std::string(SCWX_TEST_DATA_DIR) + "/json/markers/markers-part1.json"; | ||||||
| 
 | 
 | ||||||
| static std::mutex              initializedMutex {}; | static std::mutex              initializedMutex {}; | ||||||
| static std::condition_variable initializedCond {}; | static std::condition_variable initializedCond {}; | ||||||
|  | @ -33,6 +35,8 @@ static bool                    initialized; | ||||||
| 
 | 
 | ||||||
| static const boost::gil::rgba8_pixel_t defaultIconColor = | static const boost::gil::rgba8_pixel_t defaultIconColor = | ||||||
|    util::color::ToRgba8PixelT("#ffff0000"); |    util::color::ToRgba8PixelT("#ffff0000"); | ||||||
|  | static const std::string defaultIconName = "images/location-marker"; | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| void CompareFiles(const std::string& file1, const std::string& file2) | void CompareFiles(const std::string& file1, const std::string& file2) | ||||||
| { | { | ||||||
|  | @ -122,7 +126,7 @@ TEST(MarkerModelTest, AddRemove) | ||||||
| 
 | 
 | ||||||
|    RunTest(ONE_MARKERS_FILE, |    RunTest(ONE_MARKERS_FILE, | ||||||
|            [](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&) |            [](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&) | ||||||
|            { manager->add_marker(types::MarkerInfo("Null", 0, 0, "images/location-marker", defaultIconColor)); }); |            { manager->add_marker(types::MarkerInfo("Null", 0, 0, defaultIconName, defaultIconColor)); }); | ||||||
|    RunTest( |    RunTest( | ||||||
|       EMPTY_MARKERS_FILE, |       EMPTY_MARKERS_FILE, | ||||||
|       [](std::shared_ptr<manager::MarkerManager> manager, MarkerModel& model) |       [](std::shared_ptr<manager::MarkerManager> manager, MarkerModel& model) | ||||||
|  | @ -146,11 +150,11 @@ TEST(MarkerModelTest, AddFive) | ||||||
|    RunTest(FIVE_MARKERS_FILE, |    RunTest(FIVE_MARKERS_FILE, | ||||||
|            [](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&) |            [](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&) | ||||||
|            { |            { | ||||||
|               manager->add_marker(types::MarkerInfo("Null", 0, 0, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("Null", 0, 0, defaultIconName, defaultIconColor)); | ||||||
|               manager->add_marker(types::MarkerInfo("North", 90, 0, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("North", 90, 0, defaultIconName, defaultIconColor)); | ||||||
|               manager->add_marker(types::MarkerInfo("South", -90, 0, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("South", -90, 0, defaultIconName, defaultIconColor)); | ||||||
|               manager->add_marker(types::MarkerInfo("East", 0, 90, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("East", 0, 90, defaultIconName, defaultIconColor)); | ||||||
|               manager->add_marker(types::MarkerInfo("West", 0, -90, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("West", 0, -90, defaultIconName, defaultIconColor)); | ||||||
|            }); |            }); | ||||||
| 
 | 
 | ||||||
|    std::filesystem::remove(TEMP_MARKERS_FILE); |    std::filesystem::remove(TEMP_MARKERS_FILE); | ||||||
|  | @ -164,10 +168,10 @@ TEST(MarkerModelTest, AddFour) | ||||||
|    RunTest(FIVE_MARKERS_FILE, |    RunTest(FIVE_MARKERS_FILE, | ||||||
|            [](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&) |            [](std::shared_ptr<manager::MarkerManager> manager, MarkerModel&) | ||||||
|            { |            { | ||||||
|               manager->add_marker(types::MarkerInfo("North", 90, 0, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("North", 90, 0, defaultIconName, defaultIconColor)); | ||||||
|               manager->add_marker(types::MarkerInfo("South", -90, 0, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("South", -90, 0, defaultIconName, defaultIconColor)); | ||||||
|               manager->add_marker(types::MarkerInfo("East", 0, 90, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("East", 0, 90, defaultIconName, defaultIconColor)); | ||||||
|               manager->add_marker(types::MarkerInfo("West", 0, -90, "images/location-marker", defaultIconColor)); |               manager->add_marker(types::MarkerInfo("West", 0, -90, defaultIconName, defaultIconColor)); | ||||||
|            }); |            }); | ||||||
| 
 | 
 | ||||||
|    std::filesystem::remove(TEMP_MARKERS_FILE); |    std::filesystem::remove(TEMP_MARKERS_FILE); | ||||||
|  | @ -238,6 +242,17 @@ TEST(MarkerModelTest, RemoveFour) | ||||||
|    EXPECT_EQ(std::filesystem::exists(TEMP_MARKERS_FILE), false); |    EXPECT_EQ(std::filesystem::exists(TEMP_MARKERS_FILE), false); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | TEST(MarkerModelTest, UpdateFromPart1) | ||||||
|  | { | ||||||
|  |    CopyFile(PART1_MARKER_FILE, TEMP_MARKERS_FILE); | ||||||
|  | 
 | ||||||
|  |    RunTest(ONE_MARKERS_FILE, | ||||||
|  |            [](std::shared_ptr<manager::MarkerManager>, MarkerModel&) {}); | ||||||
|  | 
 | ||||||
|  |    std::filesystem::remove(TEMP_MARKERS_FILE); | ||||||
|  |    EXPECT_EQ(std::filesystem::exists(TEMP_MARKERS_FILE), false); | ||||||
|  | } | ||||||
|  | 
 | ||||||
| } // namespace model
 | } // namespace model
 | ||||||
| } // namespace qt
 | } // namespace qt
 | ||||||
| } // namespace scwx
 | } // namespace scwx
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 AdenKoperczak
						AdenKoperczak