OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

(#687) Added option RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS to enable unit tests

Browse Source
This commit is contained in:
Magne Sjaastad 2015-12-03 11:38:59 +01:00
parent c72e047b23
commit de41755320
3 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Application/RiaApplication.cpp
View File

@ -1186,6 +1186,7 @@ bool RiaApplication::parseArguments()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
int RiaApplication::launchUnitTests() int RiaApplication::launchUnitTests()
{ {
#ifdef USE_UNIT_TESTS
cvf::Assert::setReportMode(cvf::Assert::CONSOLE); cvf::Assert::setReportMode(cvf::Assert::CONSOLE);
int argc = QCoreApplication::argc(); int argc = QCoreApplication::argc();
@ -1198,6 +1199,9 @@ int RiaApplication::launchUnitTests()
// parsed by InitGoogleTest(). // parsed by InitGoogleTest().
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
#else
return -1;
#endif
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

22
ApplicationCode/CMakeLists.txt
View File

@ -61,8 +61,6 @@ set( APPLICATION_FILES
Application/RiaImageCompareReporter.cpp Application/RiaImageCompareReporter.cpp
Application/RiaProjectModifier.cpp Application/RiaProjectModifier.cpp
Application/RiaRegressionTest.cpp Application/RiaRegressionTest.cpp
${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
) )
set( USER_INTERFACE_FILES set( USER_INTERFACE_FILES
@ -112,11 +110,6 @@ set( SOCKET_INTERFACE_FILES
SocketInterface/RiaSocketDataTransfer.cpp SocketInterface/RiaSocketDataTransfer.cpp
) )
# Using GLOB here to ease adding of new unit tests
FILE ( GLOB UNIT_TEST_FILES
UnitTests/*.cpp
)
list( APPEND CPP_SOURCES list( APPEND CPP_SOURCES
${APPLICATION_FILES} ${APPLICATION_FILES}
${USER_INTERFACE_FILES} ${USER_INTERFACE_FILES}
@ -144,6 +137,21 @@ list( APPEND REFERENCED_CMAKE_FILES
Commands/CrossSectionCommands/CMakeLists_files.cmake Commands/CrossSectionCommands/CMakeLists_files.cmake
) )
option (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS "Include ApplicationCode Unit Tests" OFF)
if (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS)
add_definitions(-DUSE_UNIT_TESTS)
list( APPEND REFERENCED_CMAKE_FILES
UnitTests/CMakeLists_files.cmake
)
list( APPEND CPP_SOURCES
${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
)
endif()
# Include source file lists from *.cmake files # Include source file lists from *.cmake files
foreach (referencedfile ${REFERENCED_CMAKE_FILES}) foreach (referencedfile ${REFERENCED_CMAKE_FILES})
include (${referencedfile}) include (${referencedfile})

33
ApplicationCode/UnitTests/CMakeLists_files.cmake Normal file
View File

@ -0,0 +1,33 @@
# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly
if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/)
endif()
set (SOURCE_GROUP_HEADER_FILES
)
set (SOURCE_GROUP_SOURCE_FILES
${CEE_CURRENT_LIST_DIR}cvfGeometryTools-Test.cpp
${CEE_CURRENT_LIST_DIR}Ert-Test.cpp
${CEE_CURRENT_LIST_DIR}RifEclipseInputFileTools-Test.cpp
${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput-Test.cpp
${CEE_CURRENT_LIST_DIR}RigActiveCellInfo-Test.cpp
${CEE_CURRENT_LIST_DIR}RigReservoir-Test.cpp
${CEE_CURRENT_LIST_DIR}RigStatisticsMath-Test.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurveImpl-Test.cpp
${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator-Test.cpp
${CEE_CURRENT_LIST_DIR}RivTernaryScalarMapper-Test.cpp
${CEE_CURRENT_LIST_DIR}ScalarMapper-Test.cpp
${CEE_CURRENT_LIST_DIR}WellPathAsciiFileReader-Test.cpp
)
list(APPEND CODE_HEADER_FILES
${SOURCE_GROUP_HEADER_FILES}
)
list(APPEND CODE_SOURCE_FILES
${SOURCE_GROUP_SOURCE_FILES}
)
source_group( "UnitTests" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )