[Orxonox-commit 4444] r9115 - code/branches/testing/test

[landauf at orxonox.net]

Author: landauf
Date: 2012-04-22 10:41:02 +0200 (Sun, 22 Apr 2012)
New Revision: 9115

Removed:
   code/branches/testing/test/BoostTest.cc
   code/branches/testing/test/SampleTest.cc
   code/branches/testing/test/gtest_samples/
Modified:
   code/branches/testing/test/CMakeLists.txt
Log:
removed sample tests

Deleted: code/branches/testing/test/BoostTest.cc
===================================================================
--- code/branches/testing/test/BoostTest.cc	2012-04-22 08:36:09 UTC (rev 9114)
+++ code/branches/testing/test/BoostTest.cc	2012-04-22 08:41:02 UTC (rev 9115)
@@ -1,23 +0,0 @@
-#include <boost/test/minimal.hpp>
-
-//____________________________________________________________________________//
-
-int add( int i, int j ) { return i+j; }
-
-//____________________________________________________________________________//
-
-int test_main( int, char *[] )             // note the name!
-{
-    // six ways to detect and report the same error:
-    BOOST_CHECK( add( 2,2 ) == 4 );        // #1 continues on error
-    BOOST_REQUIRE( add( 2,2 ) == 4 );      // #2 throws on error
-    if( add( 2,2 ) != 4 )
-        BOOST_ERROR( "Ouch..." );          // #3 continues on error
-    if( add( 2,2 ) != 4 )
-        BOOST_FAIL( "Ouch..." );           // #4 throws on error
-    if( add( 2,2 ) != 4 ) throw "Oops..."; // #5 throws on error
-
-    return add( 2, 2 ) == 4 ? 0 : 1;       // #6 returns error code
-}
-
-//____________________________________________________________________________//

Modified: code/branches/testing/test/CMakeLists.txt
===================================================================
--- code/branches/testing/test/CMakeLists.txt	2012-04-22 08:36:09 UTC (rev 9114)
+++ code/branches/testing/test/CMakeLists.txt	2012-04-22 08:41:02 UTC (rev 9115)
@@ -2,47 +2,6 @@
 
 ADD_CUSTOM_TARGET(test COMMAND ${CMAKE_CTEST_COMMAND} "$(ARGS)" COMMENT "Running tests")
 
-ADD_EXECUTABLE(sample_test EXCLUDE_FROM_ALL SampleTest.cc)
-ADD_DEPENDENCIES(test sample_test)
-
-ADD_TEST(sample_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sample_test)
-
-
-IF(Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  INCLUDE_DIRECTORIES(
-    ${Boost_INCLUDE_DIRS}
-  )
-  ADD_EXECUTABLE(boost_test EXCLUDE_FROM_ALL BoostTest.cc)
-  TARGET_LINK_LIBRARIES(boost_test ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
-  ADD_DEPENDENCIES(test boost_test)
-
-  ADD_TEST(boost_test_sample ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/boost_test)
-ENDIF()
-
-INCLUDE_DIRECTORIES(
-  ../src/external/gtest/include
-  ../src/external/gmock/include
-)
-
-ADD_EXECUTABLE(
-    gtest_sample
-    EXCLUDE_FROM_ALL
-    ${GTEST_MAIN}
-    gtest_samples/sample1.cc
-    gtest_samples/sample1_unittest.cc
-    gtest_samples/sample2.cc
-    gtest_samples/sample2_unittest.cc
-    gtest_samples/sample3_unittest.cc
-    gtest_samples/sample4.cc
-    gtest_samples/sample4_unittest.cc
-)
-TARGET_LINK_LIBRARIES(gtest_sample gtest_orxonox)
-ADD_DEPENDENCIES(test gtest_sample)
-
-ADD_TEST(gtest_sample ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/gtest_sample)
-
-#-----------------
-
 CONFIGURE_FILE("CTestCustom.cmake" "CTestCustom.cmake" @ONLY)
 
 INCLUDE_DIRECTORIES(
@@ -50,6 +9,8 @@
   ../src/libraries
   ../src/orxonox
   ../src/modules
+  ../src/external/gtest/include
+  ../src/external/gmock/include
   ${CMAKE_BINARY_DIR}/src
   ${Boost_INCLUDE_DIRS}
   ${OGRE_INCLUDE_DIR}

Deleted: code/branches/testing/test/SampleTest.cc
===================================================================
--- code/branches/testing/test/SampleTest.cc	2012-04-22 08:36:09 UTC (rev 9114)
+++ code/branches/testing/test/SampleTest.cc	2012-04-22 08:41:02 UTC (rev 9115)
@@ -1,7 +0,0 @@
-#include <iostream>
-
-int main(int argc, char** argv)
-{
-	std::cout << "Hello World" << std::endl;
-	return 0;
-}