Skip to content

Commit

Permalink
ENH: fixing testing
Browse files Browse the repository at this point in the history
* enabled Cxx tests
* added test for ReportingAnnotationRANONode, made sure it passes
  • Loading branch information
fedorov committed Feb 14, 2012
1 parent f4421d9 commit 09bdbe6
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
21 changes: 19 additions & 2 deletions Testing/Cxx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
set(KIT Reporting)
set(KIT_TEST_SRCS)
set(KIT_TEST_NAMES)
set(KIT_TEST_NAMES_CXX)
Expand All @@ -8,6 +9,7 @@ create_test_sourcelist(Tests ${EXTENSION_NAME}CxxTests.cxx
${KIT_TEST_NAMES_CXX}
# Add source of your tests after this line.
vtkSlicerReportingModuleLogicTest1.cxx
vtkMRMLReportingAnnotationRANONodeTest1.cxx
#EXTRA_INCLUDE TestingMacros.h
)
list(REMOVE_ITEM Tests ${KIT_TEST_NAMES_CXX})
Expand All @@ -25,8 +27,23 @@ macro(SIMPLE_TEST TESTNAME)
add_test(NAME ${TESTNAME} COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${EXTENSION_NAME}CxxTests> ${TESTNAME} ${ARGN})
endmacro()

foreach(testname ${KIT_TEST_NAMES})
SIMPLE_TEST( ${testname} )
#
# Add all the tests
#
foreach(test ${Tests})
get_filename_component(TESTNAME ${test} NAME_WE)
add_test(
NAME ${TESTNAME}
COMMAND ${Slicer_LAUNCH_COMMAND} $<TARGET_FILE:${KIT}CxxTests> ${TESTNAME}
-D ${CMAKE_CURRENT_SOURCE_DIR}/../
-T ${TEMP}
#-V Baseline/${TESTNAME}.png
)
endforeach()


#foreach(testname ${KIT_TEST_NAMES})
# SIMPLE_TEST( ${testname} )
#endforeach()

# Using SIMPLE_TEST(), you could add your test after this line.
7 changes: 7 additions & 0 deletions qSlicerReportingModule.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@ QStringList qSlicerReportingModule::dependencies() const
return QStringList() << "Annotations" << "Volumes";
}

//-----------------------------------------------------------------------------
QStringList qSlicerReportingModule::contributors() const
{
return QStringList() << "Andrey Fedorov" << "Nicole Aucoin";
}


//-----------------------------------------------------------------------------
void qSlicerReportingModule::setup()
{
Expand Down
2 changes: 2 additions & 0 deletions qSlicerReportingModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ class Q_SLICER_QTMODULES_REPORTING_EXPORT qSlicerReportingModule :
/// Return the dependencies
virtual QStringList dependencies() const;

/// Return the contributors
virtual QStringList contributors() const;

protected:

Expand Down

0 comments on commit 09bdbe6

Please sign in to comment.