From ac91c0133f0b8c96a2e479ac87e2799442d3095b Mon Sep 17 00:00:00 2001 From: Mike Lundy Date: Tue, 15 Sep 2009 02:42:40 +0000 Subject: [PATCH] give test coverage reports some love --- Makefile.am | 49 ++-- configure.ac | 2 +- src/vw/Core/tests/TestInstantiateFree.cxx | 7 +- src/vw/Core/tests/TestInstantiateFreeList.hh | 2 +- src/vw/Core/tests/TestInstantiateRecord.cxx | 7 +- .../Core/tests/TestInstantiateRecordList.hh | 213 ------------------ .../tests/TestInstantiateRecordList.hh | 11 - .../Image/tests/TestInstantiateRecordList.hh | 130 ----------- src/vw/Math/tests/TestInstantiateFree.cxx | 14 +- src/vw/Math/tests/TestInstantiateRecord.cxx | 7 +- .../Math/tests/TestInstantiateRecordList.hh | 105 --------- .../Stereo/tests/TestInstantiateRecordList.hh | 14 -- 12 files changed, 48 insertions(+), 513 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9fff38145..012a33411 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,10 +42,44 @@ if DIST_REMOVE_MODULES ( cd $(distdir) && autoreconf && touch src/vw/config.h.pre.in && rm -rf autom4te.cache ) endif +all-local: +if ENABLE_TEST_COVERAGE + $(LCOV) --follow --capture --test-name 'Vision-Workbench-Base' --directory $(top_srcdir) --output-file vw-base.trace --initial + $(LCOV) --follow -e vw-base.trace '*/src/vw/*' -o vw-base.trace + $(LCOV) --follow -r vw-base.trace '*/tests/*' -o vw-base.trace + $(LCOV) --follow -r vw-base.trace '*/tools/*' -o vw-base.trace + $(LCOV) --follow -r vw-base.trace '*/gui/*' -o vw-base.trace +endif + check-local: @echo ============================== @echo All tests passed successfully! @echo ============================== +if ENABLE_TEST_COVERAGE + $(LCOV) --follow --capture --test-name 'Vision-Workbench' --directory $(top_srcdir) --output-file vw-test.trace + $(LCOV) --follow -e vw-test.trace '*/src/vw/*' -o vw-test.trace + $(LCOV) --follow -r vw-test.trace '*/tests/*' -o vw-test.trace + $(LCOV) --follow -r vw-test.trace '*/tools/*' -o vw-test.trace + $(LCOV) --follow -r vw-test.trace '*/gui/*' -o vw-test.trace + $(LCOV) --follow -a vw-base.trace -a vw-test.trace -o vw.trace + $(GENHTML) -o $(top_srcdir)/coverage vw.trace + @echo "Generated code coverage report in $(top_srcdir)/coverage" +endif + +coverage: + $(LCOV) --follow --capture --test-name 'Vision-Workbench-Base' --directory $(top_srcdir) --output-file vw-base.trace --initial + $(LCOV) --follow -e vw-base.trace '*/src/vw/*' -o vw-base.trace + $(LCOV) --follow -r vw-base.trace '*/tests/*' -o vw-base.trace + $(LCOV) --follow -r vw-base.trace '*/tools/*' -o vw-base.trace + $(LCOV) --follow -r vw-base.trace '*/gui/*' -o vw-base.trace + $(LCOV) --follow --capture --test-name 'Vision-Workbench' --directory $(top_srcdir) --output-file vw-test.trace + $(LCOV) --follow -e vw-test.trace '*/src/vw/*' -o vw-test.trace + $(LCOV) --follow -r vw-test.trace '*/tests/*' -o vw-test.trace + $(LCOV) --follow -r vw-test.trace '*/tools/*' -o vw-test.trace + $(LCOV) --follow -r vw-test.trace '*/gui/*' -o vw-test.trace + $(LCOV) --follow -a vw-base.trace -a vw-test.trace -o vw.trace + $(GENHTML) -o $(top_srcdir)/coverage vw.trace + @echo "Generated code coverage report in $(top_srcdir)/coverage" distclean-local: cd docs/workbook && $(MAKE) $(AM_MAKEFLAGS) distclean @@ -58,21 +92,6 @@ doxygen: doc: workbook doxygen -coverage: - $(LCOV) --capture --test-name 'Vision-Workbench-Base' --directory $(top_srcdir) --output-file vw-base.trace --initial - $(LCOV) -e vw-base.trace '*/src/vw/*' -o vw-base.trace - $(LCOV) -r vw-base.trace '*/tests/*' -o vw-base.trace - $(LCOV) -r vw-base.trace '*/tools/*' -o vw-base.trace - $(LCOV) -r vw-base.trace '*/gui/*' -o vw-base.trace - $(LCOV) --capture --test-name 'Vision-Workbench' --directory $(top_srcdir) --output-file vw-test.trace - $(LCOV) -e vw-test.trace '*/src/vw/*' -o vw-test.trace - $(LCOV) -r vw-test.trace '*/tests/*' -o vw-test.trace - $(LCOV) -r vw-test.trace '*/tools/*' -o vw-test.trace - $(LCOV) -r vw-test.trace '*/gui/*' -o vw-test.trace - $(LCOV) -a vw-base.trace -a vw-test.trace -o vw.trace - $(GENHTML) -o $(top_srcdir)/coverage vw.trace - @echo "Generated code coverage report in $(top_srcdir)/coverage" - push-coverage: if test -n "$(LCOV_REMOTE_PATH)" ; then rsync -P -e ssh -r coverage/ $(LCOV_REMOTE_PATH); fi diff --git a/configure.ac b/configure.ac index 17ac6d843..937082fda 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,7 @@ if test "$ENABLE_TEST_COVERAGE" = "yes"; then fi # Files test-coverage and profile-arcs generate -AC_SUBST([MOSTLYCLEANFILES], "*.bb *.bbg *.da *.gcov *.gcda *.gcno") +AC_SUBST([MOSTLYCLEANFILES], "*.bb *.bbg *.da *.gcov *.gcda *.gcno .*.gcov") # These need to be here because automake-1.6 is dumb and does not properly # process AM_CONDITIONALs unless the first argument is a simple string. diff --git a/src/vw/Core/tests/TestInstantiateFree.cxx b/src/vw/Core/tests/TestInstantiateFree.cxx index 390259fc9..4e08e64ef 100644 --- a/src/vw/Core/tests/TestInstantiateFree.cxx +++ b/src/vw/Core/tests/TestInstantiateFree.cxx @@ -5,7 +5,7 @@ // __END_LICENSE__ -#include +#include #include #include #include @@ -28,7 +28,4 @@ typedef PixelRGBA PixelT; #include "TestInstantiateFreeList.hh" -class TestInstantiateCoreFree : public CxxTest::TestSuite -{ - public: void test_inst() {} -}; +TEST(InstantiateCoreFree, Inst) {} diff --git a/src/vw/Core/tests/TestInstantiateFreeList.hh b/src/vw/Core/tests/TestInstantiateFreeList.hh index 618a08c6c..a27fb2579 100644 --- a/src/vw/Core/tests/TestInstantiateFreeList.hh +++ b/src/vw/Core/tests/TestInstantiateFreeList.hh @@ -13,4 +13,4 @@ template vw::CompoundResult::type vw::compound_apply < FuncT, //template ResultT vw::compound_select_channel < ResultT,PixelT > (const PixelT&, boost::enable_if >::type, boost::mpl::not_::type>::type, mpl_::bool_, mpl_::bool_, mpl_::bool_ >, int>::type); template ResultT vw::compound_select_channel < ResultT,PixelT > (const PixelT&, boost::enable_if, boost::mpl::not_::type>::type, mpl_::bool_, mpl_::bool_, mpl_::bool_ >, int>::type); template boost::enable_if, double>::type vw::mean_channel_value < T > (const T&); -template string vw::stringify < T > (const T&); +template std::string vw::stringify < T > (const T&); diff --git a/src/vw/Core/tests/TestInstantiateRecord.cxx b/src/vw/Core/tests/TestInstantiateRecord.cxx index d85ca8b37..d9cbccfbc 100644 --- a/src/vw/Core/tests/TestInstantiateRecord.cxx +++ b/src/vw/Core/tests/TestInstantiateRecord.cxx @@ -5,7 +5,7 @@ // __END_LICENSE__ -#include +#include #include #include #include @@ -68,7 +68,4 @@ struct ResultT #include "TestInstantiateRecordList.hh" -class TestInstantiateCoreRecord : public CxxTest::TestSuite -{ - public: void test_inst() {} -}; +TEST(InstantiateCoreRecord, Inst) {} diff --git a/src/vw/Core/tests/TestInstantiateRecordList.hh b/src/vw/Core/tests/TestInstantiateRecordList.hh index ca82acb7e..c378575d9 100644 --- a/src/vw/Core/tests/TestInstantiateRecordList.hh +++ b/src/vw/Core/tests/TestInstantiateRecordList.hh @@ -1,113 +1,13 @@ -// __BEGIN_LICENSE__ -// Copyright (C) 2006, 2007 United States Government as represented by -// the Administrator of the National Aeronautics and Space Administration. -// All Rights Reserved. -// __END_LICENSE__ - - -template struct vw::AccumulatorType; -template struct vw::ArgValDifferenceFunctor; -template struct vw::ArgValEqualityFunctor; -template struct vw::ArgValGreaterThanFunctor; -template struct vw::ArgValGreaterThanOrEqualFunctor; -template struct vw::ArgValInPlaceDifferenceFunctor; -template struct vw::ArgValInPlaceProductFunctor; -template struct vw::ArgValInPlaceQuotientFunctor; -template struct vw::ArgValInPlaceSafeQuotientFunctor; -template struct vw::ArgValInPlaceSumFunctor; -template struct vw::ArgValInequalityFunctor; -template struct vw::ArgValLessThanFunctor; -template struct vw::ArgValLessThanOrEqualFunctor; -template struct vw::ArgValProductFunctor; -template struct vw::ArgValQuotientFunctor; -template struct vw::ArgValSafeQuotientFunctor; -template struct vw::ArgValSumFunctor; -template class vw::BinaryCompoundFunctor; -template struct vw::BinaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::BinaryCompoundFunctor, vw::PixelGray >::result; -template struct vw::BinaryCompoundFunctor, vw::PixelRGB >::Helper; -template struct vw::BinaryCompoundFunctor, vw::PixelRGB >::result; -template struct vw::BinaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::BinaryCompoundFunctor, vw::PixelGray >::result; -template struct vw::BinaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::BinaryCompoundFunctor, vw::PixelGray >::result; -template class vw::BinaryInPlaceCompoundFunctor; -template struct vw::BinaryInPlaceCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::BinaryInPlaceCompoundFunctor, vw::PixelGray >::result; -template struct vw::BinaryInPlaceCompoundFunctor, vw::PixelRGB >::Helper; -template struct vw::BinaryInPlaceCompoundFunctor, vw::PixelRGB >::result; -template struct vw::BinaryReturn1stType::result; -template struct vw::BinaryReturn2ndType::result; -template struct vw::BinaryReturnTemplateType::result; -template struct vw::BinaryReturnTemplateType::result; -template struct vw::BinaryReturnTemplateType::result; -template struct vw::BinaryReturnTemplateType::result; -//template struct vw::BinaryReturnTernaryTemplateBind1st; -template struct vw::BinaryReturnTernaryTemplateBind1st::result; -template struct vw::BinaryReturnTernaryTemplateBind1st::result; -template struct vw::BinaryReturnTernaryTemplateBind1st::result; -template struct vw::BinaryReturnTernaryTemplateBind1st::result; -template struct vw::BinaryReturnTernaryTemplateBind1st::result; -template class vw::Cache::CacheLine; -template class vw::Cache::Handle; -template struct vw::ClassType; -template struct vw::CompoundAccumulatorType; -template struct vw::CompoundChannelCast; template struct vw::CompoundChannelCast; -template struct vw::CompoundChannelType; template struct vw::CompoundChannelType; -template struct vw::CompoundIsCompatible; template struct vw::CompoundIsCompatible; -template struct vw::CompoundNumChannels; template struct vw::CompoundNumChannels; -template struct vw::CompoundResult; template struct vw::CompoundResult; -template struct vw::CopyCVR; -template struct vw::DifferenceType; -template struct vw::DifferenceTypeSpecialization; -template struct vw::FloatType; -template class vw::FundamentalTypeClass; -template struct vw::IsCompound; template struct vw::IsCompound; -template struct vw::IsScalar; template struct vw::IsScalar; -template struct vw::IsScalarOrCompound; -template struct vw::MakeComplex; -template struct vw::MakeReal; -template class vw::MultiOutputBuf; -template class vw::MultiOutputStream; -template class vw::MultiOutputStreamInit; -template class vw::NullOutputBuf; -template class vw::NullOutputStream; -template class vw::NullOutputStreamInit; -template class vw::PerThreadBufferedStream; -template class vw::PerThreadBufferedStreamBuf; -template class vw::PerThreadBufferedStreamBufInit; -template struct vw::ProductType; -template struct vw::ProductTypeSpecialization; -template struct vw::PromoteType; -template class vw::PromoteTypeSpecialization; -template struct vw::PromoteTypeSpecializationHelper; template struct vw::PromoteTypeSpecializationHelper; template struct vw::PromoteTypeSpecializationHelper; template struct vw::PromoteTypeSpecializationHelper; -template struct vw::QuotientType; -template struct vw::QuotientTypeSpecialization; -template struct vw::ReturnFixedType; -template struct vw::ReturnFixedType::result; -template struct vw::ReturnFixedType::result; -template struct vw::ReturnFixedType::result; -template struct vw::ReturnFixedType::result; -template struct vw::ReturnFixedType::result; -template struct vw::ReturnFixedType >::result; -template struct vw::ReturnFixedType >::result; -template struct vw::ReturnFixedType >::result; -template struct vw::ScalarTypeLimits; -template struct vw::SumType; -template struct vw::SumTypeSpecialization; -template class vw::Thread::TaskHelper; -//template struct vw::TypeDeductionError; -template struct vw::TypeDeductionHelper; template struct vw::TypeDeductionHelper; template struct vw::TypeDeductionHelper; template struct vw::TypeDeductionHelper; @@ -131,116 +31,3 @@ template struct vw::TypeDeductionHelper; template struct vw::TypeDeductionHelper; template struct vw::TypeDeductionHelper; template struct vw::TypeDeductionHelper; -template class vw::UnaryCompoundFunctor; -template struct vw::UnaryCompoundFunctor >::Helper; -template struct vw::UnaryCompoundFunctor >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::result; -template struct vw::UnaryCompoundFunctor >, vw::PixelRGB >::Helper; -template struct vw::UnaryCompoundFunctor >, vw::PixelRGB >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelRGB >::result; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor >, vw::PixelRGB >::Helper; -template struct vw::UnaryCompoundFunctor >, vw::PixelRGB >::result; -template struct vw::UnaryCompoundFunctor >::Helper; -template struct vw::UnaryCompoundFunctor >::result; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::result; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::Helper; -template struct vw::UnaryCompoundFunctor >, vw::PixelGray >::result; -template class vw::UnaryInPlaceCompoundFunctor; -template struct vw::UnaryInPlaceCompoundFunctor&, vw::PixelGray >::Helper; -template struct vw::UnaryInPlaceCompoundFunctor&, vw::PixelGray >::result; -//template struct vw::UnaryReturnBinaryTemplateBind1st; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st >::result; -template struct vw::UnaryReturnBinaryTemplateBind1st >::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -template struct vw::UnaryReturnBinaryTemplateBind1st::result; -//template struct vw::UnaryReturnBinaryTemplateBind2nd; -template struct vw::UnaryReturnBinaryTemplateBind2nd::result; -template struct vw::UnaryReturnBinaryTemplateBind2nd::result; -template struct vw::UnaryReturnBinaryTemplateBind2nd::result; -template struct vw::UnaryReturnBinaryTemplateBind2nd::result; -template struct vw::UnaryReturnBinaryTemplateBind2nd::result; -template struct vw::UnaryReturnBinaryTemplateBind2nd >::result; -template struct vw::UnaryReturnBinaryTemplateBind2nd::result; -template struct vw::UnaryReturnBinaryTemplateBind2nd::result; -template struct vw::UnaryReturnBinaryTemplateBind2nd >::result; -//template struct vw::UnaryReturnSameType::result; -template struct vw::UnaryReturnTemplateType::result; -template struct vw::UnaryReturnTemplateType::result; -//template struct vw::UnaryReturnTernaryTemplateBind1st2nd; -template struct vw::UnaryReturnTernaryTemplateBind1st2nd >::result; -template struct vw::UnaryReturnTernaryTemplateBind1st2nd >::result; -//template struct vw::UnaryReturnTernaryTemplateBind1st3rd; -template struct vw::UnaryReturnTernaryTemplateBind1st3rd >::result; -template struct vw::UnaryReturnTernaryTemplateBind1st3rd >::result; -template struct vw::UnaryReturnTernaryTemplateBind1st3rd::result; -template struct vw::ValArgDifferenceFunctor; -template struct vw::ValArgEqualityFunctor; -template struct vw::ValArgGreaterThanFunctor; -template struct vw::ValArgGreaterThanOrEqualFunctor; -template struct vw::ValArgInequalityFunctor; -template struct vw::ValArgLessThanFunctor; -template struct vw::ValArgLessThanOrEqualFunctor; -template struct vw::ValArgProductFunctor; -template struct vw::ValArgQuotientFunctor; -template struct vw::ValArgSafeQuotientFunctor; -template struct vw::ValArgSumFunctor; -template class vw::VarArray; diff --git a/src/vw/Geometry/tests/TestInstantiateRecordList.hh b/src/vw/Geometry/tests/TestInstantiateRecordList.hh index 3ae76cebc..cd9fe5cca 100644 --- a/src/vw/Geometry/tests/TestInstantiateRecordList.hh +++ b/src/vw/Geometry/tests/TestInstantiateRecordList.hh @@ -1,12 +1 @@ -// __BEGIN_LICENSE__ -// Copyright (C) 2006, 2007 United States Government as represented by -// the Administrator of the National Aeronautics and Space Administration. -// All Rights Reserved. -// __END_LICENSE__ - - -//template class vw::geometry::Box; -//template class vw::geometry::ShapeBase; //template class vw::geometry::Sphere; -//template class vw::geometry::Sphere; -//template class vw::geometry::SphereBase; diff --git a/src/vw/Image/tests/TestInstantiateRecordList.hh b/src/vw/Image/tests/TestInstantiateRecordList.hh index d13120d46..dd1794c62 100644 --- a/src/vw/Image/tests/TestInstantiateRecordList.hh +++ b/src/vw/Image/tests/TestInstantiateRecordList.hh @@ -1,40 +1,6 @@ -// __BEGIN_LICENSE__ -// Copyright (C) 2006, 2007 United States Government as represented by -// the Administrator of the National Aeronautics and Space Administration. -// All Rights Reserved. -// __END_LICENSE__ - - -template class vw::ApplyPixelMask; -template class vw::ApproximateTransform; -template struct vw::BicubicInterpolation::Interpolator; -template struct vw::BicubicInterpolationImpl; -template struct vw::BilinearInterpolation::Interpolator; -template struct vw::BilinearInterpolationImpl; template class vw::BinaryCompoundFunctor, vw::PixelMask >; template class vw::BinaryInPlaceCompoundFunctor, vw::PixelMask >; -template class vw::BinaryPerPixelAccessor; -template class vw::BinaryPerPixelView; -template class vw::BlockProcessor; -template class vw::BlockRasterizeView; -//template class vw::BlockRasterizeView > >::RasterizeFunctor; -template class vw::ChannelAccumulator; -template class vw::ChannelCastClampFunctor; -template class vw::ChannelCastFunctor; -template class vw::ChannelCastRescaleFunctor; -template class vw::ChannelCastRoundClampFunctor; -template class vw::ChannelCastRoundFunctor; -template class vw::ChannelClampFunctor; -template class vw::ChannelNormalizeFunctor; -template class vw::ChannelNormalizeRetainAlphaFunctor; -template struct vw::ChannelRange; -//template struct vw::ChannelRangeHelper >; template struct vw::ChannelRangeHelper; -template class vw::ChannelThresholdFunctor; -template struct vw::ChannelTypeID; -template class vw::ChannelsToPlanesAccessor; -template class vw::ChannelsToPlanesView; -template class vw::CompositionTransform; template struct vw::CompoundChannelCast, NewChT>; template struct vw::CompoundChannelCast, const NewChT>; template struct vw::CompoundChannelCast, NewChT>; @@ -55,101 +21,5 @@ template struct vw::CompoundChannelCast, NewChT>; template struct vw::CompoundChannelCast, const NewChT>; template struct vw::CompoundChannelCast, NewChT>; template struct vw::CompoundChannelCast, const NewChT>; -template class vw::ConstantView; -template class vw::ConvolutionView; -template class vw::CopyPixelMask; -template class vw::CopyView; -template class vw::CreatePixelMask; -template class vw::CropView; -template struct vw::DefaultKernelT; -template struct vw::EdgeExtensionBase::result; -template class vw::EdgeExtensionView; -template class vw::EdgeMaskView; -template class vw::FlipHorizontalPixelAccessor; -template class vw::FlipHorizontalView; -template class vw::FlipVerticalPixelAccessor; -template class vw::FlipVerticalView; -template class vw::ImageResourceView; -template class vw::ImageView; -template struct vw::ImageViewBase; -template class vw::ImageViewRef; -//template class vw::ImageViewRefAccessor; -template class vw::ImageViewRefAccessorBase; -template class vw::ImageViewRefAccessorImpl; -template class vw::ImageViewRefBase; -template class vw::ImageViewRefImpl; -template struct vw::InterpolationBase::result; -template class vw::InterpolationView; -template class vw::InverseTransform; -template struct vw::IsFloatingPointIndexable; -template struct vw::IsImageView; -template struct vw::IsMultiplyAccessible; -template struct vw::IsResizable; -//template class vw::MaskToAlpha; -template struct vw::MaskedPixelType; -template class vw::MemoryStridingPixelAccessor; -template struct vw::NearestPixelInterpolation::Interpolator; -template class vw::PaletteFilter; -template class vw::PixelAccumulator; -template struct vw::PixelCastFunctor; -template struct vw::PixelCastRescaleFunctor; -template struct vw::PixelChannelCast; -template struct vw::PixelChannelCastFunctor; -template struct vw::PixelChannelCastRescaleFunctor; -template struct vw::PixelChannelType; -template struct vw::PixelFormatID; -template class vw::PixelGray; -template class vw::PixelGrayA; -template class vw::PixelHSV; -template struct vw::PixelHasAlpha; -//template class vw::PixelIterator; -template class vw::PixelLab; -template class vw::PixelLuv; -template struct vw::PixelMakeComplex; -template struct vw::PixelMakeReal; -//template struct vw::PixelMask; -template class vw::PixelMathBase; -template struct vw::PixelNumChannels; -template class vw::PixelRGB; -template class vw::PixelRGBA; -template struct vw::PixelTypeFromPixelAccessor; -template struct vw::PixelWithAlpha; -template struct vw::PixelWithoutAlpha; -template class vw::PixelXYZ; -//template class vw::PlanesToChannelsView; -template class vw::ProceduralPixelAccessor; -template class vw::RadialTransformAdaptor; -//template struct vw::RasterizeFunctor; -template class vw::Rotate180PixelAccessor; -template class vw::Rotate180View; -template class vw::Rotate90CCWPixelAccessor; -template class vw::Rotate90CCWView; -template class vw::Rotate90CWPixelAccessor; -template class vw::Rotate90CWView; -template struct vw::SelectChannelFunctor; -template class vw::SelectColView; -template class vw::SelectPlaneView; -template class vw::SelectRowView; -//template class vw::SeparableConvolutionView; -template class vw::SubsamplePixelAccessor; -template class vw::SubsampleView; -template class vw::ThreadedBlockWriter::RasterizeBlockTask; -template class vw::ThreadedBlockWriter::WriteBlockTask; -template class vw::TransformBase; -template class vw::TransformHelper; -template class vw::TransformView; -template class vw::TransposePixelAccessor; -template class vw::TransposeView; -template class vw::TrinaryPerPixelAccessor; -template class vw::TrinaryPerPixelView; template class vw::UnaryCompoundFunctor >; template class vw::UnaryInPlaceCompoundFunctor >; -template class vw::UnaryPerPixelAccessor; -template class vw::UnaryPerPixelAccessorView; -template class vw::UnaryPerPixelView; -template struct vw::UnmaskedPixelType; -template struct vw::ValueEdgeExtension; -template struct vw::ViewDataAccessor; -template class vw::ViewImageResourceImpl; -template struct vw::WeightedRGBToGrayFunctor::result; -template class vw::SparseImageCheck; diff --git a/src/vw/Math/tests/TestInstantiateFree.cxx b/src/vw/Math/tests/TestInstantiateFree.cxx index 742e60bab..63b57e9a5 100644 --- a/src/vw/Math/tests/TestInstantiateFree.cxx +++ b/src/vw/Math/tests/TestInstantiateFree.cxx @@ -5,7 +5,7 @@ // __END_LICENSE__ -#include +#include //#include #include //#include @@ -14,6 +14,7 @@ //#include //#include //#include +#include using namespace vw; using namespace vw::math; @@ -46,7 +47,7 @@ typedef VectorT SingularValuesT; typedef Vector3 BVectorT; -typedef Vector, 3> EigenvaluesT; +typedef Vector, 3> EigenvaluesT; typedef Matrix3x3 MatrixT; typedef MatrixT AMatrixT; @@ -58,7 +59,7 @@ typedef MatrixT RMatrixT; typedef MatrixT UMatrixT; typedef MatrixT VTMatrixT; -typedef Matrix, 3, 3> VMatrixT; +typedef Matrix, 3, 3> VMatrixT; typedef Quaternion QuaternionT; @@ -87,7 +88,7 @@ typedef FuncT ImplT; typedef ConstantStepSize StepT; -struct ContainerT : public vector { +struct ContainerT : public std::vector { int rows() const {return 3;} int cols() const {return 3;} }; @@ -97,7 +98,4 @@ typedef FileT::iterator ForwardIterator; #include "TestInstantiateFreeList.hh" -class TestInstantiateMathFree : public CxxTest::TestSuite -{ - public: void test_inst() {} -}; +TEST(InstantiateMathFree, Inst) {} diff --git a/src/vw/Math/tests/TestInstantiateRecord.cxx b/src/vw/Math/tests/TestInstantiateRecord.cxx index c940000e4..4698a265e 100644 --- a/src/vw/Math/tests/TestInstantiateRecord.cxx +++ b/src/vw/Math/tests/TestInstantiateRecord.cxx @@ -4,7 +4,7 @@ // All Rights Reserved. // __END_LICENSE__ - +#include #include #include #include @@ -83,7 +83,4 @@ typedef Quaternion QuaternionT; #include "TestInstantiateRecordList.hh" -class TestInstantiateMathRecord : public CxxTest::TestSuite -{ - public: void test_inst() {} -}; +TEST(InstantiateMathRecord, Inst) {} diff --git a/src/vw/Math/tests/TestInstantiateRecordList.hh b/src/vw/Math/tests/TestInstantiateRecordList.hh index 384f0e487..7b7548bdf 100644 --- a/src/vw/Math/tests/TestInstantiateRecordList.hh +++ b/src/vw/Math/tests/TestInstantiateRecordList.hh @@ -1,117 +1,12 @@ -// __BEGIN_LICENSE__ -// Copyright (C) 2006, 2007 United States Government as represented by -// the Administrator of the National Aeronautics and Space Administration. -// All Rights Reserved. -// __END_LICENSE__ - - -template struct vw::math::Accumulator; -//template struct vw::math::ArgAbsFunctor::result; -template struct vw::math::ArgUnaryFunctorType; -template struct vw::math::ArgUnaryFunctorTypeHelper; template struct vw::math::ArgUnaryFunctorTypeHelper; -template struct vw::math::ArgValAtan2Functor; -template struct vw::math::ArgValCopysignFunctor; -template struct vw::math::ArgValFdimFunctor; -template struct vw::math::ArgValHypotFunctor; -template struct vw::math::ArgValPowFunctor; template class vw::math::BBox; -//template class vw::math::BBox; -//template class vw::math::BBoxBase; -template struct vw::math::BinaryFunctorType; -template struct vw::math::BinaryFunctorTypeHelper; template struct vw::math::BinaryFunctorTypeHelper; template struct vw::math::BinaryFunctorTypeHelper; template struct vw::math::BinaryFunctorTypeHelper; -template class vw::math::DiscriminatorCompare; -template class vw::math::DisjointSet; -template class vw::math::IndexingMatrixIterator; -template class vw::math::KDTree; -template struct vw::math::LeastSquaresModelBase; template class vw::math::Matrix; -template class vw::math::Matrix; -template struct vw::math::MatrixBase; -template class vw::math::MatrixBinaryFunc; -template class vw::math::MatrixCol; -template class vw::math::MatrixCol >::Iterator; -template class vw::math::MatrixCol >::Iterator; -template class vw::math::MatrixCol >::Iterator; -template class vw::math::MatrixCol >::Iterator; -template class vw::math::MatrixCol >::Iterator; -template class vw::math::MatrixCol, 4, 4> >::Iterator; -template struct vw::math::MatrixCols; -template class vw::math::MatrixMatrixProduct; -template struct vw::math::MatrixMatrixProduct, vw::math::Matrix, false, false>::MatrixClosure; -template struct vw::math::MatrixMatrixProduct, vw::math::MatrixTranspose >, false, false>::MatrixClosure; -template struct vw::math::MatrixMatrixProduct, vw::math::Matrix, false, false>::MatrixClosure; -template struct vw::math::MatrixMatrixProduct, vw::math::Matrix, false, false>::MatrixClosure; -template struct vw::math::MatrixMatrixProduct, vw::math::MatrixUnaryFunc, vw::ArgNegationFunctor>, false, false>::MatrixClosure; -template struct vw::math::MatrixMatrixProduct, vw::math::Matrix, false, false>::MatrixClosure; -template struct vw::math::MatrixMatrixProduct, vw::math::MatrixTranspose >, false, false>, vw::math::Matrix, false, false>::MatrixClosure; -template struct vw::math::MatrixMatrixProduct, vw::math::Matrix, false, false>, vw::math::Matrix, false, false>::MatrixClosure; -template struct vw::math::MatrixMatrixProduct >, vw::math::Matrix, false, false>::MatrixClosure; -template class vw::math::MatrixNoTmp; template class vw::math::MatrixProxy; -template class vw::math::MatrixProxy; -template class vw::math::MatrixRow; -template struct vw::math::MatrixRows; -template class vw::math::MatrixTranspose; -template class vw::math::MatrixUnaryFunc; -template class vw::math::MatrixVectorProduct; -template struct vw::math::MatrixVectorProduct, const vw::math::VectorUnaryFunc, vw::ValArgProductFunctor >, true>::MatrixClosure; -template struct vw::math::MatrixVectorProduct, const vw::math::VectorUnaryFunc, vw::ValArgProductFunctor >, true>::VectorClosure; -template struct vw::math::MatrixVectorProduct, vw::math::Vector, true>::MatrixClosure; -template struct vw::math::MatrixVectorProduct, vw::math::Vector, true>::VectorClosure; -template struct vw::math::MatrixVectorProduct, const vw::math::VectorUnaryFunc, vw::ValArgProductFunctor >, true>::MatrixClosure; -template struct vw::math::MatrixVectorProduct, const vw::math::VectorUnaryFunc, vw::ValArgProductFunctor >, true>::VectorClosure; -template struct vw::math::MatrixVectorProduct, vw::math::Vector, false>::MatrixClosure; -template struct vw::math::MatrixVectorProduct, vw::math::Vector, false>::VectorClosure; -template struct vw::math::MatrixVectorProduct, vw::math::Vector, false>::MatrixClosure; -template struct vw::math::MatrixVectorProduct, vw::math::Vector, false>::VectorClosure; -template struct vw::math::MatrixVectorProduct, vw::math::Vector, false>::MatrixClosure; -template struct vw::math::MatrixVectorProduct, vw::math::Vector, false>::VectorClosure; -template struct vw::math::MatrixVectorProduct, vw::math::MatrixUnaryFunc, vw::ArgNegationFunctor>, false, false>, vw::math::Vector, false>::MatrixClosure; -template struct vw::math::MatrixVectorProduct, vw::math::MatrixUnaryFunc, vw::ArgNegationFunctor>, false, false>, vw::math::Vector, false>::VectorClosure; -template struct vw::math::MatrixVectorProduct, vw::math::MatrixTranspose >, false, false>, vw::math::Matrix, false, false>, vw::math::SubVector >, false>::MatrixClosure; -template struct vw::math::MatrixVectorProduct, vw::math::MatrixTranspose >, false, false>, vw::math::Matrix, false, false>, vw::math::SubVector >, false>::VectorClosure; -template struct vw::math::MatrixVectorProduct >, vw::math::Matrix, false, false>, vw::math::Vector, false>::MatrixClosure; -template struct vw::math::MatrixVectorProduct >, vw::math::Matrix, false, false>, vw::math::Vector, false>::VectorClosure; -template class vw::math::MeanAccumulator; -template class vw::math::MedianAccumulator; -template class vw::math::MinMaxAccumulator; -template class vw::math::Quaternion; -template class vw::math::QuaternionBase; -//template class vw::math::RandomSampleConsensus; -template class vw::math::RegionRecordConstraintKD; -template class vw::math::Simplex; -template class vw::math::StdDevAccumulator; -template struct vw::math::StdMathType2; -template struct vw::math::StdMathType; -template class vw::math::SubMatrix; -template class vw::math::SubVector; -template struct vw::math::ValArgAtan2Functor; -template struct vw::math::ValArgCopysignFunctor; -template struct vw::math::ValArgFdimFunctor; -template struct vw::math::ValArgHypotFunctor; -template struct vw::math::ValArgPowFunctor; template class vw::math::Vector; -template class vw::math::Vector; -template struct vw::math::VectorAssignImpl; template struct vw::math::VectorAssignImpl, SrcVecT>; template struct vw::math::VectorAssignImpl, SrcVecT>; template struct vw::math::VectorAssignImpl, SrcVecT>; -template struct vw::math::VectorBase; -template class vw::math::VectorBinaryFunc; -template struct vw::math::VectorClearImpl; -template class vw::math::VectorNoTmp; template class vw::math::VectorProxy; -template class vw::math::VectorProxy; -template struct vw::math::VectorSize; -template class vw::math::VectorTranspose; -template struct vw::math::VectorTranspose, const vw::math::VectorUnaryFunc, vw::ValArgProductFunctor >, true> >::VectorClosure; -template struct vw::math::VectorTranspose, const vw::math::VectorUnaryFunc, vw::ValArgProductFunctor >, true> >::VectorClosure; -template struct vw::math::VectorTranspose, vw::ValArgProductFunctor > >::VectorClosure; -template struct vw::math::VectorTranspose, vw::ValArgProductFunctor > >::VectorClosure; -template struct vw::math::VectorTranspose >::VectorClosure; -template struct vw::math::VectorTranspose >::VectorClosure; -template class vw::math::VectorUnaryFunc; diff --git a/src/vw/Stereo/tests/TestInstantiateRecordList.hh b/src/vw/Stereo/tests/TestInstantiateRecordList.hh index f4ce73855..7498c24d4 100644 --- a/src/vw/Stereo/tests/TestInstantiateRecordList.hh +++ b/src/vw/Stereo/tests/TestInstantiateRecordList.hh @@ -1,16 +1,2 @@ -// __BEGIN_LICENSE__ -// Copyright (C) 2006, 2007 United States Government as represented by -// the Administrator of the National Aeronautics and Space Administration. -// All Rights Reserved. -// __END_LICENSE__ - - //template struct vw::CompoundChannelCast, NewChT>; //template struct vw::CompoundChannelCast, const NewChT>; -//template class vw::PixelDisparity; -//template struct vw::stereo::CorrelatorAccumulatorType; -//template class vw::stereo::CorrelatorView; -//template class vw::stereo::StereoView; -//template class vw::stereo::SubpixelView; -//template struct vw::stereo::disparity::DisparityMaskFunc; -//template class vw::stereo::disparity::TransformDisparitiesFunc;