Disabled the image_message class testing for real.
This commit is contained in:
parent
175aaa99b2
commit
a97e6899b4
1 changed files with 79 additions and 10 deletions
|
@ -52,10 +52,11 @@
|
|||
#include "gui/dialogs/transient_message.hpp"
|
||||
#include "gui/dialogs/unit_attack.hpp"
|
||||
#include "gui/dialogs/unit_create.hpp"
|
||||
#include "gui/dialogs/image_message/image_message.hpp"
|
||||
//TODO enable when safe
|
||||
//#include "gui/dialogs/image_message/image_message.hpp"
|
||||
//#include "gui/dialogs/image_message/input_message.hpp"
|
||||
//#include "gui/dialogs/image_message/option_message.hpp"
|
||||
//#include "gui/dialogs/image_message/unit_message.hpp"
|
||||
#include "gui/widgets/settings.hpp"
|
||||
#include "language.hpp"
|
||||
#include "map_create.hpp"
|
||||
|
@ -232,14 +233,15 @@ BOOST_AUTO_TEST_CASE(test_gui2)
|
|||
test<gui2::ttransient_message>();
|
||||
// test<gui2::tunit_attack>(); /** @todo ENABLE */
|
||||
test<gui2::tunit_create>();
|
||||
test<gui2::timage_message_left>();
|
||||
test<gui2::timage_message_right>();
|
||||
//TODO enable when safe
|
||||
// test<gui2::timage_message_left>();
|
||||
// test<gui2::timage_message_right>();
|
||||
// test<gui2::tinput_message_left>();
|
||||
// test<gui2::tinput_message_right>();
|
||||
// test<gui2::toption_message_left>();
|
||||
// test<gui2::toption_message_right>();
|
||||
|
||||
// test<gui2::tunit_message_left>();
|
||||
// test<gui2::tunit_message_right>();
|
||||
|
||||
std::vector<std::string>& list = gui2::unit_test_registered_window_list();
|
||||
|
||||
|
@ -249,6 +251,36 @@ BOOST_AUTO_TEST_CASE(test_gui2)
|
|||
* This list marks some dialogs as tested that are not tested.
|
||||
* This list should be removed so all dialogs are properly tested.
|
||||
*/
|
||||
// list.erase(
|
||||
// std::remove(list.begin(), list.end(), "timage_message_left")
|
||||
// , list.end());
|
||||
// list.erase(
|
||||
// std::remove(list.begin(), list.end(), "timage_message_right")
|
||||
// , list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "toption_message_left")
|
||||
, list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "toption_message_right")
|
||||
, list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "tinput_message_left")
|
||||
, list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "tinput_message_right")
|
||||
, list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "tunit_message_left")
|
||||
, list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "tunit_message_right")
|
||||
, list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "trecruit_message_left")
|
||||
, list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "trecruit_message_right")
|
||||
, list.end());
|
||||
list.erase(
|
||||
std::remove(list.begin(), list.end(), "debug_clock")
|
||||
, list.end());
|
||||
|
@ -518,24 +550,61 @@ struct twrapper<gui2::ttransient_message>
|
|||
}
|
||||
};
|
||||
|
||||
template<>
|
||||
struct twrapper<gui2::timage_message_left>
|
||||
{
|
||||
static gui2::timage_message_left* create()
|
||||
{
|
||||
return new gui2::timage_message_left("Title", "Message", "", false);
|
||||
}
|
||||
};
|
||||
|
||||
template<>
|
||||
struct twrapper<gui2::timage_message_right>
|
||||
{
|
||||
static gui2::timage_message_right* create()
|
||||
{
|
||||
return new gui2::timage_message_right("Title", "Message", "", false);
|
||||
}
|
||||
};
|
||||
|
||||
//TODO enable again when safe
|
||||
//template<>
|
||||
//struct twrapper<gui2::timage_message_left>
|
||||
//struct twrapper<gui2::tinput_message_left>
|
||||
//{
|
||||
// static gui2::timage_message_left* create()
|
||||
// static gui2::tinput_message_left* create()
|
||||
// {
|
||||
// return new gui2::timage_message_left("Title", "Message", "", false);
|
||||
// return new gui2::tinput_message_left("Title", "Message", "", false);
|
||||
// }
|
||||
//};
|
||||
//
|
||||
//template<>
|
||||
//struct twrapper<gui2::timage_message_right>
|
||||
//struct twrapper<gui2::tinput_message_right>
|
||||
//{
|
||||
// static gui2::timage_message_right* create()
|
||||
// static gui2::tinput_message_right* create()
|
||||
// {
|
||||
// return new gui2::timage_message_right("Title", "Message", "", false);
|
||||
// return new gui2::tinput_message_right("Title", "Message", "", false);
|
||||
// }
|
||||
//};
|
||||
//
|
||||
//template<>
|
||||
//struct twrapper<gui2::option_message_left>
|
||||
//{
|
||||
// static gui2::toption_message_left* create()
|
||||
// {
|
||||
// return new gui2::toption_message_left("Title", "Message", "", false);
|
||||
// }
|
||||
//};
|
||||
//
|
||||
//template<>
|
||||
//struct twrapper<gui2::toption_message_right>
|
||||
//{
|
||||
// static gui2::toption_message_right* create()
|
||||
// {
|
||||
// return new gui2::toption_message_right("Title", "Message", "", false);
|
||||
// }
|
||||
//};
|
||||
|
||||
|
||||
} // namespace
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue