Merge with dev

3 files changed, 7 insertions, 90 deletions

diff --git a/test/unit/common/CMakeLists.txt b/test/unit/common/CMakeLists.txt
deleted file mode 100644
index cf37961..0000000
--- a/test/unit/common/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(SRC_DIR ${colobot_SOURCE_DIR}/src)
-
-include_directories(
-${SRC_DIR}
-${GTEST_INCLUDE_DIR}
-)
-
-add_executable(image_test ${SRC_DIR}/common/image.cpp image_test.cpp)
-target_link_libraries(image_test ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${PNG_LIBRARIES})
-add_test(NAME image_test
-         COMMAND ${CMAKE_BINARY_DIR}/image_test ${CMAKE_SOURCE_DIR}/test/envs/opengl/tex1.png ${CMAKE_BINARY_DIR}/tex1_test.png)
-
-file(COPY colobot.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-add_executable(profile_test ${SRC_DIR}/common/profile.cpp ${SRC_DIR}/common/logger.cpp profile_test.cpp)
-set_target_properties(profile_test PROPERTIES COMPILE_DEFINITIONS "DEV_BUILD=1")
-target_link_libraries(profile_test gtest ${Boost_LIBRARIES})
-
-add_test(NAME profile_test
-         COMMAND ${CMAKE_BINARY_DIR}/profile_test
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/test/unit/common/image_test.cpp b/test/unit/common/image_test.cpp
deleted file mode 100644
index 2b20a17..0000000
--- a/test/unit/common/image_test.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "common/image.h"
-
-#include <SDL.h>
-#include <stdio.h>
-
-/* For now, just a simple test: loading a file from image
- * and saving it to another in PNG. */
-
-int main(int argc, char *argv[])
-{
-    if (argc != 3)
-    {
-        printf("Usage: %s in_image out_image\n", argv[0]);
-        return 0;
-    }
-
-    CImage image;
-
-    if (! image.Load(argv[1]))
-    {
-        std::string err = image.GetError();
-        printf("Error loading '%s': %s\n", argv[1], err.c_str());
-        return 1;
-    }
-    Gfx::Color color;
-    std::string str;
-
-    color = image.GetPixel(Math::IntPoint(0, 0));
-    str = color.ToString();
-    printf("pixel @ (0,0): %s\n", str.c_str());
-
-    color = image.GetPixel(Math::IntPoint(0, 1));
-    str = color.ToString();
-    printf("pixel @ (0,1): %s\n", str.c_str());
-
-    color = image.GetPixel(Math::IntPoint(1, 0));
-    str = color.ToString();
-    printf("pixel @ (1,0): %s\n", str.c_str());
-
-    color = image.GetPixel(Math::IntPoint(1, 1));
-    str = color.ToString();
-    printf("pixel @ (1,1): %s\n", str.c_str());
-
-    image.SetPixel(Math::IntPoint(0, 0), Gfx::Color(0.1f, 0.2f, 0.3f, 0.0f));
-    image.SetPixel(Math::IntPoint(1, 0), Gfx::Color(0.3f, 0.2f, 0.1f, 1.0f));
-    image.SetPixel(Math::IntPoint(0, 1), Gfx::Color(1.0f, 1.0f, 1.0f, 1.0f));
-    image.SetPixel(Math::IntPoint(1, 1), Gfx::Color(0.0f, 0.0f, 0.0f, 1.0f));
-
-    if (! image.SavePNG(argv[2]))
-    {
-        std::string err = image.GetError();
-        printf("Error saving PNG '%s': %s\n", argv[2], err.c_str());
-        return 2;
-    }
-
-    return 0;
-}
diff --git a/test/unit/common/profile_test.cpp b/test/unit/common/profile_test.cpp
index dabcba6..2d21a90 100644
--- a/test/unit/common/profile_test.cpp
+++ b/test/unit/common/profile_test.cpp
@@ -11,34 +11,29 @@
 class CProfileTest : public testing::Test
 {
 protected:
-    CLogger m_logger;
     CProfile m_profile;
 
 };
 
 TEST_F(CProfileTest, ReadTest)
 {
-    ASSERT_TRUE(m_profile.InitCurrentDirectory()); // load colobot.ini file
+    m_profile.SetUseCurrentDirectory(true);
+
+    ASSERT_TRUE(m_profile.Init()); // load colobot.ini file
 
     std::string result;
-    ASSERT_TRUE(m_profile.GetLocalProfileString("test_string", "string_value", result));
+    ASSERT_TRUE(m_profile.GetStringProperty("test_string", "string_value", result));
     ASSERT_STREQ("Hello world", result.c_str());
 
     int int_value;
-    ASSERT_TRUE(m_profile.GetLocalProfileInt("test_int", "int_value", int_value));
+    ASSERT_TRUE(m_profile.GetIntProperty("test_int", "int_value", int_value));
     ASSERT_EQ(42, int_value);
 
     float float_value;
-    ASSERT_TRUE(m_profile.GetLocalProfileFloat("test_float", "float_value", float_value));
+    ASSERT_TRUE(m_profile.GetFloatProperty("test_float", "float_value", float_value));
     ASSERT_FLOAT_EQ(1.5, float_value);
 
     std::vector<std::string> list;
-    list = m_profile.GetLocalProfileSection("test_multi", "entry");
+    list = m_profile.GetSection("test_multi", "entry");
     ASSERT_EQ(5u, list.size());
 }
-
-int main(int argc, char *argv[])
-{
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}