Author: fendrin
Date: Sat Mar 5 21:39:56 2011
New Revision: 48769
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48769&view=rev
Log:
Disabled the image_message class testing for real.
Modified:
trunk/src/tests/gui/test_gui2.cpp
Modified: trunk/src/tests/gui/test_gui2.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tests/gui/test_gui2.cpp?rev=48769&r1=48768&r2=48769&view=diff
==============================================================================
--- trunk/src/tests/gui/test_gui2.cpp (original)
+++ trunk/src/tests/gui/test_gui2.cpp Sat Mar 5 21:39:56 2011
@@ -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 @@
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 @@
* 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 @@
}
};
+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
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
