0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup tests (thanks @celticminstrel)

Browse source 
Seems there were a few problems post-e46dfcc
- There was no need to use std::remove on a set, since the values are already unique (and std::remove
  doesn't work with a set anyway). We can just specify the value to remove directly.
- std::sort isn't supported and is redundant on a set - the values are already sorted.
This commit is contained in:
Charles Dang 2017-05-30 12:56:58 +11:00
parent 99a2da2e06
commit 51ed9fbce2
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/tests/gui/test_gui2.cpp
View file

@ -141,18 +141,14 @@ namespace dialogs {
std::string unit_test_mark_as_tested(const modal_dialog& dialog)
{
std::set<std::string>& list = unit_test_registered_window_list();
list.erase(
std::remove(list.begin(), list.end(), dialog.window_id())
, list.end());
list.erase(dialog.window_id());
return dialog.window_id();
}
std::string unit_test_mark_popup_as_tested(const modeless_dialog& dialog)
{
std::set<std::string>& list = unit_test_registered_window_list();
list.erase(
std::remove(list.begin(), list.end(), dialog.window_id())
, list.end());
list.erase(dialog.window_id());
return dialog.window_id();
}
@ -284,9 +280,8 @@ namespace {
CVideo& video = test_utils::get_fake_display(resolution.first, resolution.second).video();
std::set<std::string>& list =
gui2::unit_test_registered_window_list();
list.erase(std::remove(list.begin(), list.end(), id), list.end());
std::set<std::string>& list = gui2::unit_test_registered_window_list();
list.erase(id);
std::string exception;
try {
@ -517,8 +512,7 @@ BOOST_AUTO_TEST_CASE(test_gui2)
"outro",
"mp_change_control", // Basically useless without a game_board object, so disabling
};
std::sort(list.begin(), list.end());
std::sort(omitted.begin(), omitted.end());
std::vector<std::string> missing;
std::set_difference(list.begin(), list.end(), omitted.begin(), omitted.end(), std::back_inserter(missing));