summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2013-03-29 10:48:25 +0100
committerkrzys-h <krzys_h@interia.pl>2013-03-29 10:48:25 +0100
commit7fe1655c5ca6117f76e7f486a0f7c1b334c1d825 (patch)
treec6ed76634d5ef873569cd6c13aa8f124dbfed3fa /test
parent530344724c4dac68caf47eb94c42dfec74a52317 (diff)
downloadcolobot-7fe1655c5ca6117f76e7f486a0f7c1b334c1d825.tar.gz
colobot-7fe1655c5ca6117f76e7f486a0f7c1b334c1d825.tar.bz2
colobot-7fe1655c5ca6117f76e7f486a0f7c1b334c1d825.zip
Fixed edit_test
Diffstat (limited to 'test')
-rw-r--r--test/unit/ui/CMakeLists.txt46
-rw-r--r--test/unit/ui/stubs/app_stub.cpp5
2 files changed, 28 insertions, 23 deletions
diff --git a/test/unit/ui/CMakeLists.txt b/test/unit/ui/CMakeLists.txt
index 9505bd9..c899834 100644
--- a/test/unit/ui/CMakeLists.txt
+++ b/test/unit/ui/CMakeLists.txt
@@ -16,26 +16,26 @@ else()
set(SYSTEM_CPP_MODULE "system_other.cpp")
endif()
-#add_executable(edit_test
-#${SRC_DIR}/app/system.cpp
-#${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
-#${SRC_DIR}/common/event.cpp
-#${SRC_DIR}/common/logger.cpp
-#${SRC_DIR}/common/misc.cpp
-#${SRC_DIR}/common/profile.cpp
-#${SRC_DIR}/common/iman.cpp
-#${SRC_DIR}/common/stringutils.cpp
-#${SRC_DIR}/graphics/engine/text.cpp
-#${SRC_DIR}/ui/button.cpp
-#${SRC_DIR}/ui/control.cpp
-#${SRC_DIR}/ui/edit.cpp
-#${SRC_DIR}/ui/scroll.cpp
-#stubs/app_stub.cpp
-#stubs/engine_stub.cpp
-#stubs/particle_stub.cpp
-#stubs/restext_stub.cpp
-#stubs/robotmain_stub.cpp
-#edit_test.cpp)
-#target_link_libraries(edit_test gtest gmock ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES})
-#
-#add_test(edit_test ./edit_test)
+add_executable(edit_test
+${SRC_DIR}/app/system.cpp
+${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
+${SRC_DIR}/common/event.cpp
+${SRC_DIR}/common/logger.cpp
+${SRC_DIR}/common/misc.cpp
+${SRC_DIR}/common/profile.cpp
+${SRC_DIR}/common/iman.cpp
+${SRC_DIR}/common/stringutils.cpp
+${SRC_DIR}/graphics/engine/text.cpp
+${SRC_DIR}/ui/button.cpp
+${SRC_DIR}/ui/control.cpp
+${SRC_DIR}/ui/edit.cpp
+${SRC_DIR}/ui/scroll.cpp
+stubs/app_stub.cpp
+stubs/engine_stub.cpp
+stubs/particle_stub.cpp
+stubs/restext_stub.cpp
+stubs/robotmain_stub.cpp
+edit_test.cpp)
+target_link_libraries(edit_test gtest gmock ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES})
+
+add_test(edit_test ./edit_test)
diff --git a/test/unit/ui/stubs/app_stub.cpp b/test/unit/ui/stubs/app_stub.cpp
index c8e7bc6..e51bbc6 100644
--- a/test/unit/ui/stubs/app_stub.cpp
+++ b/test/unit/ui/stubs/app_stub.cpp
@@ -45,3 +45,8 @@ Event CApplication::CreateUpdateEvent()
{
return Event(EVENT_NULL);
}
+
+char GetLanguageChar()
+{
+ return "E";
+}