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

Add userInterface unit tests

Browse Source
This commit is contained in:
Magne Sjaastad 2022-05-29 08:55:45 +02:00
parent c74701b687
commit 950ec38a14
3 changed files with 21 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -654,6 +654,9 @@ if(RESINSIGHT_INCLUDE_APPFWK_TESTS)
add_subdirectory(Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests)
set_property(TARGET cafPdmScripting_UnitTests PROPERTY FOLDER "AppFwkTests")
add_subdirectory(Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests)
set_property(TARGET cafUserInterface_UnitTests PROPERTY FOLDER "AppFwkTests")
# Executables
add_subdirectory(Fwk/AppFwk/cafTests/cafTestApplication)
set_property(TARGET cafTestApplication PROPERTY FOLDER "AppFwkTests")

62
Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt
View File

@ -2,24 +2,12 @@ cmake_minimum_required(VERSION 2.8.12)
project(cafUserInterface_UnitTests)
# Qt
option(CEE_USE_QT5 "Use Qt5" OFF)
if(CEE_USE_QT5)
find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets
)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else()
find_package(
Qt4
COMPONENTS QtCore QtGui QtMain
REQUIRED
)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets
)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@ -37,33 +25,11 @@ target_link_libraries(
)
# Copy Qt Dlls
if(Qt5Core_FOUND)
foreach(qtlib ${QT_LIBRARIES})
add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>
)
endforeach(qtlib)
# Copy Qt Dlls
else()
# Copy Qt Dlls
if(MSVC)
set(QTLIBLIST QtCore QtGui QtOpenGl)
foreach(qtlib ${QTLIBLIST})
# Debug
execute_process(
COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll
${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll
)
# Release
execute_process(
COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll
${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll
)
endforeach(qtlib)
endif(MSVC)
endif(Qt5Core_FOUND)
foreach(qtlib ${QT_LIBRARIES})
add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>
)
endforeach(qtlib)

8
Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeViewModelTest.cpp
View File

@ -36,7 +36,7 @@ public:
CAF_PDM_InitFieldNoDefault( &m_simpleObjPtrField, "SimpleObjPtrField", "SimpleObjPtrField", "", "Tooltip", "WhatsThis" );
}
~DemoPdmObject() { m_simpleObjPtrField.deleteAllChildObjects(); }
~DemoPdmObject() { m_simpleObjPtrField.deleteChildren(); }
caf::PdmChildArrayField<caf::PdmObjectHandle*> m_simpleObjPtrField;
};
@ -66,7 +66,7 @@ TEST( PdmUiTreeViewModelTest, DeleteOneItemAndVerifyTreeOrdering )
mi = treeView.findModelIndex( obj1 );
EXPECT_TRUE( mi.isValid() );
demoObj->m_simpleObjPtrField.removeChildObject( obj1 );
demoObj->m_simpleObjPtrField.removeChild( obj1 );
demoObj->m_simpleObjPtrField().uiCapability()->updateConnectedEditors();
mi = treeView.findModelIndex( obj1 );
@ -125,7 +125,7 @@ TEST( PdmUiTreeViewModelTest, ChangeOrderingAndVerifyTreeOrdering )
mi = treeView.findModelIndex( obj4 );
EXPECT_EQ( 3, mi.row() );
demoObj->m_simpleObjPtrField.clear();
demoObj->m_simpleObjPtrField.clearWithoutDelete();
demoObj->m_simpleObjPtrField.push_back( obj1 );
demoObj->m_simpleObjPtrField.push_back( obj4 );
demoObj->m_simpleObjPtrField.push_back( obj3 );
@ -166,7 +166,7 @@ TEST( PdmUiTreeViewModelTest, ChangeDeepInTreeNotifyRootAndVerifyTreeOrdering )
mi = treeView.findModelIndex( obj4 );
EXPECT_EQ( 3, mi.row() );
demoObj->m_simpleObjPtrField.removeChildObject( obj4 );
demoObj->m_simpleObjPtrField.removeChild( obj4 );
root->m_simpleObjPtrField().uiCapability()->updateConnectedEditors();