cpp: test: Use correct visitor for variantpixelbuffer death test
cpp: Update NDEBUG conditionals to quell unused variable warning
fixes JUnit4TestAdapterCache not found when running tests with ant 1.9
Merge pull request #1388 from rleigh-dundee/cpp-testcond

C++: Update NDEBUG usage in death tests
Merge pull request #1390 from simleo/fix_ant_junit

Fix for unit tests run with ant 1.9