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) Moved tests from ModelVisualization into ApplicationCode/UnitTests

Browse Source
This commit is contained in:
Magne Sjaastad 2015-12-03 10:53:12 +01:00
parent 709fce384a
commit 563dd8c04f
5 changed files with 0 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/CMakeLists.txt
View File

@ -1,71 +0,0 @@
cmake_minimum_required (VERSION 2.8)
SET (ProjectName ModelVisualization_UnitTests)
project ( ${ProjectName} )
include_directories(
${LibCore_SOURCE_DIR}
${LibGeometry_SOURCE_DIR}
${LibRender_SOURCE_DIR}
${LibViewing_SOURCE_DIR}
${ResInsight_SOURCE_DIR}/ThirdParty
${ResInsight_SOURCE_DIR}/ApplicationCode/ModelVisualization
${CommonCode_SOURCE_DIR}
)
set( MODEL_VISUALIZATION_CPP_SOURCES
../RivPipeGeometryGenerator.cpp
../RivTernaryScalarMapper.cpp
)
set( CPP_SOURCES
${MODEL_VISUALIZATION_CPP_SOURCES}
)
set( UNIT_TEST_CPP_SOURCES
main.cpp
RivPipeGeometryGenerator-Test.cpp
RivTernaryScalarMapper-Test.cpp
)
set( LINK_LIBRARIES
LibViewing
LibRender
LibGeometry
LibCore
LibGuiQt
CommonCode
${OPENGL_LIBRARIES}
${QT_LIBRARIES}
)
add_executable( ${ProjectName}
${CPP_SOURCES}
${UNIT_TEST_CPP_SOURCES}
${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc
)
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set( EXTERNAL_LINK_LIBRARIES
pthread
)
ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set( CMAKE_CXX_FLAGS
"-DGTEST_USE_OWN_TR1_TUPLE=1"
)
ENDIF()
target_link_libraries( ${ProjectName} ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})

43
ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/main.cpp
View File

@ -1,43 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "cvfBase.h"
#include "gtest/gtest.h"
#include <stdio.h>
#include "cvfTrace.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int main(int argc, char **argv)
{
cvf::Assert::setReportMode(cvf::Assert::CONSOLE);
testing::InitGoogleTest(&argc, argv);
int result = RUN_ALL_TESTS();
std::cout << "Please press <Enter> to close the window.";
std::cin.get();
return result;
}

0
ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/RivPipeGeometryGenerator-Test.cpp → ApplicationCode/UnitTests/RivPipeGeometryGenerator-Test.cpp
View File

0
ApplicationCode/ModelVisualization/ModelVisualization_UnitTests/RivTernaryScalarMapper-Test.cpp → ApplicationCode/UnitTests/RivTernaryScalarMapper-Test.cpp
View File

2
CMakeLists.txt
View File

@ -260,10 +260,8 @@ add_subdirectory(OctavePlugin)
################################################################################
add_subdirectory(ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests)
#add_subdirectory(ApplicationCode/FileInterface/FileInterface_UnitTests)
add_subdirectory(ApplicationCode/ModelVisualization/ModelVisualization_UnitTests)
set_property(TARGET
ModelVisualization_UnitTests
# FileInterface_UnitTests
RigReservoirDataModel_UnitTests
PROPERTY FOLDER "UnitTests"