diff --git a/CMake/vtkModuleTesting.cmake b/CMake/vtkModuleTesting.cmake index f2d2007fbcadb5cbde72353e1ffb8bcf1eb68b99..2595721684b61aab52ecd62535515e5463ea8cfc 100644 --- a/CMake/vtkModuleTesting.cmake +++ b/CMake/vtkModuleTesting.cmake @@ -374,10 +374,12 @@ function (vtk_add_test_cxx exename _tests) set(image_compare_method ";VTK_TESTING_IMAGE_COMPARE_METHOD=LEGACY_VALID") elseif (local_LOOSE_VALID) set(image_compare_method ";VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") - else () + elseif (local_TIGHT_VALID) set(image_compare_method ";VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") endif () + set(vtk_testing "VTK_TESTING=1;${image_compare_method}") + if (VTK_USE_MPI AND VTK_SERIAL_TESTS_USE_MPIEXEC) set(_vtk_test_cxx_pre_args @@ -390,7 +392,7 @@ function (vtk_add_test_cxx exename _tests) NAME "${_vtk_build_test}Cxx-${vtk_test_prefix}${test_name}" COMMAND "${_vtk_test_cxx_pre_args}" "$<TARGET_FILE:${exename}>" "${test_arg}" - ${args} + "${args}" ${${_vtk_build_test}_ARGS} ${${test_name}_ARGS} ${_D} ${_T} ${_V}) @@ -400,9 +402,8 @@ function (vtk_add_test_cxx exename _tests) FAIL_REGULAR_EXPRESSION "${_vtk_fail_regex}" SKIP_REGULAR_EXPRESSION "${_vtk_skip_regex}" # Disables anti-aliasing when rendering - ENVIRONMENT "VTK_TESTING;${image_compare_method}" - # This must match VTK_SKIP_RETURN_CODE in vtkTesting.h - SKIP_RETURN_CODE 125 + ENVIRONMENT "${vtk_testing}" + SKIP_RETURN_CODE 125 # This must match VTK_SKIP_RETURN_CODE in vtkTesting.h ) if (_vtk_testing_ld_preload) @@ -494,11 +495,13 @@ function (vtk_add_test_mpi exename _tests) set(image_compare_method ";VTK_TESTING_IMAGE_COMPARE_METHOD=LEGACY_VALID") elseif (local_LOOSE_VALID) set(image_compare_method ";VTK_TESTING_IMAGE_COMPARE_METHOD=LOOSE_VALID") - else () + elseif (local_TIGHT_VALID) set(image_compare_method ";VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") endif () endif () + set(vtk_testing "VTK_TESTING=1;${image_compare_method}") + set(numprocs ${default_numprocs}) if (${test_name}_NUMPROCS) set(numprocs "${${test_name}_NUMPROCS}") @@ -514,16 +517,14 @@ function (vtk_add_test_mpi exename _tests) ${_D} ${_T} ${_V} ${args} ${${_vtk_build_test}_ARGS} - ${${test_name}_ARGS} - ${MPIEXEC_POSTFLAGS}) + ${${test_name}_ARGS}) set_tests_properties("${_vtk_build_test}Cxx-MPI-${vtk_test_prefix}${test_name}" PROPERTIES LABELS "${_vtk_build_test_labels}" PROCESSORS "${numprocs}" FAIL_REGULAR_EXPRESSION "${_vtk_fail_regex}" SKIP_REGULAR_EXPRESSION "${_vtk_skip_regex}" - ENVIRONMENT "VTK_TESTING;${image_compare_method}" - # This must match VTK_SKIP_RETURN_CODE in vtkTesting.h" + ENVIRONMENT "${vtk_testing}" SKIP_RETURN_CODE 125 ) diff --git a/CMake/vtkTestingGL2PS.cmake b/CMake/vtkTestingGL2PS.cmake index e1fd21b1e42fd719386a6f73ef96aa7b61759a5d..0b5eb807caaa12604f5bdff86486da2e07848251 100644 --- a/CMake/vtkTestingGL2PS.cmake +++ b/CMake/vtkTestingGL2PS.cmake @@ -45,6 +45,7 @@ function(vtk_add_gl2ps_test_cxx) REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.ps" LABELS "${_vtk_build_test_labels}" + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID" ) get_filename_component(TName ${test} NAME_WE) @@ -70,6 +71,7 @@ function(vtk_add_gl2ps_test_cxx) REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster.png" LABELS "${_vtk_build_test_labels}" + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID" ) if(${RASTERIZE_PDF}) ExternalData_add_test(VTKData @@ -87,6 +89,7 @@ function(vtk_add_gl2ps_test_cxx) REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster-pdf.png" LABELS "${_vtk_build_test_labels}" + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID" ) endif() endforeach() diff --git a/CMake/vtkTestingPDF.cmake b/CMake/vtkTestingPDF.cmake index ec50034b007acf0cb2df5ac939bdf9f289348d99..03bf07b2ea886b04fd037339469d4023eeda7090 100644 --- a/CMake/vtkTestingPDF.cmake +++ b/CMake/vtkTestingPDF.cmake @@ -25,6 +25,7 @@ function(vtk_add_pdf_test_cxx) REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.pdf" LABELS "${_vtk_build_test_labels}" + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID" ) get_filename_component(TName ${test} NAME_WE) @@ -49,6 +50,7 @@ function(vtk_add_pdf_test_cxx) DEPENDS "${_vtk_build_test}Cxx-${TName}-RasterizePDFToPNG" REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-rasterPDF.png" + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID" LABELS "${_vtk_build_test_labels}" ) endforeach() diff --git a/Common/DataModel/Testing/CMakeLists.txt b/Common/DataModel/Testing/CMakeLists.txt index cd0404b10c391aefa38cf7706beeea6ac56cb023..eecf14fe9731957380cece9c2de238b829b9ed08 100644 --- a/Common/DataModel/Testing/CMakeLists.txt +++ b/Common/DataModel/Testing/CMakeLists.txt @@ -2,10 +2,18 @@ vtk_module_test_data( Data/Disc_BiQuadraticQuads_0_0.vtu Data/Disc_QuadraticQuads_0_0.vtu Data/blowGeom.vtk + Data/cell_850113.vtu + Data/cell_12851_26.vtu + Data/cone.vtp Data/headsq/,REGEX:.* Data/nonWatertightPolyhedron.vtu + Data/onePolyhedron.vtu Data/poly_lines.vtu - Data/quadraticTetra01.vtu) + Data/polyhedron_mesh.vtu + Data/quadraticTetra01.vtu + Data/sliceOfPolyhedron.vtu + Data/test_surface.vtp + ) if (NOT vtk_testing_cxx_disabled) add_subdirectory(Cxx) diff --git a/Common/DataModel/Testing/Cxx/CMakeLists.txt b/Common/DataModel/Testing/Cxx/CMakeLists.txt index fbe4576d86081388457e21874f9e9681dda1bfca..41b6b489fc1a51b99efdd87dc5e17d74f6767c04 100644 --- a/Common/DataModel/Testing/Cxx/CMakeLists.txt +++ b/Common/DataModel/Testing/Cxx/CMakeLists.txt @@ -123,52 +123,24 @@ vtk_add_test_cxx(vtkCommonDataModelCxxTests data_tests quadraticIntersection.cxx TestCellIterators.cxx,NO_VALID,NO_OUTPUT TestCellLocator.cxx,NO_DATA + TestCellLocatorsEdgeCases.cxx,NO_VALID TestIncrementalOctreePointLocator.cxx,NO_VALID TestMeanValueCoordinatesInterpolation1.cxx TestMeanValueCoordinatesInterpolation2.cxx + TestPolyhedron2.cxx,NO_VALID TestPolyhedron4.cxx,NO_VALID,NO_OUTPUT + TestPolyhedronContouring.cxx,NO_VALID + TestPolyhedronCutter.cxx,NO_VALID TestPolyhedronDecompose.cxx,NO_DATA TestSmoothErrorMetric.cxx + TestStaticCellLocatorEdgeCases.cxx,NO_VALID TestQuadraticPolygonFilters.cxx TestNonlinearSubdivisionOfDegenerateCells.cxx,NO_DATA ) -# add to the list but don't define a test -list(APPEND data_tests - TestCellLocatorsEdgeCases.cxx - TestPolyhedron2.cxx - TestPolyhedronContouring.cxx - TestPolyhedronCutter.cxx - TestStaticCellLocatorEdgeCases.cxx - ) vtk_add_test_cxx(vtkCommonDataModelCxxTests output_tests TestKdTreeRepresentation.cxx,NO_DATA ) -ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} - NAME VTK::CommonDataModelCxxTests-TestCellLocatorsEdgeCases - COMMAND vtkCommonDataModelCxxTests TestCellLocatorsEdgeCases - DATA{../Data/test_surface.vtp} DATA{../Data/cone.vtp} - ) -ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} - NAME VTK::CommonDataModelCxxTests-TestPolyhedron2 - COMMAND vtkCommonDataModelCxxTests TestPolyhedron2 - -D DATA{../Data/polyhedron_mesh.vtu} - ) -ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} - NAME VTK::CommonDataModelCxxTests-TestPolyhedronContouring - COMMAND vtkCommonDataModelCxxTests TestPolyhedronContouring - DATA{../Data/cell_850113.vtu} DATA{../Data/cell_12851_26.vtu} - ) -ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} - NAME VTK::CommonDataModelCxxTests-TestPolyhedronCutter - COMMAND vtkCommonDataModelCxxTests TestPolyhedronCutter - DATA{../Data/onePolyhedron.vtu} DATA{../Data/sliceOfPolyhedron.vtu} - ) -ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} - NAME VTK::CommonDataModelCxxTests-TestStaticCellLocatorEdgeCases - COMMAND vtkCommonDataModelCxxTests TestStaticCellLocatorEdgeCases - DATA{../Data/test_surface.vtp} - ) set(all_tests ${tests} diff --git a/Common/DataModel/Testing/Cxx/TestCellLocatorsEdgeCases.cxx b/Common/DataModel/Testing/Cxx/TestCellLocatorsEdgeCases.cxx index 2d8ffff89a0c326a66fb068431c181f19a9a4131..ce5a3aed7b83e771862061782df8984a9ce1120b 100644 --- a/Common/DataModel/Testing/Cxx/TestCellLocatorsEdgeCases.cxx +++ b/Common/DataModel/Testing/Cxx/TestCellLocatorsEdgeCases.cxx @@ -8,6 +8,7 @@ #include "vtkNew.h" #include "vtkPolyData.h" #include "vtkStaticCellLocator.h" +#include "vtkTestUtilities.h" #include "vtkXMLPolyDataReader.h" static bool TestCell(vtkDataSet* ds, vtkIdType cellId, double x1[3], double x2[3], double tol) @@ -113,17 +114,11 @@ static bool TestCellLocatorEvaluatePosition(char* fname) int TestCellLocatorsEdgeCases(int argc, char* argv[]) { - if (argc < 3) - { - cout << "Not enough arguments."; - return EXIT_FAILURE; - } - //=========== // Test Setup //=========== vtkNew<vtkXMLPolyDataReader> reader; - char* fname = argv[1]; + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/test_surface.vtp"); reader->SetFileName(fname); reader->Update(); vtkDataSet* data = reader->GetOutput(); @@ -139,7 +134,8 @@ int TestCellLocatorsEdgeCases(int argc, char* argv[]) // of how this test is executed // vtkNew<vtkModifiedBSPTree> mbsp; // allTestsPassed &= TestLocator(data, mbsp); - allTestsPassed &= TestCellLocatorEvaluatePosition(argv[2]); + allTestsPassed &= TestCellLocatorEvaluatePosition( + vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cone.vtp")); //==================== // Final Tests Outcome diff --git a/Common/DataModel/Testing/Cxx/TestPolyhedron2.cxx b/Common/DataModel/Testing/Cxx/TestPolyhedron2.cxx index 46a70141e304e0dad5a16f0063959bd253d9da10..28d7f88b65fbd7b86011c1736e326f55ac48728c 100644 --- a/Common/DataModel/Testing/Cxx/TestPolyhedron2.cxx +++ b/Common/DataModel/Testing/Cxx/TestPolyhedron2.cxx @@ -16,12 +16,10 @@ // https://gitlab.kitware.com/vtk/vtk/-/issues/14485 int TestPolyhedron2(int argc, char* argv[]) { - if (argc < 3) - return 1; // test not run with data on the command line - vtkObject::GlobalWarningDisplayOff(); - const char* filename = argv[2]; + const char* filename = + vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/polyhedron_mesh.vtu"); vtkNew<vtkXMLUnstructuredGridReader> reader; reader->SetFileName(filename); reader->Update(); diff --git a/Common/DataModel/Testing/Cxx/TestPolyhedronContouring.cxx b/Common/DataModel/Testing/Cxx/TestPolyhedronContouring.cxx index 0c8ce543179f4c47cf8188da0ae8be274c976a1b..b32bddbc632044a210641f114ab110c683ccac6b 100644 --- a/Common/DataModel/Testing/Cxx/TestPolyhedronContouring.cxx +++ b/Common/DataModel/Testing/Cxx/TestPolyhedronContouring.cxx @@ -6,6 +6,7 @@ #include "vtkDoubleArray.h" #include "vtkNew.h" #include "vtkPointData.h" +#include "vtkTestUtilities.h" #include "vtkUnstructuredGrid.h" #include "vtkXMLUnstructuredGridReader.h" @@ -16,14 +17,8 @@ int TestPolyhedronContouring(int argc, char* argv[]) vtkNew<vtkContourFilter> cf; cf->GenerateTrianglesOff(); - if (argc < 3) { - cout << "Not enough arguments. Passing test nonetheless."; - return EXIT_SUCCESS; - } - - { - char* fname = argv[1]; + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cell_850113.vtu"); r->SetFileName(fname); r->Update(); @@ -175,7 +170,7 @@ int TestPolyhedronContouring(int argc, char* argv[]) return EXIT_FAILURE; } - r->SetFileName(argv[2]); + r->SetFileName(vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/cell_12851_26.vtu")); r->Update(); vtkUnstructuredGrid* cell_12851 = r->GetOutput(); diff --git a/Common/DataModel/Testing/Cxx/TestPolyhedronCutter.cxx b/Common/DataModel/Testing/Cxx/TestPolyhedronCutter.cxx index 1fa9981ae25fded5df46ab8f8c88033c33e03913..e788fd333be222f2df12e98127dda09d76b1426b 100644 --- a/Common/DataModel/Testing/Cxx/TestPolyhedronCutter.cxx +++ b/Common/DataModel/Testing/Cxx/TestPolyhedronCutter.cxx @@ -4,6 +4,7 @@ #include "vtkCutter.h" #include "vtkPlane.h" #include "vtkPolygon.h" +#include "vtkTestUtilities.h" #include "vtkUnstructuredGrid.h" #include "vtkXMLUnstructuredGridReader.h" @@ -14,13 +15,7 @@ int TestPolyhedronCutter(int argc, char* argv[]) vtkObject::GlobalWarningDisplayOff(); vtkNew<vtkXMLUnstructuredGridReader> r; - if (argc < 3) - { - cout << "Not enough arguments. Passing test nonetheless."; - return EXIT_SUCCESS; - } - - char* fname = argv[1]; + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/onePolyhedron.vtu"); r->SetFileName(fname); r->Update(); @@ -82,7 +77,7 @@ int TestPolyhedronCutter(int argc, char* argv[]) } // For the second slice operation, the only requirement (currently) is that it returns *a result* - fname = argv[2]; + fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/sliceOfPolyhedron.vtu"); r->SetFileName(fname); r->Update(); diff --git a/Common/DataModel/Testing/Cxx/TestStaticCellLocatorEdgeCases.cxx b/Common/DataModel/Testing/Cxx/TestStaticCellLocatorEdgeCases.cxx index bd7c4fc406bec734eb7577d9e5fc6d306dc04590..3b0251ed485288c39d5aaaa05f0746c6704e50c8 100644 --- a/Common/DataModel/Testing/Cxx/TestStaticCellLocatorEdgeCases.cxx +++ b/Common/DataModel/Testing/Cxx/TestStaticCellLocatorEdgeCases.cxx @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen // SPDX-License-Identifier: BSD-3-Clause +#include "vtkTestUtilities.h" #include <vtkCell.h> #include <vtkGenericCell.h> #include <vtkIdList.h> @@ -22,11 +23,6 @@ static int TestCell(vtkDataSet* ds, int cellId, double x1[3], double x2[3], doub int TestStaticCellLocatorEdgeCases(int argc, char* argv[]) { - if (argc < 2) - { - cout << "Not enough arguments."; - return EXIT_FAILURE; - } //=========== // Test Setup @@ -35,7 +31,7 @@ int TestStaticCellLocatorEdgeCases(int argc, char* argv[]) double tol = 1E-15; // tolerance only used in TestCell vtkNew<vtkXMLPolyDataReader> reader; - char* fname = argv[1]; + char* fname = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/test_surface.vtp"); reader->SetFileName(fname); reader->Update(); vtkDataSet* data = reader->GetOutput(); diff --git a/Examples/Android/NativeVTK/jni/main.cxx b/Examples/Android/NativeVTK/jni/main.cxx index 48c5519c1c74888f741919d570026d22fb597cc7..f4ce3225cc74cef2d2168eae5bb008a0658bfee2 100644 --- a/Examples/Android/NativeVTK/jni/main.cxx +++ b/Examples/Android/NativeVTK/jni/main.cxx @@ -171,7 +171,7 @@ void android_main(struct android_app* state) std::string validFile = dataPath + "/NativeVTKValid.png"; tst->AddArgument("-V"); tst->AddArgument(validFile.c_str()); - int result = tst->RegressionTest(outputFile.c_str(), 10.0, ofs); + int result = tst->RegressionTest(outputFile.c_str(), 0.05, ofs); ofs.close(); ANativeActivity_finish(state->activity); diff --git a/Examples/Medical/Cxx/CMakeLists.txt b/Examples/Medical/Cxx/CMakeLists.txt index 148d4339089641c3a1601616d411dda14e06a7ce..6755faa56869125bc734b0df6bc27a1848f3d50b 100644 --- a/Examples/Medical/Cxx/CMakeLists.txt +++ b/Examples/Medical/Cxx/CMakeLists.txt @@ -82,6 +82,9 @@ if (BUILD_TESTING) ${CMAKE_CURRENT_BINARY_DIR}/ExternalData/Testing/Data/headsq/quarter -V DATA{${CMAKE_CURRENT_SOURCE_DIR}/Testing/Data/Baseline/${test}.png} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set_property(TEST "MedicalExampleCxx-${test}" + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") endforeach() ExternalData_Add_Target(MedicalData) diff --git a/Examples/Modelling/Cxx/CMakeLists.txt b/Examples/Modelling/Cxx/CMakeLists.txt index dd5566a7c111880f139f5dccdc77adc8e66eca66..729834a4ffaea284af706871a0b4b7596c1eecb1 100644 --- a/Examples/Modelling/Cxx/CMakeLists.txt +++ b/Examples/Modelling/Cxx/CMakeLists.txt @@ -60,6 +60,9 @@ if (BUILD_TESTING) DATA{${CMAKE_CURRENT_SOURCE_DIR}/Data/financial.txt} -V DATA{${CMAKE_CURRENT_SOURCE_DIR}/Baseline/finance.png} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + set_property(TEST ModellingExampleCxx-finance + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_Add_Target(ModellingData) endif () diff --git a/Filters/Core/Testing/Data/Baseline/TestFlyingEdges2DThinPixel_1.png.sha512 b/Filters/Core/Testing/Data/Baseline/TestFlyingEdges2DThinPixel_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..f9c2883234b3682f9630b38d77d739eee740197d --- /dev/null +++ b/Filters/Core/Testing/Data/Baseline/TestFlyingEdges2DThinPixel_1.png.sha512 @@ -0,0 +1 @@ +4e84bbd2819fbe0eecfd9ba6d761e009a4a85cafb4333f82d1032002ddd49bf0b7d78fa05dbdbe114120b4f0822d3718cfe75292bc6966a42e2df153cb1c00c7 diff --git a/Filters/Core/Testing/Data/Baseline/TestFlyingEdgesPlaneCutter_1.png.sha512 b/Filters/Core/Testing/Data/Baseline/TestFlyingEdgesPlaneCutter_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..4f99aeedaedb81f6bcd2b0e4a542a96707d45c8e --- /dev/null +++ b/Filters/Core/Testing/Data/Baseline/TestFlyingEdgesPlaneCutter_1.png.sha512 @@ -0,0 +1 @@ +216a2f82a0f62f2f7f890e64590a2b28abbabdb7c3a0caaa43d4be05b3d3e3974853450e829c99e19f99bef77c0f425d5781b2a1d09c1eb63106469f19b1538c diff --git a/Filters/Core/Testing/Data/Baseline/TestSurfaceNets3D2.png.sha512 b/Filters/Core/Testing/Data/Baseline/TestSurfaceNets3D2.png.sha512 index b788fc7636f8300ca486765ace5568b92cd7da8a..f562ac95f42f8429403130ad98401ece3532bed9 100644 --- a/Filters/Core/Testing/Data/Baseline/TestSurfaceNets3D2.png.sha512 +++ b/Filters/Core/Testing/Data/Baseline/TestSurfaceNets3D2.png.sha512 @@ -1 +1 @@ -3c1e7e81e4dfe8f02166d1ef4012aa1962029eaf16111129eeb9e7f40a09baa583623297d6e8724757b5863cfcb84f361a997a3fe75213c709199080732d6a28 +dd683dd5e7c15fd056550211a513b7bfee263cf0879eb48e30ea4b302ec97e85e6ca024f2be8ff1ecb07adb186140732ca9c303860a0e210ae0fa58f54b6bdc1 diff --git a/Filters/Core/Testing/Data/Baseline/TestWindowedSincPolylineSmoothing.png.sha512 b/Filters/Core/Testing/Data/Baseline/TestWindowedSincPolylineSmoothing.png.sha512 index 45476c1994b8f5664f6bac0e6294f9795c3c722e..5cae092c0f2b7449dbb30799c03e4c02f6a190e4 100644 --- a/Filters/Core/Testing/Data/Baseline/TestWindowedSincPolylineSmoothing.png.sha512 +++ b/Filters/Core/Testing/Data/Baseline/TestWindowedSincPolylineSmoothing.png.sha512 @@ -1 +1 @@ -660d273963188ba3e0ded63e3bd006417f137a68423f4c00d3a73711e57063bb24df1bae812c81aee93fcb6f8dd56c299670073395ddb4dba35804685c670b6f +d739963768f468dbecd2611d539f5fc11cb0e3d952bcebb986c3d660449234caffe454bb4a78336cee0904379365d665f8eecc4176c8b8769cb4881be160c9eb diff --git a/Filters/Core/Testing/Data/Baseline/TestWindowedSincPolylineSmoothing_2.png.sha512 b/Filters/Core/Testing/Data/Baseline/TestWindowedSincPolylineSmoothing_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..c3fb036cdfcbddf360ea5ec006f4656bbc4c589e --- /dev/null +++ b/Filters/Core/Testing/Data/Baseline/TestWindowedSincPolylineSmoothing_2.png.sha512 @@ -0,0 +1 @@ +395b50c8514c8ce4c1bff3eb28b81a7b1d378f2981b7a997567dbd715c3765c3dcb35a4c071fe277ec21d75abb7ec7d35e9f2c37cb8f1f3becd0772a869be661 diff --git a/Filters/Core/Testing/Data/Baseline/createBFont_1.png.sha512 b/Filters/Core/Testing/Data/Baseline/createBFont_1.png.sha512 index 07bb27edb68ec3c3a01a1d7a808e40ad92a2b2d3..3420807aa9db0d938c4e93a1eed7da9e51466836 100644 --- a/Filters/Core/Testing/Data/Baseline/createBFont_1.png.sha512 +++ b/Filters/Core/Testing/Data/Baseline/createBFont_1.png.sha512 @@ -1 +1 @@ -94d65e985325d8e53b935758fb929fe750b75f9db2d3887a59ed340841414d7cf38c82fc2839cceaccaa3dfda7f1bf6f8aa61e4e6fd8e487f5382a6a325186df +2909b8d24d57a4f7951e0ffa813600467855368a0499c4b331697d974a256534f64791fed85fce207aab9fd7f75e5145905a4663a176a49feff3d1eac44b215c diff --git a/Filters/Core/Testing/Python/CMakeLists.txt b/Filters/Core/Testing/Python/CMakeLists.txt index e52ce2084806f5a7ef385b933f0c2bde40ed4ccc..32b35635455f38892bde1d30046d80ad4d922f39 100644 --- a/Filters/Core/Testing/Python/CMakeLists.txt +++ b/Filters/Core/Testing/Python/CMakeLists.txt @@ -66,7 +66,7 @@ vtk_add_test_python( TestSurfaceNets3D.py TestSurfaceNets3D2.py TestSurfaceNets3D3.py - TestSynchronizedTemplates2D.py +# TestSynchronizedTemplates2D.py #19221 TestSynchronizedTemplates3D.py TestWindowedSincPolyDataFilter.py TestWindowedSincPolyDataFilter2.py @@ -103,7 +103,7 @@ vtk_add_test_python( financialField.py financialField2.py financialField3.py - glyphComb.py +# glyphComb.py #19221 hull.py mergeFilter.py multipleComponentContour.py diff --git a/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt b/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt index 41ce9bcbbfff8b157920dbfdc7fada39002551df..7c6983cc9f008be88e16c143337094a916df1156 100644 --- a/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt +++ b/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt @@ -3,7 +3,7 @@ vtk_add_test_cxx(vtkFiltersFlowPathsCxxTests tests TestCellLocatorsLinearTransform.cxx,NO_DATA,NO_VALID,NO_OUTPUT TestEvenlySpacedStreamlines2D.cxx TestStreamTracer.cxx,NO_VALID - TestStreamTracerSurface.cxx +# TestStreamTracerSurface.cxx #19221 TestStreamSurface.cxx TestAMRInterpolatedVelocityField.cxx,NO_VALID TestParallelVectors.cxx diff --git a/Filters/FlowPaths/Testing/Data/Baseline/TestCellLocatorInterpolatedVelocityField.png.sha512 b/Filters/FlowPaths/Testing/Data/Baseline/TestCellLocatorInterpolatedVelocityField.png.sha512 index e4d2bf88f996dd66ed79c3f6cafc5f41f0f9d0bd..4468a3f1cf16778e987833fdec8e76c18580c9ba 100644 --- a/Filters/FlowPaths/Testing/Data/Baseline/TestCellLocatorInterpolatedVelocityField.png.sha512 +++ b/Filters/FlowPaths/Testing/Data/Baseline/TestCellLocatorInterpolatedVelocityField.png.sha512 @@ -1 +1 @@ -8caddee3dafafabfdd428dea3df88047deed5a9e5b3c4342d3ca71f90cbdb14595864eca59ae6ae5a9f36bcfd828a1e380cec2ce6ffd28941fddec98fe5fdb57 +0f5e8a4ebc2574dc1203a7f32583536b693faf5ca99a38c2e66a6e0d0056978ca926c8de485f35b0c57e1da26aaf78d4c5bbf33d7ee47bed484e69e57859868a diff --git a/Filters/FlowPaths/Testing/Data/Baseline/TestFindCell_1.png.sha512 b/Filters/FlowPaths/Testing/Data/Baseline/TestFindCell_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..ef59ac2041ee44a6d68b65ef8f703353760f08e4 --- /dev/null +++ b/Filters/FlowPaths/Testing/Data/Baseline/TestFindCell_1.png.sha512 @@ -0,0 +1 @@ +6de16580074709424e639230f465324637af2acd53c8aa56991f1350afaf3ea83aa372a5083ea847710c35b3ad6bc53f63b464ca10f79d1dd200358837763a64 diff --git a/Filters/FlowPaths/Testing/Data/Baseline/TestStreamTracerSurface.png.sha512 b/Filters/FlowPaths/Testing/Data/Baseline/TestStreamTracerSurface.png.sha512 index 107e1f64f82294663b89ba2fc1323332fbc3fb30..50ace12fe3aca2c91cea2a3fb704b305a9f90977 100644 --- a/Filters/FlowPaths/Testing/Data/Baseline/TestStreamTracerSurface.png.sha512 +++ b/Filters/FlowPaths/Testing/Data/Baseline/TestStreamTracerSurface.png.sha512 @@ -1 +1 @@ -635870f9e2ab814bf7aeb1dcc468a42a73ac5636aafef1791271f3d5a17435506a625f65ef9ed3a37cc51b4d2361a1cac0f2be62b4c2632d2db0361a63157aa4 +853568e4061c1584353b643e45a76a5cc35e36b955b8e14cedf0fba61361692f24461c69da8dd6a4bf2f585b1a0267333a17b0be4f8d05d0b2c94bfd68c311f6 diff --git a/Filters/General/Testing/Data/Baseline/TestSphericalIteration.png.sha512 b/Filters/General/Testing/Data/Baseline/TestSphericalIteration.png.sha512 index 9318b19c76f5f348e01eef55fb192a89599df494..7b1a6d5241fbadf16720376ab78837f76446ec48 100644 --- a/Filters/General/Testing/Data/Baseline/TestSphericalIteration.png.sha512 +++ b/Filters/General/Testing/Data/Baseline/TestSphericalIteration.png.sha512 @@ -1 +1 @@ -5c9842793c3b571bee6a9e68062426ac9b599446bd789b5c177d29f3a20db3c1a52dd94e6144cabc201b7b2cf82728304d9ed55333a0e4f3c790b408c3dba771 +cd8040368e4c2cae71a85f4cb9bcd9b9227ecdf226229e28adeb826f3cb4dd39d7746dfa2edbd4828059bc99b25128dc30269dc760b6d5facedcfb55bdfe9e5c diff --git a/Filters/General/Testing/Data/Baseline/cursor2D_1.png.sha512 b/Filters/General/Testing/Data/Baseline/cursor2D_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..ae5c00f8a49909ea5dc2876e763822644d6295e0 --- /dev/null +++ b/Filters/General/Testing/Data/Baseline/cursor2D_1.png.sha512 @@ -0,0 +1 @@ +178a5cea0260c916eb5fbc568b32afa63034744a8f2c23a6e22066490f66373153f84310714218954ab9e645decf2abb94c30b59aea78549ff25fa05c7d9437d diff --git a/Filters/General/Testing/Data/Baseline/cursor2D_2.png.sha512 b/Filters/General/Testing/Data/Baseline/cursor2D_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..79bdd0251e27beaf4406b9b085339cf2a4200d97 --- /dev/null +++ b/Filters/General/Testing/Data/Baseline/cursor2D_2.png.sha512 @@ -0,0 +1 @@ +2f63ea80f00afef57949f0e41d585b40d9de12a53d2f9cc934c9fb64a7026a1e1b1feb71ae14232c08b516059cbbc362beee13d5cbb579c438e77c030eb595cc diff --git a/Filters/General/Testing/Data/Baseline/cursor3D_1.png.sha512 b/Filters/General/Testing/Data/Baseline/cursor3D_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..9503652e1c530dd49ff984634bc4c2fa1f88124b --- /dev/null +++ b/Filters/General/Testing/Data/Baseline/cursor3D_1.png.sha512 @@ -0,0 +1 @@ +df72e6ecbbefa44a3bcf71f3cfc25f5e813822a98ba974b2b58f9cfecc9f4f2e379f657f3b66f5b9f4a89eeeab694f778b17f411d16503a5261067fe77870c49 diff --git a/Filters/General/Testing/Data/Baseline/cursor3D_2.png.sha512 b/Filters/General/Testing/Data/Baseline/cursor3D_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..42846d0ebd62d6c3f7d7860a1cfdf259254c31f4 --- /dev/null +++ b/Filters/General/Testing/Data/Baseline/cursor3D_2.png.sha512 @@ -0,0 +1 @@ +6bbda650bbfcb3bd23497eb8eb96793f2cd884def109f0f93e6e2cbce5d11da2f291a9213c8c08868b24c3d6b49e4dcf95caf2120ab7c3b5a1dd0ba927c6e5c5 diff --git a/Filters/General/Testing/Data/Baseline/recursiveDC_1.png.sha512 b/Filters/General/Testing/Data/Baseline/recursiveDC_1.png.sha512 index 34543eddbc59e47b3ada2285f890676ca4f74448..8b241e5e364800ea81a06f8b86340a2c58d5af29 100644 --- a/Filters/General/Testing/Data/Baseline/recursiveDC_1.png.sha512 +++ b/Filters/General/Testing/Data/Baseline/recursiveDC_1.png.sha512 @@ -1 +1 @@ -d7a31c95097031017005c48682c00339d160070ee112ba4e214dc01b168009b8744b934ebe3b2b537803934b8673d695c62822534c931145ad22af4afca57a82 +575944b1beb924589f9099d04037db1a50ea73fc4883b1f3c32e534eb8f8b80f71535c7c59b827889f2760b48bf8ee457aae4b74d4dacbcd1f6a4fe82c694612 diff --git a/Filters/General/Testing/Python/tableBasedClip.py b/Filters/General/Testing/Python/tableBasedClip.py index fe7f7271b4564c0c1eff58f27588ae6804e0b986..456ea80859d56c294c4422599aad7b4b148d6958 100755 --- a/Filters/General/Testing/Python/tableBasedClip.py +++ b/Filters/General/Testing/Python/tableBasedClip.py @@ -264,7 +264,7 @@ class TestClip(Testing.vtkTest): rtTester.AddArgument("tableBasedClip.png") rtTester.SetRenderWindow(rw) rw.Render() - rtResult = rtTester.RegressionTest(10) + rtResult = rtTester.RegressionTest(0.05) def testClipOnNormal(self): eg = vtkEnSightGoldReader() diff --git a/Filters/Geometry/Testing/Data/Baseline/TestLinearToQuadraticCellsFilter_3.png.sha512 b/Filters/Geometry/Testing/Data/Baseline/TestLinearToQuadraticCellsFilter_3.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..d81f136dc600f9df6e2621be56d51330dc6f283d --- /dev/null +++ b/Filters/Geometry/Testing/Data/Baseline/TestLinearToQuadraticCellsFilter_3.png.sha512 @@ -0,0 +1 @@ +9a43689d29d88f9a4142bced7b23f121160d9723888a6b46b5c8048c603458afe3934c2d6341bb8642e9fd69d619bc59bd796877d6f9150adb4b3d91b63fc3d9 diff --git a/Filters/GeometryPreview/Testing/Data/Baseline/TestOctreeImageToPointSetFilter.png.sha512 b/Filters/GeometryPreview/Testing/Data/Baseline/TestOctreeImageToPointSetFilter.png.sha512 index 37a2abd46c0b09c53ca09f3cea0f41526d135474..c4987de2dcf5317cf8b54eba1691e5beafade477 100644 --- a/Filters/GeometryPreview/Testing/Data/Baseline/TestOctreeImageToPointSetFilter.png.sha512 +++ b/Filters/GeometryPreview/Testing/Data/Baseline/TestOctreeImageToPointSetFilter.png.sha512 @@ -1 +1 @@ -27909a7380ff012a12659f52e90651167b4e15fd9671f918ad1749d0c93158a2235095e5d84e3d13448e478344ae39155449179dc19116d922c744a6e0897354 +ab11ff9ea9000ea3c6760b23ee76d9e0c64ff83c58cc40863a86c81ba274af32647be32f8ed0fb1ad8d87361b58b2c805705ef1cd6a0f39240b28067b950e7f3 diff --git a/Filters/Hybrid/Testing/Data/Baseline/TestHyperTreeGridBinary2DAdaptiveDataSetSurfaceFilter_2.png.sha512 b/Filters/Hybrid/Testing/Data/Baseline/TestHyperTreeGridBinary2DAdaptiveDataSetSurfaceFilter_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..0622e75ce9f06881f64ac26c31048f1618337e78 --- /dev/null +++ b/Filters/Hybrid/Testing/Data/Baseline/TestHyperTreeGridBinary2DAdaptiveDataSetSurfaceFilter_2.png.sha512 @@ -0,0 +1 @@ +92d0b62cb6a09f9455a03b56a88d19591bb15f0415521f6a20e258580c6ecfa4b083eadb25921cf525e7c07178426729e0441c1d38f5c359b9d37958547c25f3 diff --git a/Filters/Hybrid/Testing/Data/Baseline/depthSort.png.sha512 b/Filters/Hybrid/Testing/Data/Baseline/depthSort.png.sha512 index cdc15ae821903f2eba3f4136ca6311eeef7a4562..02e5a08ed7e58725afc875e9c4cf93fe2296eb3e 100644 --- a/Filters/Hybrid/Testing/Data/Baseline/depthSort.png.sha512 +++ b/Filters/Hybrid/Testing/Data/Baseline/depthSort.png.sha512 @@ -1 +1 @@ -2a306e0fdb52acf797f801faa0745f89cf197499e2f57ac5d0559d1d644082bd0b6ce15efa968a778644ae538cc40e997d763162ccf846926d2d1cc5a9efd4b6 +176159a5d6cc22a7ae360e55797347fbf8421b482c916ce96f13cee7b8e99c8ce8de16219ea0489101a7093658df3491be4a46f826cd06b66e3624b8e73e533b diff --git a/Filters/HyperTree/Testing/Cxx/CMakeLists.txt b/Filters/HyperTree/Testing/Cxx/CMakeLists.txt index bf3bf28e16fee665b3cdb0be5d968a11af5e140a..ce1359c6f9fadea13afd31cfda7cd1003b41405f 100644 --- a/Filters/HyperTree/Testing/Cxx/CMakeLists.txt +++ b/Filters/HyperTree/Testing/Cxx/CMakeLists.txt @@ -47,7 +47,7 @@ set(test_sources TestHyperTreeGridBinary3DContourDecomposePolyhedra.cxx TestHyperTreeGridBinary3DContourImplicit.cxx TestHyperTreeGridBinary3DContourImplicitInteger.cxx,NO_VALID,NO_OUTPUT - TestHyperTreeGridBinary3DFeatureEdges.cxx + TestHyperTreeGridBinary3DFeatureEdges.cxx, LOOSE_VALID TestHyperTreeGridBinary3DGeometry.cxx TestHyperTreeGridBinaryClipPlanes.cxx TestHyperTreeGridBinaryEllipseMaterial.cxx @@ -76,7 +76,7 @@ set(test_sources TestHyperTreeGridTernary3DDualContour.cxx TestHyperTreeGridTernary3DDualContourMaterial.cxx TestHyperTreeGridTernary3DGeometry.cxx - TestHyperTreeGridTernary3DGeometryLargeMaterialBits.cxx +# TestHyperTreeGridTernary3DGeometryLargeMaterialBits.cxx #19221 TestHyperTreeGridTernary3DGeometryMaterial.cxx TestHyperTreeGridTernary3DGeometryMaterialBits.cxx TestHyperTreeGridTernary3DGradient.cxx diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DAxisClipPlanes.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DAxisClipPlanes.png.sha512 index c89221a7385d6c64fb91ebe62c5adb63c1b0059e..bafa2011d1cee5a3ad1f0234d5ef2542e18826e1 100644 --- a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DAxisClipPlanes.png.sha512 +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DAxisClipPlanes.png.sha512 @@ -1 +1 @@ -33b13e60dcd89157ecf9744d666ff902862bfd3aafa35356193797f465cb02db2cd2d71a9d5272221352cee4761e5f8fb1f5543c4d3782ac7fb3c1417f054c5d +b674cbe484b38549d6c0acf3c02e4c29b82e720eef4e7afda5b9fa450328a6f9887f0fb38a5304e79330793e104a62326cfd17f7ed9e15640fdee3c751fa19f7 diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DMaterialIJK_1.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DMaterialIJK_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..9adbb9d4d735f645fcca7bbe8d822c5020899750 --- /dev/null +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DMaterialIJK_1.png.sha512 @@ -0,0 +1 @@ +ece1ac5383053c74aedf8007d73f58550505ff73259db36b3b8734fc20671db61335d088400fe5c95c72305b6d950988e733afb8113574924f91723ac982154d diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DMaterial_1.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DMaterial_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..9adbb9d4d735f645fcca7bbe8d822c5020899750 --- /dev/null +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary2DMaterial_1.png.sha512 @@ -0,0 +1 @@ +ece1ac5383053c74aedf8007d73f58550505ff73259db36b3b8734fc20671db61335d088400fe5c95c72305b6d950988e733afb8113574924f91723ac982154d diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary3DContourDecomposePolyhedra.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary3DContourDecomposePolyhedra.png.sha512 index a9715ef6b3440a25411c7af5e5306dc447432589..f3583802f98fb8a0b783c7c3ef0640f871465b05 100644 --- a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary3DContourDecomposePolyhedra.png.sha512 +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary3DContourDecomposePolyhedra.png.sha512 @@ -1 +1 @@ -e753901e4676d7c8eea06c8c4d3235bd79c661a8b48dec00d58869dd5108f34d4192caed02d040d0600290089ce0ae26b2570f40fda2c5369bcaa62d725dc1ff +e49f8f360df663c859e3727ee3215799312a1063d379e18bd21784a951c64cac793918b9c5af26fd665b88251597b73421337e691f20f54130b5116ea780c68d diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary3DFeatureEdges.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary3DFeatureEdges.png.sha512 index 622ec198c843cc077c05b03aaf63831e69235bba..98f055bc1ee22780e4acae8fec1bed19d3847b08 100644 --- a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary3DFeatureEdges.png.sha512 +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinary3DFeatureEdges.png.sha512 @@ -1 +1 @@ -540170ab2c8a28d4f8677751800ddb41a39e90039b489b2acb54f2b35d1433993433f5633147c2426db081ec6ebd844e9f8869084c16247758e49b2c922e53b5 +919f1f1843a9d2aec6a2ce4c646b324ce37efc0e9dc189b3e6bdaca4e910f55118b726c854c58e270d71f5963028ca2c0e658ede99f317742fae5ba32e6a1b74 diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinaryHyperbolicParaboloidMaterial_1.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinaryHyperbolicParaboloidMaterial_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..8bcdec5a416e1bc5af902bbe96be33487ee99334 --- /dev/null +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridBinaryHyperbolicParaboloidMaterial_1.png.sha512 @@ -0,0 +1 @@ +b97a1330e3684132e14f52ee29ccc5bbf47536cc5ddd766f5c6db24ccc925f035ca49c67c7d0e3c8c596a2e327d213e29d7c88f4cedf0349c40e12a7bb04a4d0 diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterialBits_1.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterialBits_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..6ab4da8a1bce800da6bbcacb029f8d769c9b7b6f --- /dev/null +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterialBits_1.png.sha512 @@ -0,0 +1 @@ +c58a02ea02b74456f11966f2d206531c8d089bb84d25e344a4a34ad7c5da2730dd2d389f7f45e3b7f10eb523f557e1301cbf87a2875000e3a3a017884dc1d3d8 diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterialBits_2.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterialBits_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..69367783245e0b9cbf38e8fdd20723a5965a85b7 --- /dev/null +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterialBits_2.png.sha512 @@ -0,0 +1 @@ +13090bb46b5a4aed6d9ac67a462b684bebe8de628858cd302fa4af47b1f4e1547383f3defecae35b25f96b2b3a7c7c6b497767808f7d8e4251187fe9076fa36d diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterial_1.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterial_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..69367783245e0b9cbf38e8fdd20723a5965a85b7 --- /dev/null +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2DMaterial_1.png.sha512 @@ -0,0 +1 @@ +13090bb46b5a4aed6d9ac67a462b684bebe8de628858cd302fa4af47b1f4e1547383f3defecae35b25f96b2b3a7c7c6b497767808f7d8e4251187fe9076fa36d diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2D_1.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2D_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..43a098c22d3bfa7ab52a042f9d4c8e031db9d8b6 --- /dev/null +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary2D_1.png.sha512 @@ -0,0 +1 @@ +d1540d718bb03eae6cb0178d22bf561dfb566da43c23dfbddb5c5033e08bbc80240becd1343954c9d5772f3b1c158798eac284afba60f542e0e798b0a00f53f5 diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary3DAxisClipPlanes.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary3DAxisClipPlanes.png.sha512 index 03935103b64210ee8a3b4bc8367c4e6035413a36..16bfb9cd40e535aebd9bef69fc8ec84f50098fe5 100644 --- a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary3DAxisClipPlanes.png.sha512 +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernary3DAxisClipPlanes.png.sha512 @@ -1 +1 @@ -74329ffeec4f3b214b5958b23a5d86834e3bd9907679fc6281e0d3493d8f9a3cb522cacf93c31bffa037d6cf792852d2cb73e2b5df21d8e807009dc1eb78f52a +5ccbfb0aeae07eb38581279af1e101fe44a3b51b8c10eaa02a69cc99a236bc5c0f33e7d3113308629087c1b4f8c47ff9ee0eb1cf59953e6c3a6935b73ecf221f diff --git a/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernarySphereMaterialReflections_1.png.sha512 b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernarySphereMaterialReflections_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..6309eb736ada5f79e03d31b88efe27d8cdc3d8b0 --- /dev/null +++ b/Filters/HyperTree/Testing/Data/Baseline/TestHyperTreeGridTernarySphereMaterialReflections_1.png.sha512 @@ -0,0 +1 @@ +2307c6ff38eda7461e5b23c3a4e50056976bfa46bf66edcc2651768951f02235e8a36314de8646ea14b44a168bfd5c0e97258ef7b2648103f817405211718308 diff --git a/Filters/Modeling/Testing/Data/Baseline/TestCookieCutter4.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestCookieCutter4.png.sha512 index 4af93d60bbe2da8a616ffaf5aa9b91fa0d04caeb..3b1797f0411e8364ac828b40e87d1b4562270d71 100644 --- a/Filters/Modeling/Testing/Data/Baseline/TestCookieCutter4.png.sha512 +++ b/Filters/Modeling/Testing/Data/Baseline/TestCookieCutter4.png.sha512 @@ -1 +1 @@ -6f4ec3437943afb2a15657fe5045eb632945ed4cef33817833b975114c68b672dbeba2aade12936a6e4a4db8cec9e9fa5d201ffaaef8fa612dd17a577a59a7c9 +c8046f18223075792e569ac353cdb6353efcfea38c2074c4878cef6161af5b3fabcea509cc3bfeb0abfeab7b693b1937d904d1cdf1186d1ebed819b620e297a9 diff --git a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter2_1.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter2_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..9e2333308279f9e78e5904205bfcf0944ab51092 --- /dev/null +++ b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter2_1.png.sha512 @@ -0,0 +1 @@ +ce2d7ae1bebca1c3ade4d973df99e4a67615b6e991d9b09a9f8c78c7997ade6fe3e73a8f3779f741443d55df92cbbee11d390f08951b100d51bc7f295805788c diff --git a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter3.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter3.png.sha512 index 842150c81e0a15f190659ff78f23dccdfaef3ba3..e4a5339c86a5c6575147da02e98c9655b9bd38b9 100644 --- a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter3.png.sha512 +++ b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter3.png.sha512 @@ -1 +1 @@ -64f27fa2623d70fe1ee1fdc069db663c6c18745fcde2a67e532f5d6f936a7afdc367fb3dbb63ebd98b014ba6f2b1d54e1c71f9c5dc6bd37f3f0c711d1f5010e2 +e29f4b3733b0ada84cd6aeee4c53af8bab15f4bce9671beca3726209a448f5316c28dcc8a111ca7cc12b66c486d2525b8a653ace0261534106f7da15b329ff8a diff --git a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter3_1.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter3_1.png.sha512 deleted file mode 100644 index bf90bb55abd9b92e5d6f0fa8e2e9b29a933ad5b4..0000000000000000000000000000000000000000 --- a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter3_1.png.sha512 +++ /dev/null @@ -1 +0,0 @@ -5e924633d400a0ad1b0134e133a9592561e38ec10bceadfa4588018eb542cc272e2976c6e8bb0c01d5ba890752d54c320dd26a102edf6d2282ebdba29b477016 diff --git a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter6.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter6.png.sha512 index e877fcd2cad93bde4526ed35d779f2af81e94ab9..7e793428985c2e73caa3690e6e399aed70adf4bc 100644 --- a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter6.png.sha512 +++ b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter6.png.sha512 @@ -1 +1 @@ -06bc4ce1ddab24ca61a6feca505d283477ef2dd1ac126f5cd66689fd0ea6654a130c4b83f343b1b1a271d0c4402c64c475fa5b319cd6016e655ee19a84646895 +e7d6f3c083ae7682ffc949692d43d3b5248e4b696231dc361816fb4c0a58232337ec0e244fd47a382756a740321f1e20a8208cb5908d1599175cb18aaeb16839 diff --git a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter6_1.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter6_1.png.sha512 deleted file mode 100644 index d1e7c4d936ebcfb73970c96bd83919fbc8c8ffe7..0000000000000000000000000000000000000000 --- a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter6_1.png.sha512 +++ /dev/null @@ -1 +0,0 @@ -53b72cbf2fe90c77050ee5b62d35b758d925452ffe1130cec057d1640efe42f6e33cf898e7e028b37965aeb95b14618ce159ce87b2d2bfbed9ee9c6b30b16746 diff --git a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter7.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter7.png.sha512 index 75ac26fa256cd3ac212aa41bffa2aff15b9b73e9..3a7bf19fdbac78e3fa175237ceab7eb5977beabb 100644 --- a/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter7.png.sha512 +++ b/Filters/Modeling/Testing/Data/Baseline/TestImprintFilter7.png.sha512 @@ -1 +1 @@ -75a75d2b170a5edc5ae7dde911270695afaf0064eb0133156dad4a94ac69114fb59c3b922058fa7fbbf8c4eac583fa45aff3961f0316695f21c56756854fa877 +4d4ce0ba1cedb5e15e422918631011525f9eeffa9c50044329f67061d7d4d31a052ba90282be0555ff59ac65df6ff871fc295bff9308bd6f2f72779b9875be95 diff --git a/Filters/Modeling/Testing/Data/Baseline/TestQuadRotationalExtrusion_1.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestQuadRotationalExtrusion_1.png.sha512 index a763e7ea7ad7bd30ca5f152fbfbf996396737803..44795f1a0b0f6819c1d5193bbc23668fc7f199ae 100644 --- a/Filters/Modeling/Testing/Data/Baseline/TestQuadRotationalExtrusion_1.png.sha512 +++ b/Filters/Modeling/Testing/Data/Baseline/TestQuadRotationalExtrusion_1.png.sha512 @@ -1 +1 @@ -43e091b88fb0100d8abd60312de96a60c8259ce49624bb13772c8f91532ceb3e9b7b25c4835789bea740007667928dbbe8334037748db62751aaddeb7f9a49fe +58f019fbaab616bb669b8deab0d417b5eaa3685595428f582bef5ef3daedb037d1f574387ccf90c26f2318172eec5bcd2ab780eeb3f660f735dbe9d1518b9b8a diff --git a/Filters/Modeling/Testing/Data/Baseline/TestRotationalExtrusion_2.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestRotationalExtrusion_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..61f7d26f9254c60c32e8e81e643c900b084780bb --- /dev/null +++ b/Filters/Modeling/Testing/Data/Baseline/TestRotationalExtrusion_2.png.sha512 @@ -0,0 +1 @@ +64747e9cb4e23a66eef81754383a899832902c82881ce6ed160c3a13e955a46f1e171fbd51e1852004c5c2f5b04ad69cd754ab7a590be0d42f4be2b607f1062a diff --git a/Filters/Modeling/Testing/Data/Baseline/TestTrimmedExtrusionFilter.png.sha512 b/Filters/Modeling/Testing/Data/Baseline/TestTrimmedExtrusionFilter.png.sha512 index 97842abf37b72dd5e339ff6a50018e0f2fb2aae5..8c94557805c8f2842e70941980a3ca34a65d18c7 100644 --- a/Filters/Modeling/Testing/Data/Baseline/TestTrimmedExtrusionFilter.png.sha512 +++ b/Filters/Modeling/Testing/Data/Baseline/TestTrimmedExtrusionFilter.png.sha512 @@ -1 +1 @@ -4e07bf639fad75fffc5ce968502ae357a3186535ff8727db1781e9f50a768b403024adcfb231f64e110f62ac92ef0c650491e60d01ab4da88b7ca74efad91287 +655a2385342d5fe6ad121588895ac7e4c30234ed1c8ff9fd970cd805bd3918503a8d4fe39e8983d9d1a7556277db9d6293a630b2c23c5539d534a82a3cb0eb4b diff --git a/Filters/Points/Testing/Data/Baseline/TestExtractPoints.png.sha512 b/Filters/Points/Testing/Data/Baseline/TestExtractPoints.png.sha512 index 2e59e8870ffde2be0fd6e0eb4d16a98955f6842d..068e7530ecc337236974680cd50bea4e4590bab6 100644 --- a/Filters/Points/Testing/Data/Baseline/TestExtractPoints.png.sha512 +++ b/Filters/Points/Testing/Data/Baseline/TestExtractPoints.png.sha512 @@ -1 +1 @@ -659c8133caba8076088e00f9cb81eb78ff4fc4371679ca983a9e384c5af6961da5ab46f03cc45762c6b7f53cb9e7d20df753e9f053b07d13c4701a9cd76a4b9e +cbd703f82ed448a399163a2d8a0180d9e108b8aef770a60b5c5683cf74479298e13326e5f88db3499d0c4e811785b3e6fab25756050280ab510e0fe5d7a43dca diff --git a/Filters/Points/Testing/Data/Baseline/TestExtractPoints_1.png.sha512 b/Filters/Points/Testing/Data/Baseline/TestExtractPoints_1.png.sha512 deleted file mode 100644 index b4483408e9905e526790357d8c1753ee5b64ab27..0000000000000000000000000000000000000000 --- a/Filters/Points/Testing/Data/Baseline/TestExtractPoints_1.png.sha512 +++ /dev/null @@ -1 +0,0 @@ -84cd8d02e2fff8fb9d1fe56169848b903a827b2ca63817bdb9904187638ca36c3b39534c001dc14f06d02ad36e9f7597c2636cf4a31ff207928504da39e55671 diff --git a/Filters/Points/Testing/Data/Baseline/TestFitImplicitFunction.png.sha512 b/Filters/Points/Testing/Data/Baseline/TestFitImplicitFunction.png.sha512 index e0da67d7dd90ee50401516baf01b0bda8dca19df..4407da2afb7ce4cf13ab5758634f607c930cf9cd 100644 --- a/Filters/Points/Testing/Data/Baseline/TestFitImplicitFunction.png.sha512 +++ b/Filters/Points/Testing/Data/Baseline/TestFitImplicitFunction.png.sha512 @@ -1 +1 @@ -9d35e28d695c93e885cbe20ba4f84d8fb216976bc03dde840b9d97d85136d61b462102e0afa0692ef17ebb66db32edaa73e04f8a3cca43db5972d1db3573c36f +12040a677123034326777903a340b6231af82abbee14519306b0232456e4459384bff27254c1e1e792ca1302117fafc97cfef9f26d6c148ea1f9b90bd3e82f9f diff --git a/Filters/Points/Testing/Data/Baseline/TestPointSmoothingFilter3.png.sha512 b/Filters/Points/Testing/Data/Baseline/TestPointSmoothingFilter3.png.sha512 index 935fdbce8c70417cb633604ec03a8fce7146742e..e956b56a9a075b3211e8b8291c47c9ab138c58a8 100644 --- a/Filters/Points/Testing/Data/Baseline/TestPointSmoothingFilter3.png.sha512 +++ b/Filters/Points/Testing/Data/Baseline/TestPointSmoothingFilter3.png.sha512 @@ -1 +1 @@ -c0d6cd262fc982c26f1de34b88c62a76aa9145553c560f973039882564219f00b31cf29c283041d80013a3aa75c34b642863df2fbad8c9b7879ad2b850f22e3d +c141053c01e21e4c150bb6c39d78320969b0cf535dc3088eca61ff0892d471e2f868ca01142a5eeacefa5a45b5ffbc657faeb44b140423a290bcac01b6e18213 diff --git a/Filters/Points/Testing/Data/Baseline/TestProjectPointsToPlane.png.sha512 b/Filters/Points/Testing/Data/Baseline/TestProjectPointsToPlane.png.sha512 index 2eeca1cf22003e183feed6f7b3f4f4d50fd722e7..f680679bf632d65a2d158053e1d9d8371b7d997b 100644 --- a/Filters/Points/Testing/Data/Baseline/TestProjectPointsToPlane.png.sha512 +++ b/Filters/Points/Testing/Data/Baseline/TestProjectPointsToPlane.png.sha512 @@ -1 +1 @@ -793e35e730a5a3a61095625eba828d6f606d9b9b9b9ec0ea8d19af6c0d28e4514cd20aa47cb78b6f725b220eae48df82da0231bc1604f619c6f2bec440608fea +7a968eabfde7ac228d19888b583c7de9707b7305e421ea9d9acfd94459ce2741c6942a33dd92f75d62d3168a0fde2715560e6471467cf3cfbc10dd9ced70a206 diff --git a/Filters/Points/Testing/Data/Baseline/TestUnsignedDistanceFilter.png.sha512 b/Filters/Points/Testing/Data/Baseline/TestUnsignedDistanceFilter.png.sha512 index d2e02020e28cb47624d3abc2c0d12fb865d4024b..3cb34ce148157a241208436e083443e6e3285a77 100644 --- a/Filters/Points/Testing/Data/Baseline/TestUnsignedDistanceFilter.png.sha512 +++ b/Filters/Points/Testing/Data/Baseline/TestUnsignedDistanceFilter.png.sha512 @@ -1 +1 @@ -161252378336b7a3d56d8d954d240c08b25cfc6007f46432f5dc7f17b36766faaa5123e5171fcaec9a01afd9b243df90a4f737cdc503d0cf1e00deadc8ea529e +3eda02801652c04d385fc384d9fb74195121f0a921c14a290ce2f8cd229c0001f529f03f19f6e1f81ccd7ae137c92169477111dffecafb134e981eeb570c3711 diff --git a/Filters/Points/Testing/Python/CMakeLists.txt b/Filters/Points/Testing/Python/CMakeLists.txt index c56dd631afa3c909b143b97a59277299eb47191b..a135360a76672ad837318404f9a93b7ad8a1aa71 100644 --- a/Filters/Points/Testing/Python/CMakeLists.txt +++ b/Filters/Points/Testing/Python/CMakeLists.txt @@ -7,7 +7,7 @@ vtk_add_test_python( TestEuclideanClusterExtraction2.py TestExtractEnclosedPoints.py TestExtractPoints.py - TestFitImplicitFunction.py + TestFitImplicitFunction.py, LOOSE_VALID TestHierarchicalBinningFilter.py TestPCACurvatureEstimation.py TestPCACurvatureEstimation2.py @@ -18,7 +18,7 @@ vtk_add_test_python( TestPointInterpolator.py TestPointInterpolator2.py TestPointInterpolator2D.py - TestPointInterpolator2D2.py + TestPointInterpolator2D2.py, LOOSE_VALID TestPointOccupancyFilter.py TestPointSmoothingFilter.py TestPointSmoothingFilter2.py diff --git a/Filters/Sources/Testing/Data/Baseline/TestExponentialPointSource.png.sha512 b/Filters/Sources/Testing/Data/Baseline/TestExponentialPointSource.png.sha512 index 7d04777abd61dccd1d728765516afed1fda60553..082e7a7ffdb38c1a59d69314e77785e970599748 100644 --- a/Filters/Sources/Testing/Data/Baseline/TestExponentialPointSource.png.sha512 +++ b/Filters/Sources/Testing/Data/Baseline/TestExponentialPointSource.png.sha512 @@ -1 +1 @@ -89c575c4ff3b6d09ae357ec3684ab4cc428596e9c00e94d79e82a28aabc64208bcea1aaa1d0d11840d261dc636169e6927bf0c2d854f2528517f896cb5db7175 +d4337c3edc59a808ba0dc3b346752cfeb7dd66ae821beb966811eb7046daba65a7a1f155333b168cae9aae16a3addc592144ebb77d59979949ed5809fff8c990 diff --git a/Filters/Sources/Testing/Python/CMakeLists.txt b/Filters/Sources/Testing/Python/CMakeLists.txt index c81daa7aecc708b934c97e317eefcab9890a3884..c4a0223abfe4e22449b4f125fb535e94c342c2d0 100644 --- a/Filters/Sources/Testing/Python/CMakeLists.txt +++ b/Filters/Sources/Testing/Python/CMakeLists.txt @@ -4,7 +4,7 @@ vtk_add_test_python( Disk.py OSCone.py TestButtonSource.py - TestEllipseArcSourceResolution.py +# TestEllipseArcSourceResolution.py #19221 TestExponentialPointSource.py TestGlyphScaling.py TestPlatonicNormals.py diff --git a/GUISupport/Qt/Testing/Cxx/CMakeLists.txt b/GUISupport/Qt/Testing/Cxx/CMakeLists.txt index b88d9fb66d4642bc56e7fa68b7a971f1ae802480..1ff0633c4f0e03e56b0b19d83f54c2475fe5423d 100644 --- a/GUISupport/Qt/Testing/Cxx/CMakeLists.txt +++ b/GUISupport/Qt/Testing/Cxx/CMakeLists.txt @@ -23,7 +23,7 @@ vtk_add_test_cxx(vtkGUISupportQtCxxTests tests TestQVTKOpenGLNativeWidgetPicking,TestQtPicking.cxx,NO_VALID TestQVTKOpenGLNativeWidgetSwapWindows,TestQtSwapWindows.cxx,NO_VALID TestQVTKOpenGLNativeWidget,TestQtWidget.cxx - TestQVTKOpenGLNativeWidgetWithDisabledInteractor,TestQtWithDisabledInteractor.cxx +# TestQVTKOpenGLNativeWidgetWithDisabledInteractor,TestQtWithDisabledInteractor.cxx #19221 TestQVTKOpenGLNativeWidgetWithMSAA,TestQtWithMSAA.cxx TestQVTKOpenGLNativeWidgetWithChartHistogram2D,TestQtWithChartHistogram2D.cxx ) @@ -43,8 +43,8 @@ vtk_add_test_cxx(vtkGUISupportQtCxxTests tests TestQVTKRenderWidgetQWidgetWidget,TestQWidgetWidget.cxx,NO_VALID TestQVTKRenderWidgetPicking,TestQtPicking.cxx,NO_VALID TestQVTKRenderWidgetSwapWindows,TestQtSwapWindows.cxx,NO_VALID - TestQVTKRenderWidget,TestQtWidget.cxx - TestQVTKRenderWidgetWithDisabledInteractor,TestQtWithDisabledInteractor.cxx +# TestQVTKRenderWidget,TestQtWidget.cxx #19221 +# TestQVTKRenderWidgetWithDisabledInteractor,TestQtWithDisabledInteractor.cxx #19112 TestQVTKRenderWidgetWithMSAA,TestQtWithMSAA.cxx TestQVTKRenderWidgetWithChartHistogram2D,TestQtWithChartHistogram2D.cxx ) @@ -55,7 +55,7 @@ vtk_add_test_cxx(vtkGUISupportQtCxxTests tests TestQVTKOpenGLWidgetPicking,TestQtPicking.cxx,NO_VALID TestQVTKOpenGLWidgetSwapWindows,TestQtSwapWindows.cxx,NO_VALID TestQVTKOpenGLWidget,TestQtWidget.cxx - TestQVTKOpenGLWidgetWithDisabledInteractor,TestQtWithDisabledInteractor.cxx +# TestQVTKOpenGLWidgetWithDisabledInteractor,TestQtWithDisabledInteractor.cxx #19221 TestQVTKOpenGLWidgetWithMSAA,TestQtWithMSAA.cxx TestQVTKOpenGLWidgetWithChartHistogram2D,TestQtWithChartHistogram2D.cxx ) @@ -90,11 +90,11 @@ set_tests_properties(VTK::GUISupportQtCxx-TestQVTKOpenGLWidgetPicking # since these tests grab from on-screen buffer, they must be run serially. set_tests_properties(VTK::GUISupportQtCxx-TestQVTKOpenGLStereoWidgetWithDisabledInteractor PROPERTIES RUN_SERIAL ON) -set_tests_properties(VTK::GUISupportQtCxx-TestQVTKOpenGLNativeWidgetWithDisabledInteractor - PROPERTIES RUN_SERIAL ON) +#set_tests_properties(VTK::GUISupportQtCxx-TestQVTKOpenGLNativeWidgetWithDisabledInteractor +# PROPERTIES RUN_SERIAL ON) #19221 set_tests_properties(VTK::GUISupportQtCxx-TestQVTKOpenGLWindowWithDisabledInteractor PROPERTIES RUN_SERIAL ON) -set_tests_properties(VTK::GUISupportQtCxx-TestQVTKRenderWidgetWithDisabledInteractor - PROPERTIES RUN_SERIAL ON) -set_tests_properties(VTK::GUISupportQtCxx-TestQVTKOpenGLWidgetWithDisabledInteractor - PROPERTIES RUN_SERIAL ON) +#set_tests_properties(VTK::GUISupportQtCxx-TestQVTKRenderWidgetWithDisabledInteractor +# PROPERTIES RUN_SERIAL ON) #19221 +#set_tests_properties(VTK::GUISupportQtCxx-TestQVTKOpenGLWidgetWithDisabledInteractor +# PROPERTIES RUN_SERIAL ON) #19221 diff --git a/GUISupport/Qt/Testing/Cxx/TestQtWidget.cxx b/GUISupport/Qt/Testing/Cxx/TestQtWidget.cxx index fc827a10291d0255970da448fa274fb78c5a4baa..06931730a07e1ae7e1f96470d6088dd57058daaf 100644 --- a/GUISupport/Qt/Testing/Cxx/TestQtWidget.cxx +++ b/GUISupport/Qt/Testing/Cxx/TestQtWidget.cxx @@ -68,7 +68,7 @@ int TestQtWidget(int argc, char* argv[]) vtktesting->SetRenderWindow(window); - int retVal = vtktesting->RegressionTest(10); + int retVal = vtktesting->RegressionTest(0.05); switch (retVal) { case vtkTesting::DO_INTERACTOR: diff --git a/GUISupport/Qt/Testing/Cxx/TestQtWithChartHistogram2D.cxx b/GUISupport/Qt/Testing/Cxx/TestQtWithChartHistogram2D.cxx index 424ca2f8af48010e83dff4763f4ae787b23bd7c8..9e8a42bf7d0e637debf843d30d87019648ba42fb 100644 --- a/GUISupport/Qt/Testing/Cxx/TestQtWithChartHistogram2D.cxx +++ b/GUISupport/Qt/Testing/Cxx/TestQtWithChartHistogram2D.cxx @@ -85,7 +85,7 @@ int TestQtWithChartHistogram2D(int argc, char* argv[]) detail::show(widgetOrWindow, QSize(size, size)); vtktesting->SetRenderWindow(window); - int retVal = vtktesting->RegressionTest(10); + int retVal = vtktesting->RegressionTest(0.05); switch (retVal) { case vtkTesting::DO_INTERACTOR: diff --git a/GUISupport/Qt/Testing/Cxx/TestQtWithDisabledInteractor.cxx b/GUISupport/Qt/Testing/Cxx/TestQtWithDisabledInteractor.cxx index e6a01e2205e2cc1f643fc1750162c26138918e1b..db0c7f1775ed27c816848f8519e3bde22b8ed7d3 100644 --- a/GUISupport/Qt/Testing/Cxx/TestQtWithDisabledInteractor.cxx +++ b/GUISupport/Qt/Testing/Cxx/TestQtWithDisabledInteractor.cxx @@ -76,7 +76,7 @@ int TestQtWithDisabledInteractor(int argc, char* argv[]) return EXIT_FAILURE; } - int retVal = vtktesting->RegressionTest(fileName, 0); + int retVal = vtktesting->RegressionTest(fileName, 0.05); switch (retVal) { case vtkTesting::DO_INTERACTOR: diff --git a/GUISupport/Qt/Testing/Cxx/TestQtWithMSAA.cxx b/GUISupport/Qt/Testing/Cxx/TestQtWithMSAA.cxx index 115723ab1e1958cc8ee650c1f41e0c17af03e6e2..4260622be2e6ccf96e6bde585adb12f24fb13d10 100644 --- a/GUISupport/Qt/Testing/Cxx/TestQtWithMSAA.cxx +++ b/GUISupport/Qt/Testing/Cxx/TestQtWithMSAA.cxx @@ -50,7 +50,7 @@ int TestQtWithMSAA(int argc, char* argv[]) vtktesting->SetRenderWindow(window); - int retVal = vtktesting->RegressionTest(10); + int retVal = vtktesting->RegressionTest(0.05); switch (retVal) { case vtkTesting::DO_INTERACTOR: diff --git a/GUISupport/QtQuick/Testing/Cxx/TestQQuickCommon.cxx b/GUISupport/QtQuick/Testing/Cxx/TestQQuickCommon.cxx index bfee94745b43efa743171e899d41be402de8b671..b8eaa0d8e63fbfa63bacf88c78703d4ebed2e97f 100644 --- a/GUISupport/QtQuick/Testing/Cxx/TestQQuickCommon.cxx +++ b/GUISupport/QtQuick/Testing/Cxx/TestQQuickCommon.cxx @@ -209,7 +209,7 @@ int performTest(int argc, char* argv[], const char* filename) std::string vImage = tmpDir + "/" + validName; im.save(QString::fromStdString(vImage), "PNG"); - int retVal = vtktesting->RegressionTest(vImage, 10); + int retVal = vtktesting->RegressionTest(vImage, 0.05); switch (retVal) { diff --git a/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderItem.cxx b/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderItem.cxx index 8addd352537773d6cb0afdc40ee6b4cd9a7a4e8a..f695a693bc6f5544edd149a9e8097421ba7258d5 100644 --- a/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderItem.cxx +++ b/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderItem.cxx @@ -87,7 +87,7 @@ int TestQQuickVTKRenderItem(int argc, char* argv[]) w->SetFileName(vImage.c_str()); w->Write(); - int retVal = vtktesting->RegressionTest(vImage, 10); + int retVal = vtktesting->RegressionTest(vImage, 0.05); switch (retVal) { diff --git a/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderItemWidget.cxx b/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderItemWidget.cxx index eee76407d1c28984b7451bcdbb273db2b5257f5e..75309067b529137a94191c69cfec9a54aaf37898 100644 --- a/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderItemWidget.cxx +++ b/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderItemWidget.cxx @@ -196,7 +196,7 @@ int TestQQuickVTKRenderItemWidget(int argc, char* argv[]) w->SetFileName(vImage.c_str()); w->Write(); - int retVal = vtktesting->RegressionTest(vImage, 10); + int retVal = vtktesting->RegressionTest(vImage, 0.05); switch (retVal) { diff --git a/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderWindow.cxx b/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderWindow.cxx index 05c5d6871ac5e43d677efa18addea55e3a84b8ff..2ded253a6909455768a1f29f80ee47de3073a9d7 100644 --- a/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderWindow.cxx +++ b/GUISupport/QtQuick/Testing/Cxx/TestQQuickVTKRenderWindow.cxx @@ -154,7 +154,7 @@ int TestQQuickVTKRenderWindow(int argc, char* argv[]) w->SetFileName(vImage.c_str()); w->Write(); - int retVal = vtktesting->RegressionTest(vImage, 10); + int retVal = vtktesting->RegressionTest(vImage, 0.05); switch (retVal) { diff --git a/IO/ADIOS2/Testing/Data/Baseline/TestADIOS2BPReaderMultiTimeSteps3D_1.png.sha512 b/IO/ADIOS2/Testing/Data/Baseline/TestADIOS2BPReaderMultiTimeSteps3D_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..ead52d5ba08e26dfff5c4dbfe29c8eeef1c9b532 --- /dev/null +++ b/IO/ADIOS2/Testing/Data/Baseline/TestADIOS2BPReaderMultiTimeSteps3D_1.png.sha512 @@ -0,0 +1 @@ +5cb5042b91b8b4f3d9c2c7c3da3408f6dcbfeab6397e9c6f825a67c7d59be351effc032401bcfcdfb26929a44eae7ba5857890f5a29eb45201a97a8f27498545 diff --git a/IO/Exodus/Testing/CMakeLists.txt b/IO/Exodus/Testing/CMakeLists.txt index 34de488e4eb01092e5efd6e6776767b13438e223..f7fb8de3e6d899a3659eb1823e13dafeffa32e6b 100644 --- a/IO/Exodus/Testing/CMakeLists.txt +++ b/IO/Exodus/Testing/CMakeLists.txt @@ -1,7 +1,10 @@ vtk_module_test_data( Data/box-noglom.ex2 Data/can.ex2 - Data/edgeFaceElem.exii) + Data/edgeFaceElem.exii + Data/tetra15.g + Data/wedge18.e + ) if (NOT vtk_testing_cxx_disabled) add_subdirectory(Cxx) diff --git a/IO/Exodus/Testing/Cxx/CMakeLists.txt b/IO/Exodus/Testing/Cxx/CMakeLists.txt index 3b5e39f4c17cf9d85b862415e40a33815e7a797a..c4c69f97eec4f8941ab93f1423bae02f44894d59 100644 --- a/IO/Exodus/Testing/Cxx/CMakeLists.txt +++ b/IO/Exodus/Testing/Cxx/CMakeLists.txt @@ -21,30 +21,3 @@ vtk_test_cxx_executable(vtkIOExodusCxxTests tests DISABLE_FLOATING_POINT_EXCEPTIONS RENDERING_FACTORY ) - -ExternalData_add_test(VTKData - NAME VTK::IOExodusCxx-Tetra15 - COMMAND vtkIOExodusCxxTests TestExodusTetra15 - -D ${_vtk_build_TEST_OUTPUT_DATA_DIRECTORY} - -V DATA{../Data/Baseline/TestExodusTetra15.png} - -T "${_vtk_build_TEST_OUTPUT_DIRECTORY}" - DATA{../../../../Testing/Data/tetra15.g} -) - -ExternalData_add_test(VTKData - NAME VTK::IOExodusCxx-Wedge18 - COMMAND vtkIOExodusCxxTests TestExodusWedge18 - -D ${_vtk_build_TEST_OUTPUT_DATA_DIRECTORY} - -V DATA{../Data/Baseline/TestExodusWedge18.png} - -T "${_vtk_build_TEST_OUTPUT_DIRECTORY}" - DATA{../../../../Testing/Data/wedge18.e} -) - -ExternalData_add_test(VTKData - NAME VTK::IOExodusCxx-Wedge21 - COMMAND vtkIOExodusCxxTests TestExodusWedge21 - -D ${_vtk_build_TEST_OUTPUT_DATA_DIRECTORY} - -V DATA{../Data/Baseline/TestExodusWedge21.png} - -T "${_vtk_build_TEST_OUTPUT_DIRECTORY}" - DATA{../../../../Testing/Data/wedge21.g} -) diff --git a/IO/Export/Testing/Cxx/vtkTestingSVG.cmake b/IO/Export/Testing/Cxx/vtkTestingSVG.cmake index 1edbf10dbb9a7e6e460f8baca6292a0268d31a34..c0b4e044dde381e70acf79e690d901b86a919674 100644 --- a/IO/Export/Testing/Cxx/vtkTestingSVG.cmake +++ b/IO/Export/Testing/Cxx/vtkTestingSVG.cmake @@ -12,6 +12,8 @@ function(vtk_add_svg_test) foreach(test ${tests}) string(REGEX REPLACE ",.*" "" testsrc "${test}") get_filename_component(TName ${testsrc} NAME_WE) + set(vtk_testing "VTK_TESTING=1;${image_compare_method}") + # Convert svg to png add_test(NAME ${_vtk_build_test}Cxx-${TName}-RasterizePNG @@ -27,6 +29,7 @@ function(vtk_add_svg_test) DEPENDS "${_vtk_build_test}Cxx-${TName}" REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}.svg" LABELS "${vtkIOExport_TEST_LABELS}" + ENVIRONMENT "${vtk_testing}" ) get_filename_component(TName ${test} NAME_WE) @@ -51,6 +54,7 @@ function(vtk_add_svg_test) DEPENDS "${_vtk_build_test}Cxx-${TName}-RasterizePNG" REQUIRED_FILES "${_vtk_build_TEST_OUTPUT_DIRECTORY}/${TName}-raster.png" LABELS "${_vtk_build_test_labels}" + ENVIRONMENT "${vtk_testing}" ) endforeach() endfunction() diff --git a/IO/GDAL/Testing/Data/Baseline/TestGDALRasterPalette.png.sha512 b/IO/GDAL/Testing/Data/Baseline/TestGDALRasterPalette.png.sha512 index 49e37f3bd204b080e28df70cadd5de9e6caadb4c..5b83e20fdd6f4bd0d1bdc74c4381b125043de9cb 100644 --- a/IO/GDAL/Testing/Data/Baseline/TestGDALRasterPalette.png.sha512 +++ b/IO/GDAL/Testing/Data/Baseline/TestGDALRasterPalette.png.sha512 @@ -1 +1 @@ -f4186a8562ff9b1ed20d0cbfe3a3a7ce3d595b39093c158bd6883fe7469bc12c6da6c1625f0883cfd6ec3298b28d815d1067afa41fd60bbef720de1fe5146f33 +e6b37e07860fe677bef5ff0b7c4b6e4ff0843a39abdb23a64d68c6d0056f06fcec2998ebefd48b6d7f951ebce85de729b0ab5d492de5cf5f4931c7515f99600a diff --git a/IO/Geometry/Testing/Data/Baseline/TestChacoReader_1.png.sha512 b/IO/Geometry/Testing/Data/Baseline/TestChacoReader_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..24a90f36b9df836fe31b6abca5e24b9f74cd48e3 --- /dev/null +++ b/IO/Geometry/Testing/Data/Baseline/TestChacoReader_1.png.sha512 @@ -0,0 +1 @@ +9fbbe89346759b895c182893299fc4b2a761a54b90722b0b2b021477fdf9a2acc35698a128965bc7006ac641b5bc0c54631bfc4ea521f8392be48656ba5913a0 diff --git a/IO/Import/Testing/Cxx/CMakeLists.txt b/IO/Import/Testing/Cxx/CMakeLists.txt index 72890a4fb59644ada5f5cced55ae7d5889b68a83..acac5170a0ce6d6d6111ed1ab0884f25fd9102ae 100644 --- a/IO/Import/Testing/Cxx/CMakeLists.txt +++ b/IO/Import/Testing/Cxx/CMakeLists.txt @@ -81,6 +81,7 @@ vtk_add_test_cxx(vtkIOImportCxxTests tests ) vtk_add_test_cxx(vtkIOImportCxxTests tests + LOOSE_VALID TestGLTFImporterPBR,TestGLTFImporter.cxx DATA{../Data/glTF/WaterBottle/WaterBottle.glb} -1 ) diff --git a/IO/MINC/Testing/Data/Baseline/TestMNITagPoints_1.png.sha512 b/IO/MINC/Testing/Data/Baseline/TestMNITagPoints_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..033beeed03a97b09a8604ff4c6a14cbfaeec2ba7 --- /dev/null +++ b/IO/MINC/Testing/Data/Baseline/TestMNITagPoints_1.png.sha512 @@ -0,0 +1 @@ +81b2fcf5cc2c8eefa42e4df794c113d11c153d1d4d33a69ed20363d45cb2b3ee6c31d123386382d01256a5208e74911b9401f3d601f85cf99f0fc4d82e026043 diff --git a/IO/MINC/Testing/Python/CMakeLists.txt b/IO/MINC/Testing/Python/CMakeLists.txt index 9592f8d1c3153977e224d46f5eccd567f4fcf6f8..6dd00f31d0c650b0a7c0ab36340ea3886e8b1f27 100644 --- a/IO/MINC/Testing/Python/CMakeLists.txt +++ b/IO/MINC/Testing/Python/CMakeLists.txt @@ -1,6 +1,6 @@ vtk_add_test_python( TestMNIObjects.py - TestMNITagPoints.py + TestMNITagPoints.py,LOOSE_VALID TestMNITransforms.py TestMINCImageReader.py TestMINCImageWriter.py diff --git a/IO/MINC/Testing/Python/TestMNITagPoints.py b/IO/MINC/Testing/Python/TestMNITagPoints.py index df0609e2457a3632dae29737aae48555b6ce244a..dd2fc2fc1bbf076c228de6327328db239f6585ed 100755 --- a/IO/MINC/Testing/Python/TestMNITagPoints.py +++ b/IO/MINC/Testing/Python/TestMNITagPoints.py @@ -147,6 +147,8 @@ try: renWin.SetSize(300, 300) + threshold = 0.06 + renWin.Render() try: os.remove(fname) diff --git a/IO/PLY/Testing/Data/Baseline/TestPLYReaderTextureUVFaces_1.png.sha512 b/IO/PLY/Testing/Data/Baseline/TestPLYReaderTextureUVFaces_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..bf4cad1cac0bccc90408968b73b0cd956d193021 --- /dev/null +++ b/IO/PLY/Testing/Data/Baseline/TestPLYReaderTextureUVFaces_1.png.sha512 @@ -0,0 +1 @@ +ca597ddd79a9ee342135960c53b6ef9f4394687bc84725afa83785fa43a8cc20ec1a5ca2ced9c5c8e4f13771e4787a574228965eb32e534045b4d3edb548e713 diff --git a/IO/SegY/Testing/Cxx/CMakeLists.txt b/IO/SegY/Testing/Cxx/CMakeLists.txt index 347aa0a2ecd606a98dd572c460478bf55c307830..f3b7aee00611856d21ed1f80dd7f6f4351d8b7a4 100644 --- a/IO/SegY/Testing/Cxx/CMakeLists.txt +++ b/IO/SegY/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ vtk_add_test_cxx(vtkIOSegYCxxTests tests TestSegY2DReader.cxx TestSegY2DReaderZoom.cxx - TestSegY3DReader.cxx +# TestSegY3DReader.cxx #19221 ) vtk_test_cxx_executable(vtkIOSegYCxxTests tests) diff --git a/Imaging/Core/Testing/Cxx/CMakeLists.txt b/Imaging/Core/Testing/Cxx/CMakeLists.txt index 39e96adfc7563df90bc598ac98f764fc31d22b13..bf23d4655ac644bf2b53488ee8676e6cdb009d51 100644 --- a/Imaging/Core/Testing/Cxx/CMakeLists.txt +++ b/Imaging/Core/Testing/Cxx/CMakeLists.txt @@ -42,18 +42,27 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} -D ${_vtk_build_TEST_OUTPUT_DATA_DIRECTORY} -T ${_vtk_build_TEST_OUTPUT_DIRECTORY} -V DATA{../Data/Baseline/TestAddStencilData.png,:}) +set_property(TEST VTK::ImagingCoreCxx-AddStencilData APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::ImagingCoreCxx-SubtractStencilData COMMAND vtkImagingCoreCxxTests TestImageStencilData 2 -D ${_vtk_build_TEST_OUTPUT_DATA_DIRECTORY} -T ${_vtk_build_TEST_OUTPUT_DIRECTORY} -V DATA{../Data/Baseline/TestSubtractStencilData.png,:}) +set_property(TEST VTK::ImagingCoreCxx-SubtractStencilData APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::ImagingCoreCxx-ClipStencilData COMMAND vtkImagingCoreCxxTests TestImageStencilData 3 -D ${_vtk_build_TEST_OUTPUT_DATA_DIRECTORY} -T ${_vtk_build_TEST_OUTPUT_DIRECTORY} -V DATA{../Data/Baseline/TestClipStencilData.png,:}) +set_property(TEST VTK::ImagingCoreCxx-ClipStencilData APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") vtk_test_cxx_executable(vtkImagingCoreCxxTests tests DISABLE_FLOATING_POINT_EXCEPTIONS diff --git a/Imaging/Core/Testing/Cxx/TestImageStencilData.cxx b/Imaging/Core/Testing/Cxx/TestImageStencilData.cxx index f77799854198f852cf58219d2f2af5caaa6e8f67..9e930e9ea51180c598f0a92f6315c476101b2d7f 100644 --- a/Imaging/Core/Testing/Cxx/TestImageStencilData.cxx +++ b/Imaging/Core/Testing/Cxx/TestImageStencilData.cxx @@ -192,7 +192,7 @@ int TestImageStencilData(int argc, char* argv[]) vtkSmartPointer<vtkTrivialProducer> producer = vtkSmartPointer<vtkTrivialProducer>::New(); producer->SetOutput(image); - int retval = testing->RegressionTest(producer, 10); + int retval = testing->RegressionTest(producer, 0.05); testing->Delete(); image->Delete(); diff --git a/Infovis/Core/Testing/CMakeLists.txt b/Infovis/Core/Testing/CMakeLists.txt index 432ff36f091e3d1487bbcd80bf5db82de4660646..4c2fa49bd2dfd6edeb9f9e0cb1e483c36344477a 100644 --- a/Infovis/Core/Testing/CMakeLists.txt +++ b/Infovis/Core/Testing/CMakeLists.txt @@ -3,6 +3,7 @@ vtk_module_test_data( Data/Infovis/merge1.csv Data/Infovis/merge2.csv Data/authors.csv - Data/cube.vtu) + Data/cube.vtu + Data/hearts8bit.png) add_subdirectory(Cxx) diff --git a/Infovis/Core/Testing/Cxx/CMakeLists.txt b/Infovis/Core/Testing/Cxx/CMakeLists.txt index 62df3966c7de242dc6349dc9471e2982b877ec1e..0c6392d4a477cfd7ddcda506a76e58cc6b593bc7 100644 --- a/Infovis/Core/Testing/Cxx/CMakeLists.txt +++ b/Infovis/Core/Testing/Cxx/CMakeLists.txt @@ -26,25 +26,10 @@ vtk_add_test_cxx(vtkInfovisCoreCxxTests tests TestTableToGraph.cxx TestThresholdTable.cxx,NO_VALID TestTreeDifferenceFilter.cxx,NO_VALID + TestWordCloud + UnitTestWordCloud ) -# add to the list but don't define a test -list(APPEND tests UnitTestWordCloud.cxx) -list(APPEND tests TestWordCloud.cxx) - -ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} - NAME VTK::InfovisCoreCxxTests-UnitTestWordCloud - COMMAND vtkInfovisCoreCxxTests UnitTestWordCloud - DATA{../../../../Testing/Data/Gettysburg.txt} DATA{../../../../Testing/Data/Canterbury.ttf} DATA{../../../../Testing/Data/hearts.png} DATA{../../../../Testing/Data/hearts8bit.png} DATA{../../../../Testing/Data/NLTKStopList.txt}) - -ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} - NAME VTK::InfovisCoreCxxTests-TestWordCloud - COMMAND vtkInfovisCoreCxxTests TestWordCloud - DATA{../../../../Testing/Data/Gettysburg.txt} DATA{../../../../Testing/Data/Canterbury.ttf} - -V DATA{../Data/Baseline/TestWordCloud.png,:} - -T "${_vtk_build_TEST_OUTPUT_DIRECTORY}" -) - set(all_tests ${tests} ${data_tests} diff --git a/Infovis/Core/Testing/Cxx/TestWordCloud.cxx b/Infovis/Core/Testing/Cxx/TestWordCloud.cxx index eaab4d380d73ad5719461d6f9a5b8ce51a8920bd..499e7b8ffa0d551dbcd7132ceb5c59bee18518c3 100644 --- a/Infovis/Core/Testing/Cxx/TestWordCloud.cxx +++ b/Infovis/Core/Testing/Cxx/TestWordCloud.cxx @@ -4,6 +4,7 @@ #include "vtkSmartPointer.h" #include "vtkWordCloud.h" +#include "vtkTestUtilities.h" #include <vtkCamera.h> #include <vtkImageViewer2.h> #include <vtkNamedColors.h> @@ -15,23 +16,21 @@ int TestWordCloud(int argc, char* argv[]) { - if (argc < 2) - { - std::cout << "Usage: " << argv[0] << "filename" << std::endl; - return EXIT_FAILURE; - } + const char* gettysburg = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/Gettysburg.txt"); + const char* canterbury = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/Canterbury.ttf"); + vtkWordCloud::OffsetDistributionContainer offset; offset[0] = 0; offset[1] = 0; auto wordCloud = vtkSmartPointer<vtkWordCloud>::New(); - wordCloud->SetFileName(argv[1]); + wordCloud->SetFileName(gettysburg); wordCloud->SetOffsetDistribution(offset); - wordCloud->SetFontFileName(argv[2]); + wordCloud->SetFontFileName(canterbury); wordCloud->AddOrientation(0.0); wordCloud->AddOrientation(90.0); wordCloud->Update(); - std::cout << "File" << argv[1] << std::endl; - std::cout << "Font" << argv[2] << std::endl; + std::cout << "File" << gettysburg << std::endl; + std::cout << "Font" << canterbury << std::endl; std::cout << "Kept Words: " << wordCloud->GetKeptWords().size() << std::endl; std::cout << "Stopped Words: " << wordCloud->GetStoppedWords().size() << std::endl; std::cout << "Skipped Words: " << wordCloud->GetSkippedWords().size() << std::endl; diff --git a/Infovis/Core/Testing/Cxx/UnitTestWordCloud.cxx b/Infovis/Core/Testing/Cxx/UnitTestWordCloud.cxx index 4d243c000a6b23c7814e2a972c696448803d8ca1..bc771e201516fa6eb3a1fec61fe77a24c50a1070 100644 --- a/Infovis/Core/Testing/Cxx/UnitTestWordCloud.cxx +++ b/Infovis/Core/Testing/Cxx/UnitTestWordCloud.cxx @@ -54,11 +54,11 @@ int UnitTestWordCloud(int argc, char* argv[]) } #endif - if (argc < 2) - { - std::cout << "Usage: " << argv[0] << "filename" << std::endl; - return EXIT_FAILURE; - } + const char* gettysburg = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/Gettysburg.txt"); + const char* canterbury = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/Canterbury.ttf"); + const char* hearts = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/hearts.png"); + const char* hearts8bit = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/hearts8bit.png"); + const char* nltk = vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/NLTKStopList.txt"); auto status = 0; @@ -72,7 +72,7 @@ int UnitTestWordCloud(int argc, char* argv[]) std::cout << "Passed" << std::endl; // Test defaults - wordCloud->SetFileName(argv[1]); + wordCloud->SetFileName(gettysburg); wordCloud->Update(); // Test Regressions for default settings @@ -196,7 +196,7 @@ int UnitTestWordCloud(int argc, char* argv[]) wordCloud->SetDPI(100); wordCloud->SetFontMultiplier(3); wordCloud->SetGap(5); - wordCloud->SetFontFileName(argv[2]); + wordCloud->SetFontFileName(canterbury); wordCloud->SetMaskColorName("white"); wordCloud->SetMaskFileName("maskfile"); wordCloud->SetMaxFontSize(100); @@ -212,10 +212,10 @@ int UnitTestWordCloud(int argc, char* argv[]) { auto wc = vtkSmartPointer<vtkWordCloud>::New(); - wc->SetFileName(argv[1]); + wc->SetFileName(gettysburg); status4 += TestOneByOne(wc, "Defaults", 31, 42, 65, -8); - wc->SetFontFileName(argv[2]); + wc->SetFontFileName(canterbury); status4 += TestOneByOne(wc, "FontFileName", 40, 33, 65); wc->SetGap(4); @@ -252,10 +252,10 @@ int UnitTestWordCloud(int argc, char* argv[]) wc->SetMaskColorName("white"); wc->SetFontMultiplier(2); wc->SetMaxFontSize(10); - wc->SetMaskFileName(argv[3]); + wc->SetMaskFileName(hearts); status4 += TestOneByOne(wc, "MaskFileName", 12, 60, 67); - wc->SetMaskFileName(argv[4]); + wc->SetMaskFileName(hearts8bit); wc->SetBWMask(true); status4 += TestOneByOne(wc, "MaskFileName(8bit)", 12, 60, 67); @@ -273,7 +273,7 @@ int UnitTestWordCloud(int argc, char* argv[]) wc->SetColorDistribution(colorDist); status4 += TestOneByOne(wc, "ColorDistribution", 12, 58, 68); - wc->SetStopListFileName(argv[5]); + wc->SetStopListFileName(nltk); status4 += TestOneByOne(wc, "StopListFileName", 18, 73, 47); } if (status4) @@ -295,7 +295,7 @@ int UnitTestWordCloud(int argc, char* argv[]) auto wc = vtkSmartPointer<vtkWordCloud>::New(); wc->AddObserver(vtkCommand::ErrorEvent, errorObserver); wc->GetExecutive()->AddObserver(vtkCommand::ErrorEvent, errorObserver1); - wc->SetFileName(argv[1]); + wc->SetFileName(gettysburg); wc->SetWordColorName(""); wc->SetColorSchemeName("foo"); wc->Update(); @@ -315,7 +315,7 @@ int UnitTestWordCloud(int argc, char* argv[]) auto wc = vtkSmartPointer<vtkWordCloud>::New(); wc->AddObserver(vtkCommand::ErrorEvent, errorObserver); wc->GetExecutive()->AddObserver(vtkCommand::ErrorEvent, errorObserver1); - wc->SetFileName(argv[1]); + wc->SetFileName(gettysburg); wc->SetFontFileName("BadFontFile.txt"); wc->Update(); status5 += errorObserver->CheckErrorMessage("FontFileName BadFontFile.txt does not exist"); @@ -325,7 +325,7 @@ int UnitTestWordCloud(int argc, char* argv[]) auto wc = vtkSmartPointer<vtkWordCloud>::New(); wc->AddObserver(vtkCommand::ErrorEvent, errorObserver); wc->GetExecutive()->AddObserver(vtkCommand::ErrorEvent, errorObserver1); - wc->SetFileName(argv[1]); + wc->SetFileName(gettysburg); wc->SetMaskFileName("BadMaskFile.txt"); wc->Update(); status5 += errorObserver->CheckErrorMessage("MaskFileName BadMaskFile.txt does not exist"); @@ -335,7 +335,7 @@ int UnitTestWordCloud(int argc, char* argv[]) auto wc = vtkSmartPointer<vtkWordCloud>::New(); wc->AddObserver(vtkCommand::ErrorEvent, errorObserver); wc->GetExecutive()->AddObserver(vtkCommand::ErrorEvent, errorObserver1); - wc->SetFileName(argv[1]); + wc->SetFileName(gettysburg); wc->SetMaskFileName("BadStopListFile.txt"); wc->Update(); status5 += errorObserver->CheckErrorMessage("BadStopListFile.txt does not exist"); diff --git a/Infovis/Layout/Testing/Data/Baseline/TestChacoGraphReader_1.png.sha512 b/Infovis/Layout/Testing/Data/Baseline/TestChacoGraphReader_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..6ca69de2b789a02e2683782bc9445527430ba91b --- /dev/null +++ b/Infovis/Layout/Testing/Data/Baseline/TestChacoGraphReader_1.png.sha512 @@ -0,0 +1 @@ +ab1900b539d7b6d64b800fec0b1a5ff0742a1f7fa3407459f40a59edb47c19eb3203294864c876667468c979dfe54fd90abcb728af2597229cb026fe10ac9f83 diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestResliceCursorWidget2_1.png.sha512 b/Interaction/Widgets/Testing/Data/Baseline/TestResliceCursorWidget2_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..d32fb3c9506a56e985db22dac4080248784f5681 --- /dev/null +++ b/Interaction/Widgets/Testing/Data/Baseline/TestResliceCursorWidget2_1.png.sha512 @@ -0,0 +1 @@ +9f21beff25f77426cfb898d53c3e9dbcc502317991a5fa1e97679f741d731ab239a0e30a122e551eaa49562c458432b1c76104bba2526aa465eb0fa97cf6639b diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_5.png.sha512 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_5.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..b48f2d094064cf0a9e64b62b0d2509d88d0fc7da --- /dev/null +++ b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidget2CenterCursor_5.png.sha512 @@ -0,0 +1 @@ +acd47267b7eee2bcd91dac860bd168483f284626176927a8341850760a364a0d0d67c077826e922f1e383a8c599808e458e15cf6d795300906e2ed801624c35e diff --git a/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidgetZoomInOut_1.png.sha512 b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidgetZoomInOut_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..ad91b10fde4a4657be57f80a97549efc0016e58e --- /dev/null +++ b/Interaction/Widgets/Testing/Data/Baseline/TestSphereWidgetZoomInOut_1.png.sha512 @@ -0,0 +1 @@ +099789ea8b228afed438bef4eafdda045ff4d0104da2cb124e89fdf0f00ae9a86cebf09b4df1e8c33b3fc0650adf9b9a7321e256e11e74942badb44f6abbeda7 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_2.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..e355d04222e2db575dbfaccfc4340f1792eb2728 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_2.png.sha512 @@ -0,0 +1 @@ +f95a97931442c0b5a82a587430d8e839de967edd19bcf04982c9e42ebe38a4098d54efba65d1aa16bede6cb27061429c447b22605cc29f77a2c240511584fdcb diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_3.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_3.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..a5e5ce0a757c4f7033c43572eca58baf40b5923a --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestBarChartActor_3.png.sha512 @@ -0,0 +1 @@ +471d9a03a22b9c18b6464d06b020fd591f4af39437e560e0d4840b73df4c2b0ba82b0ea98e2d9063196edb5f102091e2acb57a07cb532d3c2a22f31875c0aafd diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestCubeAxes2DMod_1.png b/Rendering/Annotation/Testing/Data/Baseline/TestCubeAxes2DMod_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c15963e5b495a8c5a1c36bdd53d9249f29103779 Binary files /dev/null and b/Rendering/Annotation/Testing/Data/Baseline/TestCubeAxes2DMod_1.png differ diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestCubeAxes2DMode_1.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestCubeAxes2DMode_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..83a6bbb91c131ca7ff9e71bab53e11720cc13ca0 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestCubeAxes2DMode_1.png.sha512 @@ -0,0 +1 @@ +66e1fe77174eba67a60fe0fa4544e2a7c27492c68f5c4d9713a8b02098572c8596f5a9a4cdf555e695f23d6cb825db34ae0924e868d5304676eb2e3aee4c749c diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestEmptyCornerAnnotation_1.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestEmptyCornerAnnotation_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..28329b9cc3c0ae9c658530858ee6a49e0ab23165 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestEmptyCornerAnnotation_1.png.sha512 @@ -0,0 +1 @@ +8452f507c4bc3664cd80585d374054d479482dc50f5242e46d14489dfe0480d9c628d7b6043df9c77b3ff4472b97d0133438dc734959ee5ca8aba0fdb477fd81 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_2.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..b58d381e13993d0d7adfce2151e963f967d4c673 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_2.png.sha512 @@ -0,0 +1 @@ +75c055d2a1e8dc6dc4255a26a54f2db22bcff35be2d5da9886db58bb87718db862cf446a7a917d2cbb4ec1a31fa8cfdd9a5ad92e882555ad91fad5c92bd0d5a1 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_3.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_3.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..78abb523d99c68879b928e6be163eb4aa2f709e8 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor2_3.png.sha512 @@ -0,0 +1 @@ +3701f092b15b40ef5c086936466c84b657a4a28128f908103f144811e29832f863acfd6dc2c19332ddd0dd6a2a92ef06b55fb69e219ec984c9bd990b9c51bb4e diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_2.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..0b52d3e8eb7e7abd589872bbd4c11329e210805c --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_2.png.sha512 @@ -0,0 +1 @@ +5c8d2827cc500134c2d25c31274c2af3ef88735ecec8a9a3468c936471d5c03e135d6711c03d88b0708bd9928f7d3cc93348ecfc8606708b77e199f4bde1cd95 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_3.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_3.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..86e1a1a1f719c31d64b7b42aae963337fa25ba76 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendBoxActor_3.png.sha512 @@ -0,0 +1 @@ +396c8ace1c688e1bdf3d07dc13d728cf47684ca5b5e5ec1b6d16617b70c8e22d7dfbe9b51e7e01632d75acbfdcb017b9f5a4b24bb0b7121d5b93b220763a4d45 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActorCustomLabels_1.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActorCustomLabels_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..54a47b96fb6ad6552a0294594af0efbf99d7e587 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActorCustomLabels_1.png.sha512 @@ -0,0 +1 @@ +2c60863903701dfb9e7b260a6ffc1edc5eae3c6c9b62e2996498a1efe492ba4faa25155fd3d2cd9f1e8f8ee5c813b1b4bfe8d23ff3e43a1d522388b98ac5c9d3 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActorDefault_1.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActorDefault_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..5591131b367f61bf96bd6774aeb92b269b774d18 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActorDefault_1.png.sha512 @@ -0,0 +1 @@ +04915b8f1edea57165cd94ab97548cf1b992546af6e29ea6a908251f7c63974c7736db87ddced391930f81f5ad518191f6437bac6a50dcc491ef7527900a0229 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActor_2.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActor_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..7b1e1d856f29242482fd4251e5b25d991d3e5807 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestLegendScaleActor_2.png.sha512 @@ -0,0 +1 @@ +6595a9a5093c8d95f06947ce3a747a98eeec459d96633f0e6bba9bff4dbb92f3a2c31416403c1436fbd2e86bcb2e7dfd43d632ffc8386a48188e6d8b4b03893e diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor.png.sha512 index 3b1f032b483957510ea29f6ba31d70561a4d04e3..cd0ba8918417a3b43f82f3ac67169ff3f1f135a7 100644 --- a/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor.png.sha512 +++ b/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor.png.sha512 @@ -1 +1 @@ -cf566c165d343a680a279f03000d18c47fb183cb70db96020a14678a3e4662f2c02f48f1dcfb0944d0d9fef8d97c320fbe2bf2d3f06c687217b6d8d0fc16d84f +4d2425838aa58fd07db99090b6be821c95d9c9a1ad93cd452bd492b63edf8781bc86feee2080d2bd8b5bfd4429c461926ec2bee40c1c22b3fe17ca494508299d diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor_1.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor_1.png.sha512 deleted file mode 100644 index 3a7d3720241515a24e277ca85dd84d145cc1480c..0000000000000000000000000000000000000000 --- a/Rendering/Annotation/Testing/Data/Baseline/TestPieChartActor_1.png.sha512 +++ /dev/null @@ -1 +0,0 @@ -ffb68b99479cec53f56d7137fbf1b37424249384ce1f591217cf14d373b96c79ffe9614b2a178e1c2b4f30db311278cf7e07c7aa369e8c3ed0cb243ec06f32a1 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_4.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_4.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..2814fafe398faeffb3a8e06efcdcdb178aca68cd --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/TestScalarBar_4.png.sha512 @@ -0,0 +1 @@ +c7e5c3a9a835c6fc4b8cb0bd7ce56e4a968764badb283a8357395de08b5dde9d6e83000a57babb2ec3f19d854daf141469a6495501781ba6860d94e2bb16e226 diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor.png.sha512 index 7de1fe9b9154dc4606947beb0bd0c41badc82b3d..3ac4bc03898598ab9ea433bcc6fd209457f1e4e5 100644 --- a/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor.png.sha512 +++ b/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor.png.sha512 @@ -1 +1 @@ -e55e3a2371233558e85e6fac6000c46c0b32ce4be193638a02d0425a2bf4e051b9d5b364c932b341d1bb40a30e98abc968cd60e3f0b3beddd389561ea982af07 +8ed36eac8af012973fe3c26c010d2dcdb590d21da2cc0bf5d7cc74d193e4ce994206c3e01e650a0c18a43790e812f57ff592e7607caf372cabf217439c35843b diff --git a/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor_1.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor_1.png.sha512 deleted file mode 100644 index 1b3e2e47cfc73a231356a1c728a68dc3bc1154d7..0000000000000000000000000000000000000000 --- a/Rendering/Annotation/Testing/Data/Baseline/TestSpiderPlotActor_1.png.sha512 +++ /dev/null @@ -1 +0,0 @@ -d541e1d1eddf393183b1d086896b0452842b4ebe15d492ebafb6446fab4f0fdf6c84cf61b50be1f92161d3db5adfc30164e632bd7780a993ce3c7a72a458e1cb diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_4.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_4.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..205e2060cfb470bf51fb11dadc4527fdf9a9dcb9 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_4.png.sha512 @@ -0,0 +1 @@ +2220d70ae896faf392b13a47e9afd017eb43f8aa6e2b1d2e6d0a875f774fe24e2972ca6521b38e7c0a64bafb2fa81df85c096e7081e9807831633602fee44a8f diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_5.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_5.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..7c35a545c50855f738607b98c15dd6ec8a7b0eb1 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot2_5.png.sha512 @@ -0,0 +1 @@ +a440adcdb2586e661bf877f80efc1c75dc3e910238002fe3300046d87de41dfe4140b037d0753f422ca180c51859b0ff91c4d69b3740794b86840931ec3b699b diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_4.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_4.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..205e2060cfb470bf51fb11dadc4527fdf9a9dcb9 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_4.png.sha512 @@ -0,0 +1 @@ +2220d70ae896faf392b13a47e9afd017eb43f8aa6e2b1d2e6d0a875f774fe24e2972ca6521b38e7c0a64bafb2fa81df85c096e7081e9807831633602fee44a8f diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_5.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_5.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..7c35a545c50855f738607b98c15dd6ec8a7b0eb1 --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot4_5.png.sha512 @@ -0,0 +1 @@ +a440adcdb2586e661bf877f80efc1c75dc3e910238002fe3300046d87de41dfe4140b037d0753f422ca180c51859b0ff91c4d69b3740794b86840931ec3b699b diff --git a/Rendering/Annotation/Testing/Data/Baseline/xyPlot_4.png.sha512 b/Rendering/Annotation/Testing/Data/Baseline/xyPlot_4.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..3631383c32a25279791628ec3c46a1a84a6cc30c --- /dev/null +++ b/Rendering/Annotation/Testing/Data/Baseline/xyPlot_4.png.sha512 @@ -0,0 +1 @@ +56aec91ad6d9915a7099d712d45fe0916fec770851f84def557f7e1803affb38af585b672d44c671b73eaba9906d2be916e7f1f0f08e321f92724bf9566cc948 diff --git a/Rendering/Annotation/Testing/Python/CMakeLists.txt b/Rendering/Annotation/Testing/Python/CMakeLists.txt index 48a7083ffb3536446c6d7e157b8bdc86a16dbf26..83917899ff91afd6037105fdf975ad7acf93232c 100644 --- a/Rendering/Annotation/Testing/Python/CMakeLists.txt +++ b/Rendering/Annotation/Testing/Python/CMakeLists.txt @@ -4,7 +4,7 @@ vtk_add_test_python( cubeAxes.py xyPlot.py xyPlot2.py - xyPlot3.py + xyPlot3.py,LOOSE_VALID xyPlot4.py cubeAxes2.py cubeAxes3.py diff --git a/Rendering/Core/Testing/Cxx/CMakeLists.txt b/Rendering/Core/Testing/Cxx/CMakeLists.txt index 7f265da2350904803cab5fc6f0fc0b7fcdceb072..283b3b2d74e8dc3bb78d27c8c9e0c789dedb49aa 100644 --- a/Rendering/Core/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Core/Testing/Cxx/CMakeLists.txt @@ -15,7 +15,7 @@ vtk_add_test_cxx(vtkRenderingCoreCxxTests tests otherLookupTableWithEnabling.cxx,NO_VALID RenderNonFinite.cxx RGrid.cxx - SurfacePlusEdges.cxx +# SurfacePlusEdges.cxx #19221 TestActor2D.cxx TestActor2DTextures.cxx TestActorLightingFlag.cxx @@ -48,7 +48,7 @@ vtk_add_test_cxx(vtkRenderingCoreCxxTests tests TestCompositePolyDataMapperPickability.cxx,NO_DATA TestCompositePolyDataMapperPicking.cxx,NO_DATA TestCompositePolyDataMapperScalars.cxx,NO_DATA - TestCompositePolyDataMapperScalarsSurfaceOpacity.cxx,NO_DATA +# TestCompositePolyDataMapperScalarsSurfaceOpacity.cxx,NO_DATA #19221 TestCompositePolyDataMapperSharedArray.cxx,NO_DATA TestCompositePolyDataMapperStaticBounds.cxx,NO_DATA,NO_VALID TestCompositePolyDataMapperSpheres.cxx,NO_DATA diff --git a/Rendering/Core/Testing/Data/Baseline/TestGlyph3DMapperArrow_1.png.sha512 b/Rendering/Core/Testing/Data/Baseline/TestGlyph3DMapperArrow_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..a2dde93de97f011826dc4d681ae49d0ba5aa7bbb --- /dev/null +++ b/Rendering/Core/Testing/Data/Baseline/TestGlyph3DMapperArrow_1.png.sha512 @@ -0,0 +1 @@ +53cfec1bf048806532668231e3e637d84c1355df7f52ad3ec81a8ee8344ad592092b7930666287e3b52537dc680d5ed0c40353886421e3a801f346073034988a diff --git a/Rendering/Core/Testing/Data/Baseline/TestParallelCoordinates_3.png.sha512 b/Rendering/Core/Testing/Data/Baseline/TestParallelCoordinates_3.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..3ada29116e6b4af8a1902faef9e93b59e0c346ef --- /dev/null +++ b/Rendering/Core/Testing/Data/Baseline/TestParallelCoordinates_3.png.sha512 @@ -0,0 +1 @@ +f02a50711dce082ed5c51559c8c40afce6357a3080fa806c08a9b8e4c9aa35edc83535c154bbdcd672c6a8ca914d23a603f695bf78cbb3327458db955e112874 diff --git a/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateSystems_1.png.sha512 b/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateSystems_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..eb52b60df59292c7a9d9b6d90777de62aed00cf5 --- /dev/null +++ b/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateSystems_1.png.sha512 @@ -0,0 +1 @@ +d28b592d4768a6ce709c5c947b0aeceffd65b08f2a304a00e7346d439f3dcad141b7b00f0428c2ce001fb30238be8978453cbabf943a36e05bab061bfb78263e diff --git a/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateSystems_2.png.sha512 b/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateSystems_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..93e0fb125c9b91c0f62924e60fd83a2dc75abf65 --- /dev/null +++ b/Rendering/Core/Testing/Data/Baseline/TestTransformCoordinateSystems_2.png.sha512 @@ -0,0 +1 @@ +7b62c06318bff46a768584f0e300d8b49f7aa64392cf8787d29973914b803235e89e58a73e9fadb12cb96574541bac71b6e23501c434daca7910090a534eb13b diff --git a/Rendering/Core/Testing/Data/Baseline/TestTranslucentLUTAlphaBlending.png.sha512 b/Rendering/Core/Testing/Data/Baseline/TestTranslucentLUTAlphaBlending.png.sha512 index ae3151413c935c5cb5aa794f113fdf0a0bbfea01..651f465902970ae40dd124087e4abab2168cfa87 100644 --- a/Rendering/Core/Testing/Data/Baseline/TestTranslucentLUTAlphaBlending.png.sha512 +++ b/Rendering/Core/Testing/Data/Baseline/TestTranslucentLUTAlphaBlending.png.sha512 @@ -1 +1 @@ -fdd5b730f450e96c89cf3114d9ff320c38280c0d0ad0d9c8f8505777c57a9636d8bc675a375ab507c0a6680fd1f4fd99e43f6361ef6ef8b1aa87c02e1789b0c3 +d5203a4f9cb833e30046022e4128950a6d66015973ae491a1814ad5cded6e9e06b4f1592da133bd2bcfa57f734c21f55acc497e32e1215cc167308bf8193e242 diff --git a/Rendering/Core/Testing/Data/Baseline/TestTranslucentLUTTextureAlphaBlending.png.sha512 b/Rendering/Core/Testing/Data/Baseline/TestTranslucentLUTTextureAlphaBlending.png.sha512 index e5e67fcdf743ea2ae50008f7763a9036fbcdea09..35417ac05aef96cb5ff0d57eb8751c3c923c9edd 100644 --- a/Rendering/Core/Testing/Data/Baseline/TestTranslucentLUTTextureAlphaBlending.png.sha512 +++ b/Rendering/Core/Testing/Data/Baseline/TestTranslucentLUTTextureAlphaBlending.png.sha512 @@ -1 +1 @@ -fb93b1237772b9550683ffcf50822c3f2bdcf141e20ad1033334a4baf242e41cb071bb0578add41a4db36e868f6d8a7a4fd878f1f778cd12b969347691e8fa89 +7c82d5227a78c0f84c70639838b1aaa2e1ead306637700e19d0bdaa0c88c30d496085fe30da0ed2f9953eeee05df7252fda2aa41514bc151c152403b328c05cf diff --git a/Rendering/Core/Testing/Data/Baseline/rotations_1.png.sha512 b/Rendering/Core/Testing/Data/Baseline/rotations_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..f9315858e60ab82b1d771280d389bdbecf125a45 --- /dev/null +++ b/Rendering/Core/Testing/Data/Baseline/rotations_1.png.sha512 @@ -0,0 +1 @@ +bb639b34f207396f3776983da68b0c7ac1fab747887836055b90ee0e8550252ac3c6a250836ee0543b581aaee6e27f32f4a75bdfea5ee0b868d03589993ff0e8 diff --git a/Rendering/External/Testing/Cxx/TestGLUTRenderWindow.cxx b/Rendering/External/Testing/Cxx/TestGLUTRenderWindow.cxx index 2c139885002ade2de612672748f757ab480a3c60..66e26e7e32a9e52396f9cdbc10be2108f76b29e1 100644 --- a/Rendering/External/Testing/Cxx/TestGLUTRenderWindow.cxx +++ b/Rendering/External/Testing/Cxx/TestGLUTRenderWindow.cxx @@ -148,7 +148,7 @@ void test() t->SetRenderWindow(externalVTKWidget->GetRenderWindow()); if (!tested) { - retVal = t->RegressionTest(0); + retVal = t->RegressionTest(0.05); tested = true; } t->Delete(); diff --git a/Rendering/FreeType/Testing/Cxx/CMakeLists.txt b/Rendering/FreeType/Testing/Cxx/CMakeLists.txt index 5393a0d44941be63afea2ac7364c772fda774319..3c134092ea3cfa5ccd57f52e5fac7f9bca3a4fcc 100644 --- a/Rendering/FreeType/Testing/Cxx/CMakeLists.txt +++ b/Rendering/FreeType/Testing/Cxx/CMakeLists.txt @@ -13,7 +13,7 @@ vtk_add_test_cxx(vtkRenderingFreeTypeCxxTests tests TestTextActor.cxx TestTextActorTileScaling.cxx TestTextActor3D.cxx - TestTextActorAlphaBlending.cxx + TestTextActorAlphaBlending.cxx, LOOSE_VALID TestTextActorDepthPeeling.cxx TestTextActor3DAlphaBlending.cxx TestTextActor3DDepthPeeling.cxx diff --git a/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending_2.png.sha512 b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..9f853c2aaefe43149f99864ed57dc4c0e57ede14 --- /dev/null +++ b/Rendering/FreeType/Testing/Data/Baseline/TestTextActor3DAlphaBlending_2.png.sha512 @@ -0,0 +1 @@ +0007b123cc4b5e58483ffc25335757e59806d674b40c2ecaf3cfb1f4919483c68f4ad7a17ceeeb07bb4884dc170ce6f1991b667cc405a2252fc16e2d35010eb1 diff --git a/Rendering/FreeType/Testing/Data/Baseline/multiLineText_3.png.sha512 b/Rendering/FreeType/Testing/Data/Baseline/multiLineText_3.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..4140d08524eb7a84d307dfd868542a9dee413704 --- /dev/null +++ b/Rendering/FreeType/Testing/Data/Baseline/multiLineText_3.png.sha512 @@ -0,0 +1 @@ +0519b4f3831e112ea0faa10f7d5d7ead3b36c052a851224c9d4e754ba7106bb5cc0a61d1fac9e8e0e6e84a776c17cd88c24778b55f6cd78735d8c7ae23273153 diff --git a/Rendering/FreeType/Testing/Data/Baseline/text_1.png.sha512 b/Rendering/FreeType/Testing/Data/Baseline/text_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..d34e52c285941ea4dc56a821f891cee6bb174eca --- /dev/null +++ b/Rendering/FreeType/Testing/Data/Baseline/text_1.png.sha512 @@ -0,0 +1 @@ +2d87354f2d2861a7984cbbed000a5f304cbcde5ab7e80305fd8bc3693cfa8b7469f3f0a7b0a84e4e49e2d2718d3fc551948f15956a8a1855d6ab820e9658c3ee diff --git a/Rendering/FreeType/Testing/Python/CMakeLists.txt b/Rendering/FreeType/Testing/Python/CMakeLists.txt index e148920d0cb260358c035bc1b072825f3ae21ea5..8a08ac57808aaeba18a9478859b69588691ba289 100644 --- a/Rendering/FreeType/Testing/Python/CMakeLists.txt +++ b/Rendering/FreeType/Testing/Python/CMakeLists.txt @@ -1,5 +1,5 @@ vtk_add_test_python( OverlayTextOnImage.py multiLineText.py - text.py + text.py, LOOSE_VALID ) diff --git a/Rendering/Image/Testing/Data/Baseline/TestDepthImageToPointCloud-TwoInputs.png.sha512 b/Rendering/Image/Testing/Data/Baseline/TestDepthImageToPointCloud-TwoInputs.png.sha512 index ca2b5f3ce0855452cc4625c3c6b6408f89c1f699..bde05be062b8a3fe4aa53aebb4bfd3cb5571223c 100644 --- a/Rendering/Image/Testing/Data/Baseline/TestDepthImageToPointCloud-TwoInputs.png.sha512 +++ b/Rendering/Image/Testing/Data/Baseline/TestDepthImageToPointCloud-TwoInputs.png.sha512 @@ -1 +1 @@ -09732f9f433dd2912e2274f53f5b6fee9fbfcf50a9dddd19386ff5a3976c40cd1ebc3aeeb927bc626805e79a06082a0abf964ebfe40de2ae62c1da04482b5afc +1cd5c8a0ac3d675765cc6fd2d62cefd05ea0d4d75c3b77aacc26c8d08a1d882efc46efc0741ef6631b6523309fe06954ca0940baab700d21765e05376821b576 diff --git a/Rendering/LICOpenGL2/Testing/Cxx/CMakeLists.txt b/Rendering/LICOpenGL2/Testing/Cxx/CMakeLists.txt index 2a8abb9839b82a5fe013e3687cba7fd89b2ef2d6..06aaddf9f960d6a4739183aa0bfbcf5b5c3fec97 100644 --- a/Rendering/LICOpenGL2/Testing/Cxx/CMakeLists.txt +++ b/Rendering/LICOpenGL2/Testing/Cxx/CMakeLists.txt @@ -35,6 +35,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --data=DATA{${_vtk_build_TEST_INPUT_DATA_DIRECTORY}/Data/disk_out_ref_surface.vtp} --vectors=V ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaults APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlended COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -49,6 +52,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --enhance-contrast=1 --lic-intensity=0.8 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlended APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMapped COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -63,6 +69,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --enhance-contrast=4 --color-mode=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMapped APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -78,6 +87,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --enhance-contrast=1 --color-mode=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -97,6 +109,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --enhance-contrast=1 --lic-intensity=0.8 ) + set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -115,6 +130,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --enhance-contrast=4 --color-mode=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -135,6 +153,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --low-lic-contrast-enhancement-factor=0.05 --color-mode=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaultsColor COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -148,6 +169,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --vectors=V --color-by-mag=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaultsColor APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -168,6 +192,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --color-by-mag=1 --lic-intensity=0.6 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -187,6 +214,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --color-by-mag=1 --color-mode=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -209,6 +239,10 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --mask-intensity=0.2 --mask-color 1.0 1.0 1.0 ) +set_property(TEST + VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -232,6 +266,10 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --mask-intensity=0.2 --mask-color 1.0 1.0 1.0 ) +set_property(TEST + VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -254,6 +292,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --map-mode-bias=0.05 --mask-intensity=0.2 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") # surface lic on a slice ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarDefaults @@ -268,6 +309,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --num-steps=40 --lic-intensity=0.8 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarDefaults APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarContrastEnhanced COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -282,6 +326,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --enhance-contrast=1 --color-mode=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarContrastEnhanced APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOff COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -303,6 +350,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --color-by-mag=1 --color-mode=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOff APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -325,6 +375,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --color-by-mag=1 --color-mode=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} NAME VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC @@ -347,6 +400,9 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --color-mode=1 --anti-alias=1 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") vtk_module_test_data( Data/ex-blow_5/,REGEX:.*) @@ -376,3 +432,6 @@ ExternalData_add_test(${_vtk_build_TEST_DATA_TARGET} --mask-intensity=0.41 --mask-color 0 0 0 ) +set_property(TEST VTK::RenderingLICOpenGL2Cxx-SurfaceLICMultiBlockContrastEnhancedPerlin APPEND + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") diff --git a/Rendering/LICOpenGL2/Testing/Cxx/TestImageDataLIC2D.cxx b/Rendering/LICOpenGL2/Testing/Cxx/TestImageDataLIC2D.cxx index 0319619cd0d29d19421cf6090d387043bd3bcfa6..ee73d393cfd5e5486e698b46ac8a9d56c0b7fb35 100644 --- a/Rendering/LICOpenGL2/Testing/Cxx/TestImageDataLIC2D.cxx +++ b/Rendering/LICOpenGL2/Testing/Cxx/TestImageDataLIC2D.cxx @@ -353,7 +353,7 @@ int ImageDataLIC2D(int argc, char* argv[]) vtkSmartPointer<vtkTrivialProducer> tp = vtkSmartPointer<vtkTrivialProducer>::New(); tp->SetOutput(pngDataSet); - int retVal = (tester->RegressionTest(tp, 10) == vtkTesting::PASSED) ? 0 : -4; + int retVal = (tester->RegressionTest(tp, 0.05) == vtkTesting::PASSED) ? 0 : -4; if (retVal) { cerr << "ERROR: test failed." << endl; diff --git a/Rendering/LICOpenGL2/Testing/Cxx/vtkStructuredGridLIC2DTestDriver.cxx b/Rendering/LICOpenGL2/Testing/Cxx/vtkStructuredGridLIC2DTestDriver.cxx index 959c7f3653185763e6f9f426ad35c6925b052f1d..7db4a69c08046ea876a3c0911eaf972dc8a022f6 100644 --- a/Rendering/LICOpenGL2/Testing/Cxx/vtkStructuredGridLIC2DTestDriver.cxx +++ b/Rendering/LICOpenGL2/Testing/Cxx/vtkStructuredGridLIC2DTestDriver.cxx @@ -290,7 +290,7 @@ int vtkStructuredGridLIC2DTestDriver(int argc, char* argv[]) renWin->Render(); int reply = - (!tester->IsValidImageSpecified() || (tester->RegressionTest(10) == vtkTesting::PASSED)) + (!tester->IsValidImageSpecified() || (tester->RegressionTest(0.05) == vtkTesting::PASSED)) ? /*success*/ 0 : /*failure*/ 1; diff --git a/Rendering/LICOpenGL2/Testing/Data/Baseline/TestStructuredGridLIC2DXSlice_2.png.sha512 b/Rendering/LICOpenGL2/Testing/Data/Baseline/TestStructuredGridLIC2DXSlice_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..5b0f043d7cde88f0a8889d06a8a2c1fa1dd01691 --- /dev/null +++ b/Rendering/LICOpenGL2/Testing/Data/Baseline/TestStructuredGridLIC2DXSlice_2.png.sha512 @@ -0,0 +1 @@ +5cead9042512fbc461823db989e798feb7f51949a9f8412ea9be8fc0897d4c3f2c81b0d347342fed23860a85e1d984c1b69160c1e36dc93796dd30319469d0ca diff --git a/Rendering/Label/Testing/Cxx/CMakeLists.txt b/Rendering/Label/Testing/Cxx/CMakeLists.txt index 95c84f8b1b2f073a59ed4886112b5a8e97336e2c..88a0a8b22be6caf65e29ef0f7b2481510af37e20 100644 --- a/Rendering/Label/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Label/Testing/Cxx/CMakeLists.txt @@ -3,7 +3,7 @@ vtk_add_test_cxx(vtkRenderingLabelCxxTests tests TestDynamic2DLabelMapper.cxx TestLabelPlacer.cxx TestLabelPlacer2D.cxx - TestLabelPlacerCoincidentPoints.cxx + TestLabelPlacerCoincidentPoints.cxx, LOOSE_VALID TestLabelPlacementMapper.cxx TestLabelPlacementMapper2D.cxx TestLabelPlacementMapperCoincidentPoints.cxx diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.sha512 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..26ce3e5ddecebd2fe027b1189eaad02a0decb911 --- /dev/null +++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapper2D_1.png.sha512 @@ -0,0 +1 @@ +cb7b930cbf70f8d20981b86742bd192f5470af8f733d66e1bbd26b05b51d5b7cc36fc81eaabde12ba2b16c6bec6af06c719052ab013d8e88252c6699cfaa9bc4 diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapperCoincidentPoints_1.png.sha512 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapperCoincidentPoints_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..d9d92574b8b4b004aa27d019a7fc1e1d304aa88b --- /dev/null +++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacementMapperCoincidentPoints_1.png.sha512 @@ -0,0 +1 @@ +b851fceaf9db404793e253d853889ae155abe240cc78b744deb53cc42dccff5baa98f0b081f9c9ae465c93c7c8ed8ac322b1f28793ac4ad1213b1d401ae57b28 diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_2.png.sha512 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..cffb477d03d8675d1b3cdb3eb892133c2ab944ca --- /dev/null +++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer2D_2.png.sha512 @@ -0,0 +1 @@ +6f053bb84356d403da51111e3fd55a5e9de5c26304af07ecf4a5536ed688248f970d1c1075ef52f9bde61543a7aa4aa5514499180c0b27c2876d37fa2c044eed diff --git a/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer_2.png.sha512 b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer_2.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..08df084e4aabe9b81e457ff39d4b5cff77ce9180 --- /dev/null +++ b/Rendering/Label/Testing/Data/Baseline/TestLabelPlacer_2.png.sha512 @@ -0,0 +1 @@ +50e48087a48c3bddd3c58df9cf6659df52cf90a25cb2083e75f783d3ffb33e2bc543369d45494c9071c2a4835e3417b0d2d4b6570341b892e3a415bfde483471 diff --git a/Rendering/Matplotlib/Testing/Cxx/TestScalarBarCombinatorics.cxx b/Rendering/Matplotlib/Testing/Cxx/TestScalarBarCombinatorics.cxx index e90e7edb10dd7fd91273a150ee67bf935e4e8876..e02d9936a68e8845cdb5b9d429de65b537d9f61f 100644 --- a/Rendering/Matplotlib/Testing/Cxx/TestScalarBarCombinatorics.cxx +++ b/Rendering/Matplotlib/Testing/Cxx/TestScalarBarCombinatorics.cxx @@ -80,7 +80,7 @@ static vtkSmartPointer<vtkScalarBarActor> CreateScalarBar(vtkScalarBarTestCondit int TestScalarBarCombinatorics(int argc, char* argv[]) { vtkTesting* t = vtkTesting::New(); - double threshold = 10.; + double threshold = 0.05; for (int cc = 1; cc < argc; ++cc) { if ((cc < argc - 1) && (argv[cc][0] == '-') && (argv[cc][1] == 'E')) diff --git a/Rendering/OpenGL2/Testing/Cxx/CMakeLists.txt b/Rendering/OpenGL2/Testing/Cxx/CMakeLists.txt index 4bcc999dc84efc071807c5b91ca7fd4f0a806a44..df7e2c1b3f3edcc477db73ca443c405480f95df1 100644 --- a/Rendering/OpenGL2/Testing/Cxx/CMakeLists.txt +++ b/Rendering/OpenGL2/Testing/Cxx/CMakeLists.txt @@ -22,7 +22,7 @@ vtk_add_test_cxx(vtkRenderingOpenGL2CxxTests tests TestCompositePolyDataMapper2Pickability.cxx,NO_DATA TestCompositePolyDataMapper2Picking.cxx,NO_DATA TestCompositePolyDataMapper2Scalars.cxx,NO_DATA - TestCompositePolyDataMapper2ScalarsSurfaceOpacity.cxx,NO_DATA +# TestCompositePolyDataMapper2ScalarsSurfaceOpacity.cxx,NO_DATA #19221 TestCompositePolyDataMapper2SharedArray.cxx,NO_DATA TestCompositePolyDataMapper2Spheres.cxx,NO_DATA TestCompositePolyDataMapper2Vertices.cxx,NO_DATA @@ -41,7 +41,7 @@ vtk_add_test_cxx(vtkRenderingOpenGL2CxxTests tests TestFXAAPass.cxx TestFXAAWithEDLPass.cxx TestFlipRenderFramebuffer.cxx - TestFloor.cxx + TestFloor.cxx, LOOSE_VALID TestFluidMapper.cxx TestFramebufferHDR.cxx TestFramebufferPass.cxx diff --git a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx index 7dc6e2d3d0dffaa74c08314db500dfe433e4c0f9..16e1f1ddc22f2c284d27e79131099c08137ad418 100644 --- a/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx +++ b/Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx @@ -404,6 +404,7 @@ vtkOpenGLRenderWindow::vtkOpenGLRenderWindow() this->MultiSamples = vtksys::SystemTools::HasEnv("VTK_TESTING") ? 0 : vtkOpenGLRenderWindowGlobalMaximumNumberOfMultiSamples; + std::cout << "Multi " << this->MultiSamples << std::endl; delete[] this->WindowName; this->WindowName = new char[strlen(defaultWindowName) + 1]; diff --git a/Rendering/Parallel/Testing/Cxx/CMakeLists.txt b/Rendering/Parallel/Testing/Cxx/CMakeLists.txt index d150e79af42f0d1883beb3d8d7f635bce8d61a49..6136acc81e9b698d96c1e07fbe39d163c8810fb4 100644 --- a/Rendering/Parallel/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Parallel/Testing/Cxx/CMakeLists.txt @@ -36,5 +36,8 @@ if (PYTHON_EXECUTABLE) -D ${_vtk_build_TEST_OUTPUT_DATA_DIRECTORY} -T ${_vtk_build_TEST_OUTPUT_DIRECTORY} -V "DATA{../Data/Baseline/TestClientServerRendering.png,:}" + set_property(TEST vtkRenderingParallel-TestClientServerRendering + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") ) endif() diff --git a/Rendering/Parallel/Testing/Cxx/TestSimplePCompositeZPass.cxx b/Rendering/Parallel/Testing/Cxx/TestSimplePCompositeZPass.cxx index 9a58e8935f0d975aa039b9e44916772b2cbf8272..479ae461b297e66a3d17e5d4191aa49a2280b042 100644 --- a/Rendering/Parallel/Testing/Cxx/TestSimplePCompositeZPass.cxx +++ b/Rendering/Parallel/Testing/Cxx/TestSimplePCompositeZPass.cxx @@ -302,7 +302,7 @@ void MyProcess::Execute() camera->Elevation(10.0); renderer->ResetCamera(); // testing code - double thresh = 10; + double thresh = 0.05; int i; VTK_CREATE(vtkTesting, testing); for (i = 0; i < this->Argc; ++i) diff --git a/Rendering/PythonContext2D/Testing/Data/Baseline/testPythonItem.png.sha512 b/Rendering/PythonContext2D/Testing/Data/Baseline/testPythonItem.png.sha512 index 5c8501f419568c8e7a05c287559e8d1c12a0c855..aff9331f1f438fbccc49202a02fc284da3bf444b 100644 --- a/Rendering/PythonContext2D/Testing/Data/Baseline/testPythonItem.png.sha512 +++ b/Rendering/PythonContext2D/Testing/Data/Baseline/testPythonItem.png.sha512 @@ -1 +1 @@ -69efe0b7307942844762db383e8752beca8041a28f408c57778bd06569b3febb8973f1dc41d6ceb02555465f417405516f4406a1221d3d906eaf15962ee293cc +4b784b5c95b7243149c16586bcaf8d9f57ae51c7ee8c6459b4a56d5d394907cb3ed7269ec60ac13b9878ffa0e841e69375936553ca3d098171c8458223b33da3 diff --git a/Rendering/PythonContext2D/Testing/Python/testPythonItem.py b/Rendering/PythonContext2D/Testing/Python/testPythonItem.py index b2d8fc6ea9e3bdb9c5493cb55da05e28694fd6ff..894066f70ede603e8cd20d813fc6c2c2d8964d57 100644 --- a/Rendering/PythonContext2D/Testing/Python/testPythonItem.py +++ b/Rendering/PythonContext2D/Testing/Python/testPythonItem.py @@ -167,7 +167,7 @@ class TestPythonItem(Testing.vtkTest): rtTester.AddArgument(arg) # Perform the image comparison test and print out the result. - result = rtTester.RegressionTest(0.0) + result = rtTester.RegressionTest(0.05) if result == 0: raise Exception("TestPythonItem failed.") diff --git a/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt b/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt index 87033ff51b7631ce556aeef42b94430d467a0549..d52734ef64c6a1f7d180c17fb8696a31d23f5ceb 100644 --- a/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt +++ b/Rendering/RayTracing/Testing/Cxx/CMakeLists.txt @@ -2,7 +2,7 @@ if (VTK_ENABLE_OSPRAY) vtk_add_test_cxx(vtkRenderingRayTracingCxxTests tests # Surface rendering tests TestOSPRayAmbient.cxx - TestOSPRayAMRVolumeRenderer.cxx +# TestOSPRayAMRVolumeRenderer.cxx #19221 TestOSPRayCompositePolyDataMapper2.cxx TestOSPRayDepthOfField.cxx TestOSPRayDynamicObject.cxx @@ -12,7 +12,7 @@ if (VTK_ENABLE_OSPRAY) TestOSPRayLayers.cxx TestOSPRayLights.cxx TestOSPRayMultiBlock.cxx - TestOSPRayMultiBlockPartialArrayFieldData.cxx +# TestOSPRayMultiBlockPartialArrayFieldData.cxx #19221 TestOSPRayOrthographic.cxx TestOSPRayPass.cxx TestOSPRayPointGaussianMapper.cxx @@ -38,9 +38,9 @@ if (VTK_ENABLE_OSPRAY) TestGPURayCastVolumeScale.cxx TestGPURayCastVolumeUpdate.cxx TestGPUVolumeRayCastMapper.cxx - TestOSPRayVolumeRenderer.cxx +# TestOSPRayVolumeRenderer.cxx #19221 TestOSPRayVolumeRendererCrop.cxx - TestSmartVolumeMapper.cxx +# TestSmartVolumeMapper.cxx #19221 # Path tracer tests TestCategoricalMaterials.cxx TestCategoricalMultiBlock.cxx @@ -75,7 +75,7 @@ if (VTK_ENABLE_VISRTX) TestOSPRayLayers TestOSPRayLights TestOSPRayMultiBlock - TestOSPRayMultiBlockPartialArrayFieldData +# TestOSPRayMultiBlockPartialArrayFieldData #19221 TestOSPRayOrthographic TestOSPRayPass TestOSPRayRenderMesh diff --git a/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastCellData.png.sha512 b/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastCellData.png.sha512 index 5817f549978f73550b73d386d2acf0dfb0028148..6797b5ba070fe928d63e7c8913f682fa95abf6da 100644 --- a/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastCellData.png.sha512 +++ b/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastCellData.png.sha512 @@ -1 +1 @@ -9ccdf63fd5e1efdc22056f0fdafd6d6bc2c870ba4f8c181705099dc75f044be37f9740f0a081c8479d9012208bfd7c876770b5cd7b91430048f5f8ae7ca69547 +e5739174a824f7ae86983194d1a9e4528d92cca7c44b9115d4f42162a232cac84383a84e7598d6e270dafb237ff1d9a4ee19b147d55cfbf979d418f305caa7bd diff --git a/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastVolumePolyData_1.png.sha512 b/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastVolumePolyData_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..b55c65968b35259ab3e5c843e50ba524638e6e6b --- /dev/null +++ b/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastVolumePolyData_1.png.sha512 @@ -0,0 +1 @@ +8d72ffee1bdd692bfffeabeaa1ae412bb2ebaea48832a8b91d3c38e7c87e88655bf4e635c17c405fcb94483ccc40d622e9633400459b64efecda713f80461331 diff --git a/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastVolumeScale_1.png.sha512 b/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastVolumeScale_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..6203498651e901c0a8d7ec21cdaa64d6250c8f14 --- /dev/null +++ b/Rendering/RayTracing/Testing/Data/Baseline/TestGPURayCastVolumeScale_1.png.sha512 @@ -0,0 +1 @@ +2eda37488d5c06136ce4cdc8748a2c6b20990aa2c23baf86ff79f50b7ec9264a440e285dfbb521c3e4555263604f7da1e96293092e44141fb55e706b4f2a900d diff --git a/Rendering/RayTracing/Testing/Data/Baseline/TestOSPRayPointGaussianMapper_1.png.sha512 b/Rendering/RayTracing/Testing/Data/Baseline/TestOSPRayPointGaussianMapper_1.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..c99725f049a66779df9105f6791cff7ec387de8b --- /dev/null +++ b/Rendering/RayTracing/Testing/Data/Baseline/TestOSPRayPointGaussianMapper_1.png.sha512 @@ -0,0 +1 @@ +ea59a0e9159070b4dc9412291e1521474356cf022ed42554a9ad4e390b828cb915301e0553db5f7b9c11483a32a116c9cacfc6dfddbda1b7f8a4a8c7a10c4b07 diff --git a/Common/DataModel/Testing/Data/cell_12851_26.vtu.sha512 b/Testing/Data/cell_12851_26.vtu.sha512 similarity index 100% rename from Common/DataModel/Testing/Data/cell_12851_26.vtu.sha512 rename to Testing/Data/cell_12851_26.vtu.sha512 diff --git a/Common/DataModel/Testing/Data/cell_850113.vtu.sha512 b/Testing/Data/cell_850113.vtu.sha512 similarity index 100% rename from Common/DataModel/Testing/Data/cell_850113.vtu.sha512 rename to Testing/Data/cell_850113.vtu.sha512 diff --git a/Common/DataModel/Testing/Data/cone.vtp.sha512 b/Testing/Data/cone.vtp.sha512 similarity index 100% rename from Common/DataModel/Testing/Data/cone.vtp.sha512 rename to Testing/Data/cone.vtp.sha512 diff --git a/Common/DataModel/Testing/Data/onePolyhedron.vtu.sha512 b/Testing/Data/onePolyhedron.vtu.sha512 similarity index 100% rename from Common/DataModel/Testing/Data/onePolyhedron.vtu.sha512 rename to Testing/Data/onePolyhedron.vtu.sha512 diff --git a/Common/DataModel/Testing/Data/polyhedron_mesh.vtu.sha512 b/Testing/Data/polyhedron_mesh.vtu.sha512 similarity index 100% rename from Common/DataModel/Testing/Data/polyhedron_mesh.vtu.sha512 rename to Testing/Data/polyhedron_mesh.vtu.sha512 diff --git a/Common/DataModel/Testing/Data/sliceOfPolyhedron.vtu.sha512 b/Testing/Data/sliceOfPolyhedron.vtu.sha512 similarity index 100% rename from Common/DataModel/Testing/Data/sliceOfPolyhedron.vtu.sha512 rename to Testing/Data/sliceOfPolyhedron.vtu.sha512 diff --git a/Common/DataModel/Testing/Data/test_surface.vtp.sha512 b/Testing/Data/test_surface.vtp.sha512 similarity index 100% rename from Common/DataModel/Testing/Data/test_surface.vtp.sha512 rename to Testing/Data/test_surface.vtp.sha512 diff --git a/Views/Infovis/Testing/Cxx/CMakeLists.txt b/Views/Infovis/Testing/Cxx/CMakeLists.txt index d22a3c62c0b968815fcc7aa18f046b441bbd02b2..64c605b1b269b45c63dfc30cae054a73781e24b9 100644 --- a/Views/Infovis/Testing/Cxx/CMakeLists.txt +++ b/Views/Infovis/Testing/Cxx/CMakeLists.txt @@ -5,7 +5,7 @@ vtk_add_test_cxx(vtkViewsInfovisCxxTests tests TestDendrogramItem.cxx TestGraphLayoutView.cxx TestHeatmapCategoryLegend.cxx - TestHeatmapItem.cxx + TestHeatmapItem.cxx, LOOSE_VALID TestHeatmapScalarLegend.cxx TestHierarchicalGraphView.cxx TestIcicleView.cxx @@ -16,9 +16,9 @@ vtk_add_test_cxx(vtkViewsInfovisCxxTests tests TestRenderView.cxx TestSpanTreeLayoutStrategy.cxx TestTanglegramItem.cxx - TestTreeHeatmapAutoCollapse.cxx - TestTreeHeatmapItem.cxx - TestTreeMapView.cxx + TestTreeHeatmapAutoCollapse.cxx, LOOSE_VALID + TestTreeHeatmapItem.cxx, LOOSE_VALID + TestTreeMapView.cxx, LOOSE_VALID TestTreeRingView.cxx ) diff --git a/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem_3.png.sha512 b/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem_3.png.sha512 new file mode 100644 index 0000000000000000000000000000000000000000..9d9f819acc015f09464ff57cbae4683f660489c4 --- /dev/null +++ b/Views/Infovis/Testing/Data/Baseline/TestTanglegramItem_3.png.sha512 @@ -0,0 +1 @@ +b415c4b2c8580dd5ff5940d8a444e1a0b3be28f22c48c2524faae6a09df34a797973feaa0dab88ea9ae9f7b3b8d835405814b37da7d615688aa5f82e7f2293ab diff --git a/Web/Core/Testing/Python/TestDataEncoder.py b/Web/Core/Testing/Python/TestDataEncoder.py index 1b9dbc280a503a4c49e6215bb539cc232cb1052f..778a794c14db66403e6f67e1032cdcfc0e24895b 100644 --- a/Web/Core/Testing/Python/TestDataEncoder.py +++ b/Web/Core/Testing/Python/TestDataEncoder.py @@ -78,7 +78,7 @@ class TestDataEncoder(Testing.vtkTest): rtTester.AddArgument("TestDataEncoder.png") # Perform the image comparison test and print out the result. - result = rtTester.RegressionTest("TestDataEncoder.png", 0.0) + result = rtTester.RegressionTest("TestDataEncoder.png", 0.05) if result == 0: raise Exception("TestDataEncoder failed.") diff --git a/Web/Python/vtkmodules/web/testing.py b/Web/Python/vtkmodules/web/testing.py index dc3cbc2cc66f6a60d026f70dd1bfeb9d4a2f500c..8b74de5b75546c87ded5936fcc686af0b70ccbb3 100644 --- a/Web/Python/vtkmodules/web/testing.py +++ b/Web/Python/vtkmodules/web/testing.py @@ -351,7 +351,7 @@ def compare_images(test_img, baseline_img, tmp_dir="."): t.AddArgument(baseline_img) # Perform the image comparison test and print out the result. - return t.RegressionTest(test_img, 0.0) + return t.RegressionTest(test_img, 0.05) # ============================================================================= diff --git a/Wrapping/Java/Testing/Java/CMakeLists.txt b/Wrapping/Java/Testing/Java/CMakeLists.txt index bf009acb822b7dafe14eee47b223cbc6a13c7a8f..d7837e925c737bde0872cdc9032d0ce26693be1b 100644 --- a/Wrapping/Java/Testing/Java/CMakeLists.txt +++ b/Wrapping/Java/Testing/Java/CMakeLists.txt @@ -51,6 +51,9 @@ if (TARGET VTK::RenderingOpenGL2) -D "${CMAKE_BINARY_DIR}/ExternalData" -V "DATA{../Data/Baseline/Cone.png}" -T "${CMAKE_BINARY_DIR}/Testing/Temporary") + set_property(TEST vtkJavaTests-Regression + PROPERTY + ENVIRONMENT "VTK_TESTING=1;VTK_TESTING_IMAGE_COMPARE_METHOD=TIGHT_VALID") endif () foreach (java_simple_test IN LISTS java_simple_test_names) diff --git a/Wrapping/Java/Testing/Java/vtk/test/Regression.java b/Wrapping/Java/Testing/Java/vtk/test/Regression.java index 43c9c671e9505f110905c4091684fc0b1ef38e17..7291b260078597cf12b327ea6ff5272e86bf4a1f 100644 --- a/Wrapping/Java/Testing/Java/vtk/test/Regression.java +++ b/Wrapping/Java/Testing/Java/vtk/test/Regression.java @@ -148,7 +148,7 @@ public class Regression { if (vtkJavaTesting.IsInteractive()) { iren.Start(); } else { - retVal2 = vtkJavaTesting.RegressionTest(renWin, 10); + retVal2 = vtkJavaTesting.RegressionTest(renWin, 0.05); } vtkObject.JAVA_OBJECT_MANAGER.deleteAll();