Changeset 9114 for code/branches/testing/test

Timestamp:

Apr 22, 2012, 10:36:09 AM (13 years ago)

Author:

landauf

Message:

added tests for several classes and functions in util

Location:

code/branches/testing/test

Files:

• CMakeLists.txt (modified) (1 prop)
• CTestCustom.cmake (modified) (1 prop)
• util/CMakeLists.txt (modified) (2 diffs, 1 prop)
• util/ConvertTest.cc (added)
• util/MathTest.cc (modified) (1 diff, 1 prop)
• util/ScopeTest.cc (added)
• util/SharedPtrTest.cc (added)
• util/SingletonTest.cc (added)
• util/SmallObjectAllocatorTest.cc (added)
• util/StringUtilsTest.cc (added)
• util/SubStringTest.cc (added)
• util/VA_NARGSTest.cc (added)
• util/mboolTest.cc (added)

code/branches/testing/test/util/CMakeLists.txt

@@ -3 +3 @@
     EXCLUDE_FROM_ALL
     ${GMOCK_MAIN}
+    ConvertTest.cc
     MathTest.cc
+    mboolTest.cc
+    ScopeTest.cc
+    SharedPtrTest.cc
+    SingletonTest.cc
+    SmallObjectAllocatorTest.cc
+    StringUtilsTest.cc
+    SubStringTest.cc
+    VA_NARGSTest.cc
 )
 TARGET_LINK_LIBRARIES(util_test util gmock_orxonox)
@@ -9 +18 @@
 
 ADD_TEST(util_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/util_test)
+
+#-----------------
+
+IF(MSVC)
+  IF(CMAKE_CL_64)
+    SET(MSVC_PLATFORM "x64")
+  ELSE()
+    SET(MSVC_PLATFORM "Win32")
+  ENDIF()
+  IF(MSVC10)
+    CONFIGURE_FILE("../../src/orxonox-main.vcxproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/util_test.vcxproj.user")
+  ELSE()
+    STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?).*$" "\\1"
+           VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
+    CONFIGURE_FILE("../../src/orxonox-main.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/util_test.vcproj.user")
+  ENDIF()
+ENDIF(MSVC)

code/branches/testing/test/util/MathTest.cc

@@ -324 +324 @@
     TEST(getUniqueNumber, Test)
     {
-        std::set<float> numbers;
+        std::set<unsigned long> numbers;
 
         const size_t iterations = 1000;