Changeset 9114

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

Files:

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

code/branches/testing/src/libraries/util/SignalHandler.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Christoph Renner
+ *      Christoph Renner (Linux implementation)
+ *      Fabian 'x3n' Landau (Windows implementation)
  *   Co-authors:
  *      ...
@@ -139 +140 @@
       orxout(user_error) << "Received signal " << sigName.c_str() << endl << "Try to write backtrace to file orxonox_crash.log" << endl;
 
-      
+
       // First start GDB which will be attached to this process later on
-      
+
       int gdbIn[2];
       int gdbOut[2];
       int gdbErr[2];
-      
+
       if ( pipe(gdbIn) == -1 || pipe(gdbOut) == -1 || pipe(gdbErr) == -1 )
       {
@@ -151 +152 @@
         exit(EXIT_FAILURE);
       }
-      
+
       int gdbPid = fork();
       // this process will run gdb
-      
+
       if ( gdbPid == -1 )
       {
@@ -160 +161 @@
         exit(EXIT_FAILURE);
       }
-      
+
       if ( gdbPid == 0 )
       {
         // start gdb
-        
+
         close(gdbIn[1]);
         close(gdbOut[0]);
         close(gdbErr[0]);
-        
+
         dup2( gdbIn[0], STDIN_FILENO );
         dup2( gdbOut[1], STDOUT_FILENO );
         dup2( gdbErr[1], STDERR_FILENO );
-        
+
         execlp( "sh", "sh", "-c", "gdb", static_cast<void*>(NULL));
       }
-      
-      
+
+
       // Now start a fork of this process on which GDB will be attached on
-      
+
       int sigPipe[2];
       if ( pipe(sigPipe) == -1 )
@@ -202 +203 @@
       {
         getInstance().dontCatch();
-        
+
         // make sure gdb is allowed to attach to our PID even if there are some system restrictions
 #ifdef PR_SET_PTRACER
@@ -208 +209 @@
           orxout(user_error) << "could not set proper permissions for GDB to attach to process..." << endl;
 #endif
-        
+
         // wait for message from parent when it has attached gdb
         int someData;

code/branches/testing/src/libraries/util/SignalHandler.h

@@ -21 +21 @@
  *
  *   Author:
- *      Christoph Renner
+ *      Christoph Renner (Linux implementation)
+ *      Fabian 'x3n' Landau (Windows implementation)
  *   Co-authors:
  *      ...

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;