From 3569adb10377d83beeb705870f015cc1f40aeffc Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Fri, 29 Mar 2013 16:13:37 +0100
Subject: * Fixed and turned on edit_test

---
 test/unit/ui/CMakeLists.txt     | 46 ++++++++++++++++++++---------------------
 test/unit/ui/stubs/app_stub.cpp |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'test')

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 55263e6..9b33e5e 100644
--- a/test/unit/ui/stubs/app_stub.cpp
+++ b/test/unit/ui/stubs/app_stub.cpp
@@ -46,7 +46,7 @@ Event CApplication::CreateUpdateEvent()
     return Event(EVENT_NULL);
 }
 
-char GetLanguageChar()
+char CApplication::GetLanguageChar()
 {
     return 'E';
 }
-- 
cgit v1.2.3-1-g7c22