From 3bcb4e1e98e5c2da17ba92b5c2dac7da12d7ce0b Mon Sep 17 00:00:00 2001 From: Sam Reeve <6740307+streeve@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:30:27 -0500 Subject: [PATCH 1/2] fixup: unify test subpackage naming --- benchmark/core/CMakeLists.txt | 10 +++++----- cmake/test_harness/test_harness.cmake | 12 ++++-------- example/core_tutorial/01_hello_world/CMakeLists.txt | 2 +- example/core_tutorial/02_tuple/CMakeLists.txt | 2 +- .../core_tutorial/03_struct_of_arrays/CMakeLists.txt | 2 +- example/core_tutorial/04_aosoa/CMakeLists.txt | 2 +- .../04_aosoa_advanced_unmanaged/CMakeLists.txt | 2 +- example/core_tutorial/05_slice/CMakeLists.txt | 2 +- .../05_slice_advanced_cuda/CMakeLists.txt | 2 +- .../05_slice_advanced_openmp/CMakeLists.txt | 2 +- example/core_tutorial/06_deep_copy/CMakeLists.txt | 2 +- example/core_tutorial/07_sorting/CMakeLists.txt | 2 +- .../core_tutorial/08_linked_cell_list/CMakeLists.txt | 2 +- .../core_tutorial/09_neighbor_list/CMakeLists.txt | 2 +- .../09_neighbor_list_arborx/CMakeLists.txt | 2 +- .../10_neighbor_parallel_for/CMakeLists.txt | 2 +- .../10_simd_parallel_for/CMakeLists.txt | 2 +- example/core_tutorial/11_migration/CMakeLists.txt | 4 ++-- .../core_tutorial/12_halo_exchange/CMakeLists.txt | 4 ++-- example/core_tutorial/13_hdf5_output/CMakeLists.txt | 4 ++-- .../13_hdf5_output_advanced/CMakeLists.txt | 4 ++-- example/grid_tutorial/01_types/CMakeLists.txt | 2 +- example/grid_tutorial/02_global_mesh/CMakeLists.txt | 2 +- example/grid_tutorial/03_partitioner/CMakeLists.txt | 4 ++-- example/grid_tutorial/04_global_grid/CMakeLists.txt | 4 ++-- example/grid_tutorial/05_index_space/CMakeLists.txt | 2 +- example/grid_tutorial/06_local_grid/CMakeLists.txt | 4 ++-- example/grid_tutorial/07_local_mesh/CMakeLists.txt | 4 ++-- example/grid_tutorial/08_array/CMakeLists.txt | 4 ++-- .../grid_tutorial/09_grid_parallel/CMakeLists.txt | 4 ++-- example/grid_tutorial/10_fft_heffte/CMakeLists.txt | 4 ++-- .../CMakeLists.txt | 4 ++-- .../11_structured_solver/CMakeLists.txt | 4 ++-- .../11_structured_solver_hypre/CMakeLists.txt | 4 ++-- example/grid_tutorial/12_halo/CMakeLists.txt | 4 ++-- .../grid_tutorial/13_all_loadbalancer/CMakeLists.txt | 4 ++-- example/grid_tutorial/14_spline/CMakeLists.txt | 4 ++-- .../grid_tutorial/15_interpolation/CMakeLists.txt | 4 ++-- 38 files changed, 63 insertions(+), 67 deletions(-) diff --git a/benchmark/core/CMakeLists.txt b/benchmark/core/CMakeLists.txt index f91984dc5..6bb604402 100644 --- a/benchmark/core/CMakeLists.txt +++ b/benchmark/core/CMakeLists.txt @@ -29,17 +29,17 @@ target_link_libraries(CommPerformance Cabana::Core) endif() if(Cabana_ENABLE_TESTING) - add_test(NAME Cabana_Performance_BinSort COMMAND ${NONMPI_PRECOMMAND} $ sort_output.txt) + add_test(NAME Cabana_Core_Performance_BinSort COMMAND ${NONMPI_PRECOMMAND} $ sort_output.txt) - add_test(NAME Cabana_Performance_NeighborVerlet COMMAND ${NONMPI_PRECOMMAND} $ verlet_output.txt) + add_test(NAME Cabana_Core_Performance_NeighborVerlet COMMAND ${NONMPI_PRECOMMAND} $ verlet_output.txt) if(Cabana_ENABLE_ARBORX) - add_test(NAME Cabana_Performance_NeighborArborX COMMAND ${NONMPI_PRECOMMAND} $ arborx_output.txt) + add_test(NAME Cabana_Core_Performance_NeighborArborX COMMAND ${NONMPI_PRECOMMAND} $ arborx_output.txt) endif() - add_test(NAME Cabana_Performance_LinkedCell COMMAND ${NONMPI_PRECOMMAND} $ lcl_output.txt) + add_test(NAME Cabana_Core_Performance_LinkedCell COMMAND ${NONMPI_PRECOMMAND} $ lcl_output.txt) if(Cabana_ENABLE_MPI) - add_test(NAME Cabana_Performance_Comm COMMAND ${NONMPI_PRECOMMAND} $ comm_output.txt) + add_test(NAME Cabana_Core_Performance_Comm COMMAND ${NONMPI_PRECOMMAND} $ comm_output.txt) endif() endif() diff --git a/cmake/test_harness/test_harness.cmake b/cmake/test_harness/test_harness.cmake index 59a84ab0f..7af6f4d13 100644 --- a/cmake/test_harness/test_harness.cmake +++ b/cmake/test_harness/test_harness.cmake @@ -22,7 +22,7 @@ endif() macro(Cabana_add_tests_nobackend) cmake_parse_arguments(CABANA_UNIT_TEST "" "PACKAGE" "NAMES" ${ARGN}) foreach(_test ${CABANA_UNIT_TEST_NAMES}) - set(_target Cabana_${_test}_test) + set(_target Cabana_${CABANA_UNIT_TEST_PACKAGE}_${_test}_test) add_executable(${_target} tst${_test}.cpp ${TEST_HARNESS_DIR}/unit_test_main.cpp) target_link_libraries(${_target} PRIVATE ${CABANA_UNIT_TEST_PACKAGE} ${gtest_target}) add_test(NAME ${_target} COMMAND ${NONMPI_PRECOMMAND} $ ${gtest_args}) @@ -78,14 +78,10 @@ macro(Cabana_add_tests) "#include \n" "#include \n" ) - if(${CABANA_UNIT_TEST_PACKAGE} STREQUAL Core) - if(CABANA_UNIT_TEST_MPI) - set(_target Cabana_${_test}_MPI_test_${_device}) - else() - set(_target Cabana_${_test}_test_${_device}) - endif() + if(CABANA_UNIT_TEST_MPI) + set(_target Cabana_${CABANA_UNIT_TEST_PACKAGE}_Test_${_test}_MPI_${_device}) else() - set(_target ${CABANA_UNIT_TEST_PACKAGE}_${_test}_MPI_test_${_device}) + set(_target Cabana_${CABANA_UNIT_TEST_PACKAGE}_Test_${_test}_${_device}) endif() add_executable(${_target} ${_file} ${CABANA_UNIT_TEST_MAIN}) target_include_directories(${_target} PRIVATE ${_dir} diff --git a/example/core_tutorial/01_hello_world/CMakeLists.txt b/example/core_tutorial/01_hello_world/CMakeLists.txt index 1a38cafcc..b7b9af423 100644 --- a/example/core_tutorial/01_hello_world/CMakeLists.txt +++ b/example/core_tutorial/01_hello_world/CMakeLists.txt @@ -19,4 +19,4 @@ endif() add_executable(HelloWorld hello_world.cpp) target_link_libraries(HelloWorld Cabana::Core) -add_test(NAME Core_tutorial_01 COMMAND ${NONMPI_PRECOMMAND} $) +add_test(NAME Cabana_Core_Tutorial_01 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/02_tuple/CMakeLists.txt b/example/core_tutorial/02_tuple/CMakeLists.txt index face10ad5..942a98aca 100644 --- a/example/core_tutorial/02_tuple/CMakeLists.txt +++ b/example/core_tutorial/02_tuple/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(Tuple tuple_example.cpp) target_link_libraries(Tuple Cabana::Core) - add_test(NAME Core_tutorial_02 COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_02 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/03_struct_of_arrays/CMakeLists.txt b/example/core_tutorial/03_struct_of_arrays/CMakeLists.txt index 041c7a508..3a61d7c1e 100644 --- a/example/core_tutorial/03_struct_of_arrays/CMakeLists.txt +++ b/example/core_tutorial/03_struct_of_arrays/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(StructOfArrays soa_example.cpp) target_link_libraries(StructOfArrays Cabana::Core) - add_test(NAME Core_tutorial_03 COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_03 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/04_aosoa/CMakeLists.txt b/example/core_tutorial/04_aosoa/CMakeLists.txt index 754a9af59..0a221967f 100644 --- a/example/core_tutorial/04_aosoa/CMakeLists.txt +++ b/example/core_tutorial/04_aosoa/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(ArrayOfStructsOfArrays aosoa_example.cpp) target_link_libraries(ArrayOfStructsOfArrays Cabana::Core) - add_test(NAME Core_tutorial_04 COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_04 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/04_aosoa_advanced_unmanaged/CMakeLists.txt b/example/core_tutorial/04_aosoa_advanced_unmanaged/CMakeLists.txt index 3837cbc59..eefd381da 100644 --- a/example/core_tutorial/04_aosoa_advanced_unmanaged/CMakeLists.txt +++ b/example/core_tutorial/04_aosoa_advanced_unmanaged/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(AdvancedUnmanagedAoSoA advanced_aosoa_unmanaged.cpp) target_link_libraries(AdvancedUnmanagedAoSoA Cabana::Core) -add_test(NAME Core_tutorial_04_unmanaged COMMAND ${NONMPI_PRECOMMAND} $) +add_test(NAME Cabana_Core_Tutorial_04_unmanaged COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/05_slice/CMakeLists.txt b/example/core_tutorial/05_slice/CMakeLists.txt index 456e12359..fbe64f1c2 100644 --- a/example/core_tutorial/05_slice/CMakeLists.txt +++ b/example/core_tutorial/05_slice/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(Slice slice_example.cpp) target_link_libraries(Slice Cabana::Core) - add_test(NAME Core_tutorial_05 COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_05 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/05_slice_advanced_cuda/CMakeLists.txt b/example/core_tutorial/05_slice_advanced_cuda/CMakeLists.txt index 54032bab3..17730ba55 100644 --- a/example/core_tutorial/05_slice_advanced_cuda/CMakeLists.txt +++ b/example/core_tutorial/05_slice_advanced_cuda/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(AdvancedCudaSlice advanced_slice_cuda.cpp) target_link_libraries(AdvancedCudaSlice Cabana::Core) - add_test(NAME Core_tutorial_05_cuda COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_05_cuda COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/05_slice_advanced_openmp/CMakeLists.txt b/example/core_tutorial/05_slice_advanced_openmp/CMakeLists.txt index a3ddd906d..bf5894b9b 100644 --- a/example/core_tutorial/05_slice_advanced_openmp/CMakeLists.txt +++ b/example/core_tutorial/05_slice_advanced_openmp/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(AdvancedOpenMPSlice advanced_slice_openmp.cpp) target_link_libraries(AdvancedOpenMPSlice Cabana::Core) - add_test(NAME Core_tutorial_05_openmp COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_05_openmp COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/06_deep_copy/CMakeLists.txt b/example/core_tutorial/06_deep_copy/CMakeLists.txt index cdc78836e..fef394ceb 100644 --- a/example/core_tutorial/06_deep_copy/CMakeLists.txt +++ b/example/core_tutorial/06_deep_copy/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(DeepCopy deep_copy_example.cpp) target_link_libraries(DeepCopy Cabana::Core) - add_test(NAME Core_tutorial_06 COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_06 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/07_sorting/CMakeLists.txt b/example/core_tutorial/07_sorting/CMakeLists.txt index 1e15f28f2..7128dfe66 100644 --- a/example/core_tutorial/07_sorting/CMakeLists.txt +++ b/example/core_tutorial/07_sorting/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(Sorting sorting_example.cpp) target_link_libraries(Sorting Cabana::Core) - add_test(NAME Core_tutorial_07 COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_07 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/08_linked_cell_list/CMakeLists.txt b/example/core_tutorial/08_linked_cell_list/CMakeLists.txt index 93124d9db..fd53543d3 100644 --- a/example/core_tutorial/08_linked_cell_list/CMakeLists.txt +++ b/example/core_tutorial/08_linked_cell_list/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(LinkedCellList linked_cell_list_example.cpp) target_link_libraries(LinkedCellList Cabana::Core) - add_test(NAME Core_tutorial_08 COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_08 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/09_neighbor_list/CMakeLists.txt b/example/core_tutorial/09_neighbor_list/CMakeLists.txt index af94ce6af..7657a69a4 100644 --- a/example/core_tutorial/09_neighbor_list/CMakeLists.txt +++ b/example/core_tutorial/09_neighbor_list/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(VerletList verlet_list_example.cpp) target_link_libraries(VerletList Cabana::Core) - add_test(NAME Core_tutorial_09 COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_09 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/09_neighbor_list_arborx/CMakeLists.txt b/example/core_tutorial/09_neighbor_list_arborx/CMakeLists.txt index 8332110d7..0beacf37c 100644 --- a/example/core_tutorial/09_neighbor_list_arborx/CMakeLists.txt +++ b/example/core_tutorial/09_neighbor_list_arborx/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(ArborXList arborx_neighborlist_example.cpp) target_link_libraries(ArborXList Cabana::Core) - add_test(NAME Core_tutorial_09_arborx COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_09_arborx COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/10_neighbor_parallel_for/CMakeLists.txt b/example/core_tutorial/10_neighbor_parallel_for/CMakeLists.txt index cd71fb866..48af61505 100644 --- a/example/core_tutorial/10_neighbor_parallel_for/CMakeLists.txt +++ b/example/core_tutorial/10_neighbor_parallel_for/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(NeighParallelFor neighbor_parallel_for_example.cpp) target_link_libraries(NeighParallelFor Cabana::Core) - add_test(NAME Core_tutorial_10_neighbor COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_10_neighbor COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/10_simd_parallel_for/CMakeLists.txt b/example/core_tutorial/10_simd_parallel_for/CMakeLists.txt index 391d356a4..2e637c7e9 100644 --- a/example/core_tutorial/10_simd_parallel_for/CMakeLists.txt +++ b/example/core_tutorial/10_simd_parallel_for/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(SimdParallelFor simd_parallel_for_example.cpp) target_link_libraries(SimdParallelFor Cabana::Core) - add_test(NAME Core_tutorial_10_simd COMMAND ${NONMPI_PRECOMMAND} $) + add_test(NAME Cabana_Core_Tutorial_10_simd COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/core_tutorial/11_migration/CMakeLists.txt b/example/core_tutorial/11_migration/CMakeLists.txt index 0b491fce0..789a4a856 100644 --- a/example/core_tutorial/11_migration/CMakeLists.txt +++ b/example/core_tutorial/11_migration/CMakeLists.txt @@ -11,6 +11,6 @@ add_executable(Migration migration_example.cpp) target_link_libraries(Migration Cabana::Core) - add_test(NAME Core_tutorial_11 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} + add_test(NAME Cabana_Core_Tutorial_11 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) - set_tests_properties(Core_tutorial_11 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) + set_tests_properties(Cabana_Core_Tutorial_11 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/core_tutorial/12_halo_exchange/CMakeLists.txt b/example/core_tutorial/12_halo_exchange/CMakeLists.txt index 9ad659d58..56506ff4b 100644 --- a/example/core_tutorial/12_halo_exchange/CMakeLists.txt +++ b/example/core_tutorial/12_halo_exchange/CMakeLists.txt @@ -11,6 +11,6 @@ add_executable(HaloExchange halo_exchange_example.cpp) target_link_libraries(HaloExchange Cabana::Core) - add_test(NAME Core_tutorial_12 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} + add_test(NAME Cabana_Core_Tutorial_12 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) - set_tests_properties(Core_tutorial_12 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) + set_tests_properties(Cabana_Core_Tutorial_12 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/core_tutorial/13_hdf5_output/CMakeLists.txt b/example/core_tutorial/13_hdf5_output/CMakeLists.txt index f02c5d420..3eb90ccca 100644 --- a/example/core_tutorial/13_hdf5_output/CMakeLists.txt +++ b/example/core_tutorial/13_hdf5_output/CMakeLists.txt @@ -11,6 +11,6 @@ add_executable(HDF5Output hdf5_output_example.cpp) target_link_libraries(HDF5Output Cabana::Core) -add_test(NAME Core_tutorial_13 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} +add_test(NAME Cabana_Core_Tutorial_13 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Core_tutorial_13 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +set_tests_properties(Cabana_Core_Tutorial_13 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/core_tutorial/13_hdf5_output_advanced/CMakeLists.txt b/example/core_tutorial/13_hdf5_output_advanced/CMakeLists.txt index dc874a39d..ab0dbeca0 100644 --- a/example/core_tutorial/13_hdf5_output_advanced/CMakeLists.txt +++ b/example/core_tutorial/13_hdf5_output_advanced/CMakeLists.txt @@ -17,6 +17,6 @@ if(EXISTS ${HDF5_BIN_DIR}/h5fuse.sh) elseif(EXISTS ${HDF5_BIN_DIR}/h5fuse) file(COPY ${HDF5_BIN_DIR}/h5fuse DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) endif() -add_test(NAME Core_tutorial_13_subfiling COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} +add_test(NAME Cabana_Core_Tutorial_13_subfiling COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Core_tutorial_13_subfiling PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +set_tests_properties(Cabana_Core_Tutorial_13_subfiling PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/01_types/CMakeLists.txt b/example/grid_tutorial/01_types/CMakeLists.txt index 008c23546..bbc116fcb 100644 --- a/example/grid_tutorial/01_types/CMakeLists.txt +++ b/example/grid_tutorial/01_types/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(MeshTypes types_example.cpp) target_link_libraries(MeshTypes Cabana::Grid) -add_test(NAME Grid_tutorial_01 COMMAND ${NONMPI_PRECOMMAND} $) +add_test(NAME Cabana_Grid_Tutorial_01 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/grid_tutorial/02_global_mesh/CMakeLists.txt b/example/grid_tutorial/02_global_mesh/CMakeLists.txt index 67c427cfd..09dfa1229 100644 --- a/example/grid_tutorial/02_global_mesh/CMakeLists.txt +++ b/example/grid_tutorial/02_global_mesh/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(GlobalMesh global_mesh_example.cpp) target_link_libraries(GlobalMesh Cabana::Grid) -add_test(NAME Grid_tutorial_02 COMMAND ${NONMPI_PRECOMMAND} $) +add_test(NAME Cabana_Grid_Tutorial_02 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/grid_tutorial/03_partitioner/CMakeLists.txt b/example/grid_tutorial/03_partitioner/CMakeLists.txt index 0c6ea7b34..6ede04383 100644 --- a/example/grid_tutorial/03_partitioner/CMakeLists.txt +++ b/example/grid_tutorial/03_partitioner/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(Partitioner partitioner_example.cpp) target_link_libraries(Partitioner Cabana::Grid) -add_test(NAME Grid_tutorial_03 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_03 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_03 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_03 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/04_global_grid/CMakeLists.txt b/example/grid_tutorial/04_global_grid/CMakeLists.txt index 6a7f52bb2..d6b0d5040 100644 --- a/example/grid_tutorial/04_global_grid/CMakeLists.txt +++ b/example/grid_tutorial/04_global_grid/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(GlobalGrid global_grid_example.cpp) target_link_libraries(GlobalGrid Cabana::Grid) -add_test(NAME Grid_tutorial_04 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_04 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_04 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_04 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/05_index_space/CMakeLists.txt b/example/grid_tutorial/05_index_space/CMakeLists.txt index 49f1debe9..79947e3f9 100644 --- a/example/grid_tutorial/05_index_space/CMakeLists.txt +++ b/example/grid_tutorial/05_index_space/CMakeLists.txt @@ -11,4 +11,4 @@ add_executable(IndexSpace index_space_example.cpp) target_link_libraries(IndexSpace Cabana::Grid) -add_test(NAME Grid_tutorial_05 COMMAND ${NONMPI_PRECOMMAND} $) +add_test(NAME Cabana_Grid_Tutorial_05 COMMAND ${NONMPI_PRECOMMAND} $) diff --git a/example/grid_tutorial/06_local_grid/CMakeLists.txt b/example/grid_tutorial/06_local_grid/CMakeLists.txt index a10b6e5b4..bdc0fdd9c 100644 --- a/example/grid_tutorial/06_local_grid/CMakeLists.txt +++ b/example/grid_tutorial/06_local_grid/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(LocalGrid local_grid_example.cpp) target_link_libraries(LocalGrid Cabana::Grid) -add_test(NAME Grid_tutorial_06 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_06 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_06 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_06 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/07_local_mesh/CMakeLists.txt b/example/grid_tutorial/07_local_mesh/CMakeLists.txt index 2f1d68c43..c5435a430 100644 --- a/example/grid_tutorial/07_local_mesh/CMakeLists.txt +++ b/example/grid_tutorial/07_local_mesh/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(LocalMesh local_mesh_example.cpp) target_link_libraries(LocalMesh Cabana::Grid) -add_test(NAME Grid_tutorial_07 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_07 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_07 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_07 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/08_array/CMakeLists.txt b/example/grid_tutorial/08_array/CMakeLists.txt index 605ebe1c9..b9d6325b5 100644 --- a/example/grid_tutorial/08_array/CMakeLists.txt +++ b/example/grid_tutorial/08_array/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(Array array_example.cpp) target_link_libraries(Array Cabana::Grid) -add_test(NAME Grid_tutorial_08 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_08 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_08 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_08 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/09_grid_parallel/CMakeLists.txt b/example/grid_tutorial/09_grid_parallel/CMakeLists.txt index 6de4c1b4e..baa289bb9 100644 --- a/example/grid_tutorial/09_grid_parallel/CMakeLists.txt +++ b/example/grid_tutorial/09_grid_parallel/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(GridParallel grid_parallel_example.cpp) target_link_libraries(GridParallel Cabana::Grid) -add_test(NAME Grid_tutorial_09 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_09 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_09 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_09 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/10_fft_heffte/CMakeLists.txt b/example/grid_tutorial/10_fft_heffte/CMakeLists.txt index fd0f58d95..8bdf34faf 100644 --- a/example/grid_tutorial/10_fft_heffte/CMakeLists.txt +++ b/example/grid_tutorial/10_fft_heffte/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(HeffteFFT heffte_fast_fourier_transform_example.cpp) target_link_libraries(HeffteFFT Cabana::Grid) -add_test(NAME Grid_tutorial_10 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_10 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_10 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_10 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt b/example/grid_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt index 73eb80188..60f90f125 100644 --- a/example/grid_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt +++ b/example/grid_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(HypreSemiStructuredSolverMulti hypre_semi_structured_solver_multi_example.cpp) target_link_libraries(HypreSemiStructuredSolverMulti Cabana::Grid) -add_test(NAME Grid_tutorial_11_hypre_SS COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_11_hypre_SS PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_11_hypre_SS COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_11_hypre_SS PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/11_structured_solver/CMakeLists.txt b/example/grid_tutorial/11_structured_solver/CMakeLists.txt index fc2041723..d4d6b8bad 100644 --- a/example/grid_tutorial/11_structured_solver/CMakeLists.txt +++ b/example/grid_tutorial/11_structured_solver/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(StructuredSolver structured_solver_example.cpp) target_link_libraries(StructuredSolver Cabana::Grid) -add_test(NAME Grid_tutorial_11 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_11 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_11 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_11 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/11_structured_solver_hypre/CMakeLists.txt b/example/grid_tutorial/11_structured_solver_hypre/CMakeLists.txt index 9f7682f30..1ee6a2512 100644 --- a/example/grid_tutorial/11_structured_solver_hypre/CMakeLists.txt +++ b/example/grid_tutorial/11_structured_solver_hypre/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(HypreStructuredSolver hypre_structured_solver_example.cpp) target_link_libraries(HypreStructuredSolver Cabana::Grid) -add_test(NAME Grid_tutorial_11_hypre COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_11_hypre PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_11_hypre COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_11_hypre PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/12_halo/CMakeLists.txt b/example/grid_tutorial/12_halo/CMakeLists.txt index 12904b559..4f4904758 100644 --- a/example/grid_tutorial/12_halo/CMakeLists.txt +++ b/example/grid_tutorial/12_halo/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(Halo halo_example.cpp) target_link_libraries(Halo Cabana::Grid) -add_test(NAME Grid_tutorial_12 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_12 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_12 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_12 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/13_all_loadbalancer/CMakeLists.txt b/example/grid_tutorial/13_all_loadbalancer/CMakeLists.txt index 04a8e462c..d07bd36d2 100644 --- a/example/grid_tutorial/13_all_loadbalancer/CMakeLists.txt +++ b/example/grid_tutorial/13_all_loadbalancer/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(Loadbalancer loadbalancer_example.cpp) target_link_libraries(Loadbalancer Cabana::Grid) -add_test(NAME Grid_tutorial_13 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_13 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_13 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_13 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/14_spline/CMakeLists.txt b/example/grid_tutorial/14_spline/CMakeLists.txt index ed7eb2802..2b25c0cd3 100644 --- a/example/grid_tutorial/14_spline/CMakeLists.txt +++ b/example/grid_tutorial/14_spline/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(Spline spline_example.cpp) target_link_libraries(Spline Cabana::Grid) -add_test(NAME Grid_tutorial_14 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_14 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_14 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_14 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) diff --git a/example/grid_tutorial/15_interpolation/CMakeLists.txt b/example/grid_tutorial/15_interpolation/CMakeLists.txt index edaa0e909..56b75da76 100644 --- a/example/grid_tutorial/15_interpolation/CMakeLists.txt +++ b/example/grid_tutorial/15_interpolation/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(Interpolation interpolation_example.cpp) target_link_libraries(Interpolation Cabana::Grid) -add_test(NAME Grid_tutorial_15 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) -set_tests_properties(Grid_tutorial_15 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) +add_test(NAME Cabana_Grid_Tutorial_15 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $ ${MPIEXEC_POSTFLAGS}) +set_tests_properties(Cabana_Grid_Tutorial_15 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS}) From c2493253a31810fd85f164311e9e7c9afdfbc121 Mon Sep 17 00:00:00 2001 From: Sam Reeve <6740307+streeve@users.noreply.github.com> Date: Wed, 24 Jan 2024 21:42:57 -0500 Subject: [PATCH 2/2] fixup: remove underscores and unify test naming --- core/unit_test/tstAoSoA.hpp | 10 ++-- core/unit_test/tstCartesianGrid.cpp | 2 +- core/unit_test/tstCommunicationPlan.hpp | 30 ++++++------ core/unit_test/tstDeepCopy.hpp | 12 ++--- core/unit_test/tstDistributor.hpp | 36 +++++++------- core/unit_test/tstHDF5ParticleOutput.hpp | 2 +- core/unit_test/tstHalo.hpp | 8 ++-- core/unit_test/tstIndex.cpp | 2 +- core/unit_test/tstLinkedCellList.hpp | 18 ++++--- core/unit_test/tstNeighborList.hpp | 15 +++--- core/unit_test/tstNeighborListArborX.hpp | 16 ++----- core/unit_test/tstParallel.hpp | 2 +- core/unit_test/tstParameterPack.hpp | 4 +- core/unit_test/tstParticleInit.hpp | 14 ++---- core/unit_test/tstParticleList.hpp | 4 +- core/unit_test/tstSlice.hpp | 6 +-- core/unit_test/tstSoA.cpp | 2 +- core/unit_test/tstSort.hpp | 20 +++----- core/unit_test/tstTuple.hpp | 2 +- core/unit_test/tstVersion.cpp | 2 +- grid/unit_test/tstArray2d.hpp | 4 +- grid/unit_test/tstArray3d.hpp | 4 +- grid/unit_test/tstBovWriter.hpp | 4 +- grid/unit_test/tstFastFourierTransform.hpp | 4 +- grid/unit_test/tstGlobalGrid.hpp | 6 +-- grid/unit_test/tstGlobalMesh.hpp | 8 ++-- grid/unit_test/tstGlobalParticleComm.hpp | 4 +- grid/unit_test/tstHalo2d.hpp | 16 ++----- grid/unit_test/tstHalo3d.hpp | 16 ++----- .../tstHypreSemiStructuredSolver.hpp | 12 ++--- .../tstHypreSemiStructuredSolverMulti.hpp | 12 ++--- grid/unit_test/tstHypreStructuredSolver2d.hpp | 20 ++++---- grid/unit_test/tstHypreStructuredSolver3d.hpp | 20 ++++---- grid/unit_test/tstIndexConversion.hpp | 48 +++++++++---------- grid/unit_test/tstIndexSpace.hpp | 2 +- grid/unit_test/tstInterpolation2d.hpp | 2 +- grid/unit_test/tstInterpolation3d.hpp | 2 +- grid/unit_test/tstLoadBalancer.hpp | 24 +++------- grid/unit_test/tstLocalGrid.hpp | 6 +-- grid/unit_test/tstLocalMesh2d.hpp | 10 ++-- grid/unit_test/tstLocalMesh3d.hpp | 10 ++-- grid/unit_test/tstParallel.hpp | 6 +-- grid/unit_test/tstParticleDistributor2d.hpp | 8 ++-- grid/unit_test/tstParticleDistributor3d.hpp | 8 ++-- grid/unit_test/tstParticleInit.hpp | 8 ++-- grid/unit_test/tstParticleList.hpp | 2 +- grid/unit_test/tstPartitioner.hpp | 4 +- grid/unit_test/tstSiloParticleOutput.hpp | 2 +- grid/unit_test/tstSparseArray.hpp | 4 +- grid/unit_test/tstSparseDimPartitioner.hpp | 9 ++-- grid/unit_test/tstSparseHalo.hpp | 6 +-- grid/unit_test/tstSparseIndexSpace.hpp | 10 ++-- grid/unit_test/tstSparseLocalGrid.hpp | 2 +- grid/unit_test/tstSplineEvaluation2d.hpp | 2 +- grid/unit_test/tstSplineEvaluation3d.hpp | 2 +- grid/unit_test/tstSplines.hpp | 8 ++-- 56 files changed, 237 insertions(+), 285 deletions(-) diff --git a/core/unit_test/tstAoSoA.hpp b/core/unit_test/tstAoSoA.hpp index baa8b4b60..6cf096203 100644 --- a/core/unit_test/tstAoSoA.hpp +++ b/core/unit_test/tstAoSoA.hpp @@ -606,19 +606,19 @@ void testUnmanaged() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, aosoa_test ) { testAoSoA(); } +TEST( AoSoA, Test ) { testAoSoA(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, aosoa_raw_data_test ) { testRawData(); } +TEST( AoSoA, RawData ) { testRawData(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, aosoa_tuple_test ) { testTuple(); } +TEST( AoSoA, Tuple ) { testTuple(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, aosoa_access_test ) { testAccess(); } +TEST( AoSoA, Access ) { testAccess(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, aosoa_unmanaged_test ) { testUnmanaged(); } +TEST( AoSoA, Unmanaged ) { testUnmanaged(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstCartesianGrid.cpp b/core/unit_test/tstCartesianGrid.cpp index 1f4ea8499..556fba978 100644 --- a/core/unit_test/tstCartesianGrid.cpp +++ b/core/unit_test/tstCartesianGrid.cpp @@ -19,7 +19,7 @@ namespace Test { -TEST( cabana_cartesian_grid, grid_test ) +TEST( CartesianGrid, Test ) { double min[3] = { -1.0, -0.5, -0.6 }; double max[3] = { 2.5, 1.5, 1.9 }; diff --git a/core/unit_test/tstCommunicationPlan.hpp b/core/unit_test/tstCommunicationPlan.hpp index d916f2387..bc17fae93 100644 --- a/core/unit_test/tstCommunicationPlan.hpp +++ b/core/unit_test/tstCommunicationPlan.hpp @@ -595,35 +595,35 @@ void testTopology() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, comm_plan_test_1 ) { test1( true ); } +TEST( CommPlan, Test1 ) { test1( true ); } -TEST( TEST_CATEGORY, comm_plan_test_2 ) { test2( true ); } +TEST( CommPlan, Test2 ) { test2( true ); } -TEST( TEST_CATEGORY, comm_plan_test_3 ) { test3( true ); } +TEST( CommPlan, Test3 ) { test3( true ); } -TEST( TEST_CATEGORY, comm_plan_test_4 ) { test4( true ); } +TEST( CommPlan, Test4 ) { test4( true ); } -TEST( TEST_CATEGORY, comm_plan_test_5 ) { test5( true ); } +TEST( CommPlan, Test5 ) { test5( true ); } -TEST( TEST_CATEGORY, comm_plan_test_6 ) { test6( true ); } +TEST( CommPlan, Test6 ) { test6( true ); } -TEST( TEST_CATEGORY, comm_plan_test_7 ) { test7( true ); } +TEST( CommPlan, Test7 ) { test7( true ); } -TEST( TEST_CATEGORY, comm_plan_test_1_no_topo ) { test1( false ); } +TEST( CommPlan, Test1NoTopo ) { test1( false ); } -TEST( TEST_CATEGORY, comm_plan_test_2_no_topo ) { test2( false ); } +TEST( CommPlan, Test2NoTopo ) { test2( false ); } -TEST( TEST_CATEGORY, comm_plan_test_3_no_topo ) { test3( false ); } +TEST( CommPlan, Test3NoTopo ) { test3( false ); } -TEST( TEST_CATEGORY, comm_plan_test_4_no_topo ) { test4( false ); } +TEST( CommPlan, Test4NoTopo ) { test4( false ); } -TEST( TEST_CATEGORY, comm_plan_test_5_no_topo ) { test5( false ); } +TEST( CommPlan, Test5NoTopo ) { test5( false ); } -TEST( TEST_CATEGORY, comm_plan_test_6_no_topo ) { test6( false ); } +TEST( CommPlan, Test6NoTopo ) { test6( false ); } -TEST( TEST_CATEGORY, comm_plan_test_7_no_topo ) { test7( false ); } +TEST( CommPlan, Test7NoTopo ) { test7( false ); } -TEST( TEST_CATEGORY, comm_plan_test_topology ) { testTopology(); } +TEST( CommPlan, TestTopology ) { testTopology(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstDeepCopy.hpp b/core/unit_test/tstDeepCopy.hpp index b55f92156..bb7f97c1c 100644 --- a/core/unit_test/tstDeepCopy.hpp +++ b/core/unit_test/tstDeepCopy.hpp @@ -443,21 +443,21 @@ void testAssign() //---------------------------------------------------------------------------// // TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, deep_copy_to_host_same_layout_test ) +TEST( DeepCopy, ToHostSameLayout ) { testAoSoADeepCopy(); testParticleListDeepCopy(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, deep_copy_from_host_same_layout_test ) +TEST( DeepCopy, FromHostSameLayout ) { testAoSoADeepCopy(); testParticleListDeepCopy(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, deep_copy_to_host_different_layout_test ) +TEST( DeepCopy, ToHostDifferentLayout ) { testAoSoADeepCopy(); testAoSoADeepCopy(); @@ -466,7 +466,7 @@ TEST( TEST_CATEGORY, deep_copy_to_host_different_layout_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, deep_copy_from_host_different_layout_test ) +TEST( DeepCopy, FromHostDifferentLayout ) { testAoSoADeepCopy(); testAoSoADeepCopy(); @@ -475,10 +475,10 @@ TEST( TEST_CATEGORY, deep_copy_from_host_different_layout_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, mirror_test ) { testMirror(); } +TEST( DeepCopy, Mirror ) { testMirror(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, assign_test ) { testAssign(); } +TEST( DeepCopy, Assign ) { testAssign(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstDistributor.hpp b/core/unit_test/tstDistributor.hpp index ec380242c..b3d5e1c6e 100644 --- a/core/unit_test/tstDistributor.hpp +++ b/core/unit_test/tstDistributor.hpp @@ -756,41 +756,41 @@ void test9( const bool use_topology ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, distributor_test_1 ) { test1( true ); } +TEST( Distributor, Test1 ) { test1( true ); } -TEST( TEST_CATEGORY, distributor_test_2 ) { test2( true ); } +TEST( Distributor, Test2 ) { test2( true ); } -TEST( TEST_CATEGORY, distributor_test_3 ) { test3( true ); } +TEST( Distributor, Test3 ) { test3( true ); } -TEST( TEST_CATEGORY, distributor_test_4 ) { test4( true ); } +TEST( Distributor, Test4 ) { test4( true ); } -TEST( TEST_CATEGORY, distributor_test_5 ) { test5( true ); } +TEST( Distributor, Test5 ) { test5( true ); } -TEST( TEST_CATEGORY, distributor_test_6 ) { test6( true ); } +TEST( Distributor, Test6 ) { test6( true ); } -TEST( TEST_CATEGORY, distributor_test_7 ) { test7( true ); } +TEST( Distributor, Test7 ) { test7( true ); } -TEST( TEST_CATEGORY, distributor_test_8 ) { test8( true ); } +TEST( Distributor, Test8 ) { test8( true ); } -TEST( TEST_CATEGORY, distributor_test_9 ) { test9( true ); } +TEST( Distributor, Test9 ) { test9( true ); } -TEST( TEST_CATEGORY, distributor_test_1_no_topo ) { test1( false ); } +TEST( Distributor, Test1NoTopo ) { test1( false ); } -TEST( TEST_CATEGORY, distributor_test_2_no_topo ) { test2( false ); } +TEST( Distributor, Test2NoTopo ) { test2( false ); } -TEST( TEST_CATEGORY, distributor_test_3_no_topo ) { test3( false ); } +TEST( Distributor, Test3NoTopo ) { test3( false ); } -TEST( TEST_CATEGORY, distributor_test_4_no_topo ) { test4( false ); } +TEST( Distributor, Test4NoTopo ) { test4( false ); } -TEST( TEST_CATEGORY, distributor_test_5_no_topo ) { test5( false ); } +TEST( Distributor, Test5NoTopo ) { test5( false ); } -TEST( TEST_CATEGORY, distributor_test_6_no_topo ) { test6( false ); } +TEST( Distributor, Test6NoTopo ) { test6( false ); } -TEST( TEST_CATEGORY, distributor_test_7_no_topo ) { test7( false ); } +TEST( Distributor, Test7NoTopo ) { test7( false ); } -TEST( TEST_CATEGORY, distributor_test_8_no_topo ) { test8( false ); } +TEST( Distributor, Test8NoTopo ) { test8( false ); } -TEST( TEST_CATEGORY, distributor_test_9_no_topo ) { test9( false ); } +TEST( Distributor, Test9NoTopo ) { test9( false ); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstHDF5ParticleOutput.hpp b/core/unit_test/tstHDF5ParticleOutput.hpp index 5e3e8c4aa..d01d79747 100644 --- a/core/unit_test/tstHDF5ParticleOutput.hpp +++ b/core/unit_test/tstHDF5ParticleOutput.hpp @@ -191,7 +191,7 @@ void writeReadTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, write_read_test ) { writeReadTest(); } +TEST( HDF5, WriteRead ) { writeReadTest(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstHalo.hpp b/core/unit_test/tstHalo.hpp index 743b0b38f..163ef630f 100644 --- a/core/unit_test/tstHalo.hpp +++ b/core/unit_test/tstHalo.hpp @@ -586,26 +586,26 @@ void testHaloBuffers( TestTag tag, const bool use_topology ) // RUN TESTS //---------------------------------------------------------------------------// // test without collisions (each ghost is unique) -TEST( TEST_CATEGORY, halo_test_unique ) +TEST( Halo, Unique ) { testHalo( UniqueTestTag{}, true ); testHaloBuffers( UniqueTestTag{}, true ); } -TEST( TEST_CATEGORY, halo_test_unique_no_topo ) +TEST( Halo, UniqueNoTopo ) { testHalo( UniqueTestTag{}, false ); testHaloBuffers( UniqueTestTag{}, false ); } // tests with collisions (each ghost is duplicated on all ranks) -TEST( TEST_CATEGORY, halo_test_all ) +TEST( Halo, All ) { testHalo( AllTestTag{}, true ); testHaloBuffers( AllTestTag{}, false ); } -TEST( TEST_CATEGORY, halo_test_all_no_topo ) +TEST( Halo, AllNoTopo ) { testHalo( AllTestTag{}, false ); testHaloBuffers( AllTestTag{}, false ); diff --git a/core/unit_test/tstIndex.cpp b/core/unit_test/tstIndex.cpp index e61488a4a..3cc443442 100644 --- a/core/unit_test/tstIndex.cpp +++ b/core/unit_test/tstIndex.cpp @@ -21,7 +21,7 @@ namespace Test { -TEST( cabana_index, index_test ) +TEST( Index, Test ) { auto aosoa_idx_s = Cabana::Impl::Index<16>::s( 40 ); auto aosoa_idx_i = Cabana::Impl::Index<16>::a( 40 ); diff --git a/core/unit_test/tstLinkedCellList.hpp b/core/unit_test/tstLinkedCellList.hpp index 72757f10b..bbb24cb3f 100644 --- a/core/unit_test/tstLinkedCellList.hpp +++ b/core/unit_test/tstLinkedCellList.hpp @@ -770,23 +770,21 @@ void testLinkedListView() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, linked_cell_stencil_test ) { testLinkedCellStencil(); } +//---------------------------------------------------------------------------// +TEST( LinkedCellList, Stencil ) { testLinkedCellStencil(); } -TEST( TEST_CATEGORY, linked_list_test ) { testLinkedList(); } +TEST( LinkedCellList, AoSoA ) { testLinkedList(); } -TEST( TEST_CATEGORY, linked_list_slice_test ) { testLinkedListSlice(); } +TEST( LinkedCellList, Slice ) { testLinkedListSlice(); } -TEST( TEST_CATEGORY, linked_list_neighbor_test ) -{ - testLinkedCellNeighborInterface(); -} +TEST( LinkedCellList, Neighbor ) { testLinkedCellNeighborInterface(); } -TEST( TEST_CATEGORY, linked_list_parallel_test ) { testLinkedCellParallel(); } +TEST( LinkedCellList, ParallelFor ) { testLinkedCellParallel(); } -TEST( TEST_CATEGORY, linked_list_reduce_test ) { testLinkedCellReduce(); } +TEST( LinkedCellList, ParallelReduce ) { testLinkedCellReduce(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, linked_list_view_test ) { testLinkedListView(); } +TEST( LinkedCellList, linked_list_view_test ) { testLinkedListView(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstNeighborList.hpp b/core/unit_test/tstNeighborList.hpp index 0834e3be1..0a234a941 100644 --- a/core/unit_test/tstNeighborList.hpp +++ b/core/unit_test/tstNeighborList.hpp @@ -335,8 +335,7 @@ void testNeighborHistogram() //---------------------------------------------------------------------------// // TESTS //---------------------------------------------------------------------------// - -TEST( TEST_CATEGORY, verlet_list_full_test ) +TEST( VerletList, Full ) { #ifndef KOKKOS_ENABLE_OPENMPTARGET // FIXME_OPENMPTARGET testVerletListFull(); @@ -350,7 +349,7 @@ TEST( TEST_CATEGORY, verlet_list_full_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, verlet_list_half_test ) +TEST( VerletList, Half ) { #ifndef KOKKOS_ENABLE_OPENMPTARGET // FIXME_OPENMPTARGET testVerletListHalf(); @@ -364,7 +363,7 @@ TEST( TEST_CATEGORY, verlet_list_half_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, verlet_list_full_range_test ) +TEST( VerletList, FullRange ) { #ifndef KOKKOS_ENABLE_OPENMPTARGET // FIXME_OPENMPTARGET testVerletListFullPartialRange(); @@ -390,7 +389,7 @@ TEST( TEST_CATEGORY, parallel_for_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, parallel_reduce_test ) +TEST( VerletList, ParallelReduce ) { #ifndef KOKKOS_ENABLE_OPENMPTARGET // FIXME_OPENMPTARGET testNeighborParallelReduce(); @@ -399,7 +398,7 @@ TEST( TEST_CATEGORY, parallel_reduce_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, modify_list_test ) +TEST( VerletList, ModifyList ) { #ifndef KOKKOS_ENABLE_OPENMPTARGET // FIXME_OPENMPTARGET testModifyNeighbors(); @@ -408,7 +407,7 @@ TEST( TEST_CATEGORY, modify_list_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, neighbor_histogram_test ) +TEST( VerletList, NeighborHistogram ) { #ifndef KOKKOS_ENABLE_OPENMPTARGET testNeighborHistogram(); diff --git a/core/unit_test/tstNeighborListArborX.hpp b/core/unit_test/tstNeighborListArborX.hpp index e9e2ebf4b..33154c5fe 100644 --- a/core/unit_test/tstNeighborListArborX.hpp +++ b/core/unit_test/tstNeighborListArborX.hpp @@ -290,25 +290,19 @@ void testNeighborArborXParallelReduce() //---------------------------------------------------------------------------// // TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, neighbor_list_full_test ) { testArborXListFull(); } +TEST( ArborXList, Full ) { testArborXListFull(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, neighbor_list_half_test ) { testArborXListHalf(); } +TEST( ArborXList, Half ) { testArborXListHalf(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, neighbor_list_full_range_test ) -{ - testArborXListFullPartialRange(); -} +TEST( ArborXList, FullRange ) { testArborXListFullPartialRange(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, parallel_for_test ) { testNeighborArborXParallelFor(); } +TEST( ArborXList, ParallelFor ) { testNeighborArborXParallelFor(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, parallel_reduce_test ) -{ - testNeighborArborXParallelReduce(); -} +TEST( ArborXList, ParallelReduce ) { testNeighborArborXParallelReduce(); } //---------------------------------------------------------------------------// } // end namespace Test diff --git a/core/unit_test/tstParallel.hpp b/core/unit_test/tstParallel.hpp index af7785e51..a00a4f123 100644 --- a/core/unit_test/tstParallel.hpp +++ b/core/unit_test/tstParallel.hpp @@ -250,7 +250,7 @@ void runTest2d() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, simd_parallel_for_test ) { runTest2d(); } +TEST( SimdParallel, ParallelFor ) { runTest2d(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstParameterPack.hpp b/core/unit_test/tstParameterPack.hpp index 99f80335a..d2b084320 100644 --- a/core/unit_test/tstParameterPack.hpp +++ b/core/unit_test/tstParameterPack.hpp @@ -55,9 +55,9 @@ void emptyTest() { std::ignore = Cabana::makeParameterPack(); } //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, parameter_pack_capture ) { captureTest(); } +TEST( ParameterPack, Capture ) { captureTest(); } -TEST( TEST_CATEGORY, parameter_pack_empty ) { emptyTest(); } +TEST( ParameterPack, Empty ) { emptyTest(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstParticleInit.hpp b/core/unit_test/tstParticleInit.hpp index 226201f6d..767e06b0a 100644 --- a/core/unit_test/tstParticleInit.hpp +++ b/core/unit_test/tstParticleInit.hpp @@ -183,20 +183,14 @@ void testRandomCreationParticleList( const int multiplier = 1 ) host_positions ); } -TEST( TEST_CATEGORY, random_particle_creation_slice_test ) -{ - testRandomCreationSlice(); -} -TEST( TEST_CATEGORY, random_particle_creation_particlelist_test ) +TEST( ParticleInit, RandomSlice ) { testRandomCreationSlice(); } +TEST( ParticleInit, RandomParticleList ) { testRandomCreationParticleListMinDistance(); testRandomCreationParticleList(); } -TEST( TEST_CATEGORY, multiple_random_particle_creation_slice_test ) -{ - testRandomCreationSlice( 3 ); -} -TEST( TEST_CATEGORY, multiple_random_particle_creation_particlelist_test ) +TEST( ParticleInit, MultipleRandomSlice ) { testRandomCreationSlice( 3 ); } +TEST( ParticleInit, MultipleRandomParticleList ) { testRandomCreationParticleListMinDistance( 3 ); testRandomCreationParticleList( 3 ); diff --git a/core/unit_test/tstParticleList.hpp b/core/unit_test/tstParticleList.hpp index 1f35d30ab..f29498097 100644 --- a/core/unit_test/tstParticleList.hpp +++ b/core/unit_test/tstParticleList.hpp @@ -23,7 +23,7 @@ namespace Test //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, particle_test ) +TEST( ParticleList, Particle ) { auto fields = Cabana::ParticleTraits, Foo, CommRank, Bar>(); @@ -33,7 +33,7 @@ TEST( TEST_CATEGORY, particle_test ) particleListTest( plist ); } -TEST( TEST_CATEGORY, particle_view_test ) +TEST( ParticleList, ParticleView ) { auto fields = Cabana::ParticleTraits, Foo, CommRank, Bar>(); diff --git a/core/unit_test/tstSlice.hpp b/core/unit_test/tstSlice.hpp index f33a0b19f..c7af1be9f 100644 --- a/core/unit_test/tstSlice.hpp +++ b/core/unit_test/tstSlice.hpp @@ -347,13 +347,13 @@ void atomicAccessTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, api_test ) { apiTest(); } +TEST( Slice, API ) { apiTest(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, random_access_test ) { randomAccessTest(); } +TEST( Slice, RandomAccess ) { randomAccessTest(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, atomic_access_test ) { atomicAccessTest(); } +TEST( Slice, AtomicAccess ) { atomicAccessTest(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstSoA.cpp b/core/unit_test/tstSoA.cpp index 960e885cc..5a2bf0604 100644 --- a/core/unit_test/tstSoA.cpp +++ b/core/unit_test/tstSoA.cpp @@ -71,7 +71,7 @@ void testSoA() //---------------------------------------------------------------------------// // TESTS //---------------------------------------------------------------------------// -TEST( cabana_soa, soa_test ) { testSoA(); } +TEST( SoA, Test ) { testSoA(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstSort.hpp b/core/unit_test/tstSort.hpp index 359c42451..e5cf1f621 100644 --- a/core/unit_test/tstSort.hpp +++ b/core/unit_test/tstSort.hpp @@ -710,31 +710,25 @@ void testSortByKeySlice() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, sort_by_key_test ) { testSortByKey(); } +TEST( Sort, SortByKey ) { testSortByKey(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, bin_by_key_test ) { testBinByKey(); } +TEST( Sort, BinByKey ) { testBinByKey(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, sort_by_member_test ) { testSortBySlice(); } +TEST( Sort, SortByMember ) { testSortBySlice(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, sort_by_member_data_only_test ) -{ - testSortBySliceDataOnly(); -} +TEST( Sort, SortByMemberDataOnly ) { testSortBySliceDataOnly(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, bin_by_member_test ) { testBinBySlice(); } +TEST( Sort, BinByMember ) { testBinBySlice(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, bin_by_member_data_only_test ) -{ - testBinBySliceDataOnly(); -} +TEST( Sort, BinByMemberDataOnly ) { testBinBySliceDataOnly(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, sort_by_key_slice_test ) { testSortByKeySlice(); } +TEST( Sort, SortByKeySlice ) { testSortByKeySlice(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstTuple.hpp b/core/unit_test/tstTuple.hpp index 42cdd2902..6be01d6b0 100644 --- a/core/unit_test/tstTuple.hpp +++ b/core/unit_test/tstTuple.hpp @@ -118,7 +118,7 @@ void runTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, tuple_test ) { runTest(); } +TEST( Tuple, Test ) { runTest(); } //---------------------------------------------------------------------------// diff --git a/core/unit_test/tstVersion.cpp b/core/unit_test/tstVersion.cpp index 935168751..41fa8efc9 100644 --- a/core/unit_test/tstVersion.cpp +++ b/core/unit_test/tstVersion.cpp @@ -21,7 +21,7 @@ namespace Test { -TEST( cabana_version, version_test ) +TEST( Version, Test ) { auto const version_id = Cabana::version(); EXPECT_TRUE( !version_id.empty() ); diff --git a/grid/unit_test/tstArray2d.hpp b/grid/unit_test/tstArray2d.hpp index 318a55205..ee8c127de 100644 --- a/grid/unit_test/tstArray2d.hpp +++ b/grid/unit_test/tstArray2d.hpp @@ -460,13 +460,13 @@ void arrayBoundaryTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( array, array_test ) +TEST( Array, 2d ) { layoutTest(); arrayTest(); arrayOpTest(); } -TEST( array, array_boundary_test ) +TEST( Array, Boundary2d ) { arrayBoundaryTest(); arrayBoundaryTest(); diff --git a/grid/unit_test/tstArray3d.hpp b/grid/unit_test/tstArray3d.hpp index 75bea4576..3176a9aa1 100644 --- a/grid/unit_test/tstArray3d.hpp +++ b/grid/unit_test/tstArray3d.hpp @@ -487,13 +487,13 @@ void arrayBoundaryTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( array, array_test ) +TEST( Array, 3d ) { layoutTest(); arrayTest(); arrayOpTest(); } -TEST( array, array_boundary_test ) +TEST( Array, Boundary3d ) { arrayBoundaryTest(); arrayBoundaryTest(); diff --git a/grid/unit_test/tstBovWriter.hpp b/grid/unit_test/tstBovWriter.hpp index 95140b967..d85197e54 100644 --- a/grid/unit_test/tstBovWriter.hpp +++ b/grid/unit_test/tstBovWriter.hpp @@ -347,9 +347,9 @@ void writeTest2d() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, write_test_3d ) { writeTest3d(); } +TEST( Bov, Write3d ) { writeTest3d(); } -TEST( TEST_CATEGORY, write_test_2d ) { writeTest2d(); } +TEST( Bov, Write2d ) { writeTest2d(); } //---------------------------------------------------------------------------// diff --git a/grid/unit_test/tstFastFourierTransform.hpp b/grid/unit_test/tstFastFourierTransform.hpp index 079bc16e9..b2ca53085 100644 --- a/grid/unit_test/tstFastFourierTransform.hpp +++ b/grid/unit_test/tstFastFourierTransform.hpp @@ -228,7 +228,7 @@ void forwardReverseTest2d( bool use_default, bool use_params ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( fast_fourier_transform, forward_reverse_3d_test ) +TEST( FastFourier, ForwardReverse3d ) { // Dummy template argument. forwardReverseTest3d( true, true ); @@ -244,7 +244,7 @@ TEST( fast_fourier_transform, forward_reverse_3d_test ) #endif } -TEST( fast_fourier_transform, forward_reverse_2d_test ) +TEST( FastFourier, ForwardReverse2d ) { // Dummy template argument. forwardReverseTest2d( true, true ); diff --git a/grid/unit_test/tstGlobalGrid.hpp b/grid/unit_test/tstGlobalGrid.hpp index fe41d5440..1fb69afe9 100644 --- a/grid/unit_test/tstGlobalGrid.hpp +++ b/grid/unit_test/tstGlobalGrid.hpp @@ -598,7 +598,7 @@ void sparseGridTest3d() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( global_grid, 3d_grid_test ) +TEST( GlobalGrid, 3d ) { std::array periodic = { true, true, true }; gridTest3d( periodic ); @@ -606,7 +606,7 @@ TEST( global_grid, 3d_grid_test ) gridTest3d( not_periodic ); } -TEST( global_grid, 2d_grid_test ) +TEST( GlobalGrid, 2d ) { std::array periodic = { true, true }; gridTest2d( periodic ); @@ -614,7 +614,7 @@ TEST( global_grid, 2d_grid_test ) gridTest2d( not_periodic ); } -TEST( global_grid, 3d_sparse_grid_test ) { sparseGridTest3d(); } +TEST( GlobalGrid, 3dSparse ) { sparseGridTest3d(); } //---------------------------------------------------------------------------// diff --git a/grid/unit_test/tstGlobalMesh.hpp b/grid/unit_test/tstGlobalMesh.hpp index b31b1952d..47c8d07de 100644 --- a/grid/unit_test/tstGlobalMesh.hpp +++ b/grid/unit_test/tstGlobalMesh.hpp @@ -282,23 +282,23 @@ void nonUniformTest2d() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( mesh, uniform_test_3d ) +TEST( GlobalMesh, Uniform3d ) { uniformTest3D1(); uniformTest3D2(); uniformTest3D3(); } -TEST( mesh, uniform_test_2d ) +TEST( GlobalMesh, Uniform2d ) { uniformTest2D1(); uniformTest2D2(); uniformTest2D3(); } -TEST( mesh, non_uniform_test_3d ) { nonUniformTest3d(); } +TEST( GlobalMesh, NonUniform3d ) { nonUniformTest3d(); } -TEST( mesh, non_uniform_test_2d ) { nonUniformTest2d(); } +TEST( GlobalMesh, NonUniform2d ) { nonUniformTest2d(); } //---------------------------------------------------------------------------// diff --git a/grid/unit_test/tstGlobalParticleComm.hpp b/grid/unit_test/tstGlobalParticleComm.hpp index 99b40453f..2d9c72d33 100644 --- a/grid/unit_test/tstGlobalParticleComm.hpp +++ b/grid/unit_test/tstGlobalParticleComm.hpp @@ -244,8 +244,8 @@ void testMigrate2d() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( global_particle_comm, migrate_3d_test ) { testMigrate3d(); } +TEST( GlobalParticleComm, Migrate3d ) { testMigrate3d(); } -TEST( global_particle_comm, migrate_2d_test ) { testMigrate2d(); } +TEST( GlobalParticleComm, Migrate2d ) { testMigrate2d(); } } // namespace Test diff --git a/grid/unit_test/tstHalo2d.hpp b/grid/unit_test/tstHalo2d.hpp index cb61aa433..e086ecf6d 100644 --- a/grid/unit_test/tstHalo2d.hpp +++ b/grid/unit_test/tstHalo2d.hpp @@ -378,7 +378,7 @@ void scatterReduceTest( const ReduceFunc& reduce ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, not_periodic_test ) +TEST( Halo, NonPeriodic2d ) { // Let MPI compute the partitioning for this test. int comm_size; @@ -403,7 +403,7 @@ TEST( TEST_CATEGORY, not_periodic_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, periodic_test ) +TEST( Halo, Periodic2d ) { // Let MPI compute the partitioning for this test. int comm_size; @@ -429,19 +429,13 @@ TEST( TEST_CATEGORY, periodic_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, scatter_reduce_max_test ) -{ - scatterReduceTest( ScatterReduce::Max() ); -} +TEST( Halo, ScatterReduceMax2d ) { scatterReduceTest( ScatterReduce::Max() ); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, scatter_reduce_min_test ) -{ - scatterReduceTest( ScatterReduce::Min() ); -} +TEST( Halo, ScatterReduceMin2d ) { scatterReduceTest( ScatterReduce::Min() ); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, scatter_reduce_replace_test ) +TEST( Halo, ScatterReduceReplace2d ) { scatterReduceTest( ScatterReduce::Replace() ); } diff --git a/grid/unit_test/tstHalo3d.hpp b/grid/unit_test/tstHalo3d.hpp index 2ba3f0b6a..57effa3b7 100644 --- a/grid/unit_test/tstHalo3d.hpp +++ b/grid/unit_test/tstHalo3d.hpp @@ -449,7 +449,7 @@ void scatterReduceTest( const ReduceFunc& reduce ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, not_periodic_test ) +TEST( Halo, NonPeriodic3d ) { // Let MPI compute the partitioning for this test. int comm_size; @@ -486,7 +486,7 @@ TEST( TEST_CATEGORY, not_periodic_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, periodic_test ) +TEST( Halo, Periodic3d ) { // Let MPI compute the partitioning for this test. int comm_size; @@ -523,19 +523,13 @@ TEST( TEST_CATEGORY, periodic_test ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, scatter_reduce_max_test ) -{ - scatterReduceTest( ScatterReduce::Max() ); -} +TEST( Halo, ScatterReduceMax3d ) { scatterReduceTest( ScatterReduce::Max() ); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, scatter_reduce_min_test ) -{ - scatterReduceTest( ScatterReduce::Min() ); -} +TEST( Halo, ScatterReduceMin3d ) { scatterReduceTest( ScatterReduce::Min() ); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, scatter_reduce_replace_test ) +TEST( Halo, ScatterReduceReplace3d ) { scatterReduceTest( ScatterReduce::Replace() ); } diff --git a/grid/unit_test/tstHypreSemiStructuredSolver.hpp b/grid/unit_test/tstHypreSemiStructuredSolver.hpp index f638f9d0f..060994f69 100644 --- a/grid/unit_test/tstHypreSemiStructuredSolver.hpp +++ b/grid/unit_test/tstHypreSemiStructuredSolver.hpp @@ -223,32 +223,32 @@ poissonTest( const std::string& solver_type, const std::string& precond_type, //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( semi_structured_solver, pcg_none_test ) +TEST( HypreSemiStructuredSolver, PCGnone ) { poissonTest( "PCG", "none", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, gmres_none_test ) +TEST( HypreSemiStructuredSolver, GMRESnone ) { poissonTest( "GMRES", "none", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, bicgstab_none_test ) +TEST( HypreSemiStructuredSolver, BiCGSTABnone ) { poissonTest( "BiCGSTAB", "none", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, pcg_diag_test ) +TEST( HypreSemiStructuredSolver, PCGdiag ) { poissonTest( "PCG", "Diagonal", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, gmres_diag_test ) +TEST( HypreSemiStructuredSolver, GMRESdiag ) { poissonTest( "GMRES", "Diagonal", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, bicgstab_diag_test ) +TEST( HypreSemiStructuredSolver, BiCGSTABdiag ) { poissonTest( "BiCGSTAB", "Diagonal", TEST_MEMSPACE{} ); } diff --git a/grid/unit_test/tstHypreSemiStructuredSolverMulti.hpp b/grid/unit_test/tstHypreSemiStructuredSolverMulti.hpp index a712034eb..d8cd48bd5 100644 --- a/grid/unit_test/tstHypreSemiStructuredSolverMulti.hpp +++ b/grid/unit_test/tstHypreSemiStructuredSolverMulti.hpp @@ -243,32 +243,32 @@ poissonTest( const std::string& solver_type, const std::string& precond_type, //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( semi_structured_solver, pcg_none_test ) +TEST( HypreSemiStructuredSolver, PCGnone ) { poissonTest( "PCG", "none", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, gmres_none_test ) +TEST( HypreSemiStructuredSolver, GMRESnone ) { poissonTest( "GMRES", "none", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, bicgstab_none_test ) +TEST( HypreSemiStructuredSolver, BiCGSTABnone ) { poissonTest( "BiCGSTAB", "none", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, pcg_diag_test ) +TEST( HypreSemiStructuredSolver, PCGdiag ) { poissonTest( "PCG", "Diagonal", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, gmres_diag_test ) +TEST( HypreSemiStructuredSolver, GMRESdiag ) { poissonTest( "GMRES", "Diagonal", TEST_MEMSPACE{} ); } -TEST( semi_structured_solver, bicgstab_diag_test ) +TEST( HypreSemiStructuredSolver, BiCGSTABdiag ) { poissonTest( "BiCGSTAB", "Diagonal", TEST_MEMSPACE{} ); } diff --git a/grid/unit_test/tstHypreStructuredSolver2d.hpp b/grid/unit_test/tstHypreStructuredSolver2d.hpp index 0310d85e5..610dc0131 100644 --- a/grid/unit_test/tstHypreStructuredSolver2d.hpp +++ b/grid/unit_test/tstHypreStructuredSolver2d.hpp @@ -210,52 +210,52 @@ poissonTest( const std::string& solver_type, const std::string& precond_type, //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( structured_solver, pcg_none_test ) +TEST( HypreStructuredSolver, PCGnone2d ) { poissonTest( "PCG", "none", TEST_MEMSPACE{} ); } -TEST( structured_solver, gmres_none_test ) +TEST( HypreStructuredSolver, GMRESnone2d ) { poissonTest( "GMRES", "none", TEST_MEMSPACE{} ); } -TEST( structured_solver, bicgstab_none_test ) +TEST( HypreStructuredSolver, BiCGSTABnone2d ) { poissonTest( "BiCGSTAB", "none", TEST_MEMSPACE{} ); } -TEST( structured_solver, pfmg_none_test ) +TEST( HypreStructuredSolver, PFMGnone2d ) { poissonTest( "PFMG", "none", TEST_MEMSPACE{} ); } -TEST( structured_solver, pcg_diag_test ) +TEST( HypreStructuredSolver, PCGdiag2d ) { poissonTest( "PCG", "Diagonal", TEST_MEMSPACE{} ); } -TEST( structured_solver, gmres_diag_test ) +TEST( HypreStructuredSolver, GMRESdiag2d ) { poissonTest( "GMRES", "Diagonal", TEST_MEMSPACE{} ); } -TEST( structured_solver, bicgstab_diag_test ) +TEST( HypreStructuredSolver, BiCGSTABdiag2d ) { poissonTest( "BiCGSTAB", "Diagonal", TEST_MEMSPACE{} ); } -TEST( structured_solver, pcg_jacobi_test ) +TEST( HypreStructuredSolver, PCGjacobi2d ) { poissonTest( "PCG", "Jacobi", TEST_MEMSPACE{} ); } -TEST( structured_solver, gmres_jacobi_test ) +TEST( HypreStructuredSolver, GMRESjacobi2d ) { poissonTest( "GMRES", "Jacobi", TEST_MEMSPACE{} ); } -TEST( structured_solver, bicgstab_jacobi_test ) +TEST( HypreStructuredSolver, BiCGSTABjacobi2d ) { poissonTest( "BiCGSTAB", "Jacobi", TEST_MEMSPACE{} ); } diff --git a/grid/unit_test/tstHypreStructuredSolver3d.hpp b/grid/unit_test/tstHypreStructuredSolver3d.hpp index 8c3d16466..ec2543370 100644 --- a/grid/unit_test/tstHypreStructuredSolver3d.hpp +++ b/grid/unit_test/tstHypreStructuredSolver3d.hpp @@ -224,52 +224,52 @@ poissonTest( const std::string& solver_type, const std::string& precond_type, //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( structured_solver, pcg_none_test ) +TEST( HypreStructuredSolver, PCGnone3d ) { poissonTest( "PCG", "none", TEST_MEMSPACE{} ); } -TEST( structured_solver, gmres_none_test ) +TEST( HypreStructuredSolver, GMRESnone3d ) { poissonTest( "GMRES", "none", TEST_MEMSPACE{} ); } -TEST( structured_solver, bicgstab_none_test ) +TEST( HypreStructuredSolver, BiCGSTABnone3d ) { poissonTest( "BiCGSTAB", "none", TEST_MEMSPACE{} ); } -TEST( structured_solver, pfmg_none_test ) +TEST( HypreStructuredSolver, PFMGnone3d ) { poissonTest( "PFMG", "none", TEST_MEMSPACE{} ); } -TEST( structured_solver, pcg_diag_test ) +TEST( HypreStructuredSolver, PCGdiag3d ) { poissonTest( "PCG", "Diagonal", TEST_MEMSPACE{} ); } -TEST( structured_solver, gmres_diag_test ) +TEST( HypreStructuredSolver, GMRESdiag3d ) { poissonTest( "GMRES", "Diagonal", TEST_MEMSPACE{} ); } -TEST( structured_solver, bicgstab_diag_test ) +TEST( HypreStructuredSolver, BiCGSTABdiag3d ) { poissonTest( "BiCGSTAB", "Diagonal", TEST_MEMSPACE{} ); } -TEST( structured_solver, pcg_jacobi_test ) +TEST( HypreStructuredSolver, PCGjacobi3d ) { poissonTest( "PCG", "Jacobi", TEST_MEMSPACE{} ); } -TEST( structured_solver, gmres_jacobi_test ) +TEST( HypreStructuredSolver, GMRESjacobi3d ) { poissonTest( "GMRES", "Jacobi", TEST_MEMSPACE{} ); } -TEST( structured_solver, bicgstab_jacobi_test ) +TEST( HypreStructuredSolver, BiCGSTABjacobi3d ) { poissonTest( "BiCGSTAB", "Jacobi", TEST_MEMSPACE{} ); } diff --git a/grid/unit_test/tstIndexConversion.hpp b/grid/unit_test/tstIndexConversion.hpp index 172101ecc..5e2a0d99a 100644 --- a/grid/unit_test/tstIndexConversion.hpp +++ b/grid/unit_test/tstIndexConversion.hpp @@ -233,104 +233,104 @@ void testConversion2d( const std::array& is_dim_periodic ) //---------------------------------------------------------------------------// // 3d -TEST( index_conversion, node_periodic_3d_test ) +TEST( IndexConversion, NodePeriodic3d ) { testConversion3d( { { true, true, true } } ); } -TEST( index_conversion, cell_periodic_3d_test ) +TEST( IndexConversion, CellPeriodic3d ) { testConversion3d( { { true, true, true } } ); } -TEST( index_conversion, face_i_periodic_3d_test ) +TEST( IndexConversion, FaceIPeriodic3d ) { testConversion3d>( { { true, true, true } } ); } -TEST( index_conversion, face_j_periodic_3d_test ) +TEST( IndexConversion, FaceJPeriodic3d ) { testConversion3d>( { { true, true, true } } ); } -TEST( index_conversion, face_k_periodic_3d_test ) +TEST( IndexConversion, FaceKPeriodic3d ) { testConversion3d>( { { true, true, true } } ); } -TEST( index_conversion, edge_i_periodic_3d_test ) +TEST( IndexConversion, EdgeIPeriodic3d ) { testConversion3d>( { { true, true, true } } ); } -TEST( index_conversion, edge_j_periodic_3d_test ) +TEST( IndexConversion, EdgeJPeriodic3d ) { testConversion3d>( { { true, true, true } } ); } -TEST( index_conversion, edge_k_periodic_3d_test ) +TEST( IndexConversion, EdgeKPeriodic3d ) { testConversion3d>( { { true, true, true } } ); } -TEST( index_conversion, node_not_periodic_3d_test ) +TEST( IndexConversion, NodeNonPeriodic3d ) { testConversion3d( { { false, false, false } } ); } -TEST( index_conversion, cell_not_periodic_3d_test ) +TEST( IndexConversion, CellNonPeriodic3d ) { testConversion3d( { { false, false, false } } ); } -TEST( index_conversion, face_i_not_periodic_3d_test ) +TEST( IndexConversion, FaceINonPeriodic3d ) { testConversion3d>( { { false, false, false } } ); } -TEST( index_conversion, face_j_not_periodic_3d_test ) +TEST( IndexConversion, FaceJNonPeriodic3d ) { testConversion3d>( { { false, false, false } } ); } -TEST( index_conversion, face_k_not_periodic_3d_test ) +TEST( IndexConversion, FaceKNonPeriodic3d ) { testConversion3d>( { { false, false, false } } ); } -TEST( index_conversion, edge_i_not_periodic_3d_test ) +TEST( IndexConversion, EdgeINonPeriodic3d ) { testConversion3d>( { { false, false, false } } ); } -TEST( index_conversion, edge_j_not_periodic_3d_test ) +TEST( IndexConversion, EdgeJNonPeriodic3d ) { testConversion3d>( { { false, false, false } } ); } -TEST( index_conversion, edge_k_not_periodic_3d_test ) +TEST( IndexConversion, EdgeKNonPeriodic3d ) { testConversion3d>( { { false, false, false } } ); } //---------------------------------------------------------------------------// // 2d -TEST( index_conversion, node_periodic_2d_test ) +TEST( IndexConversion, NodePeriodic2d ) { testConversion3d( { { true, true } } ); } -TEST( index_conversion, cell_periodic_2d_test ) +TEST( IndexConversion, CellPeriodic2d ) { testConversion3d( { { true, true } } ); } -TEST( index_conversion, face_i_periodic_2d_test ) +TEST( IndexConversion, FaceIPeriodic2d ) { testConversion3d>( { { true, true } } ); } -TEST( index_conversion, face_j_periodic_2d_test ) +TEST( IndexConversion, FaceJPeriodic2d ) { testConversion3d>( { { true, true } } ); } -TEST( index_conversion, node_not_periodic_2d_test ) +TEST( IndexConversion, NodeNonPeriodic2d ) { testConversion3d( { { false, false } } ); } -TEST( index_conversion, cell_not_periodic_2d_test ) +TEST( IndexConversion, CellNonPeriodic2d ) { testConversion3d( { { false, false } } ); } -TEST( index_conversion, face_i_not_periodic_2d_test ) +TEST( IndexConversion, FaceINonPeriodic2d ) { testConversion3d>( { { false, false } } ); } -TEST( index_conversion, face_j_not_periodic_2d_test ) +TEST( IndexConversion, FaceJNonPeriodic2d ) { testConversion3d>( { { false, false } } ); } diff --git a/grid/unit_test/tstIndexSpace.hpp b/grid/unit_test/tstIndexSpace.hpp index e01a30e95..730d91ba1 100644 --- a/grid/unit_test/tstIndexSpace.hpp +++ b/grid/unit_test/tstIndexSpace.hpp @@ -587,7 +587,7 @@ void inRangeTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, index_space_test ) +TEST( IndexSpace, Test ) { sizeConstructorTest(); rangeConstructorTest(); diff --git a/grid/unit_test/tstInterpolation2d.hpp b/grid/unit_test/tstInterpolation2d.hpp index 8cd8ee88b..a54bf193d 100644 --- a/grid/unit_test/tstInterpolation2d.hpp +++ b/grid/unit_test/tstInterpolation2d.hpp @@ -238,7 +238,7 @@ void interpolationTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( interpolation, interpolation_test ) { interpolationTest(); } +TEST( Interpolation, 2d ) { interpolationTest(); } //---------------------------------------------------------------------------// diff --git a/grid/unit_test/tstInterpolation3d.hpp b/grid/unit_test/tstInterpolation3d.hpp index c03c99c93..d83d38329 100644 --- a/grid/unit_test/tstInterpolation3d.hpp +++ b/grid/unit_test/tstInterpolation3d.hpp @@ -253,7 +253,7 @@ void interpolationTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( interpolation, interpolation_test ) { interpolationTest(); } +TEST( Interpolation, 3d ) { interpolationTest(); } //---------------------------------------------------------------------------// diff --git a/grid/unit_test/tstLoadBalancer.hpp b/grid/unit_test/tstLoadBalancer.hpp index cf57c66fb..6bb4884af 100644 --- a/grid/unit_test/tstLoadBalancer.hpp +++ b/grid/unit_test/tstLoadBalancer.hpp @@ -497,23 +497,11 @@ void lbTest2dMinSizeArray() } // RUN TESTS //---------------------------------------------------------------------------// -TEST( load_balancer, 3d_lb_test ) { lbTest3d(); } -TEST( load_balancer, 3d_lb_test_min_domain_size_scalar ) -{ - lbTest3dMinSizeScalar(); -} -TEST( load_balancer, 3d_lb_test_min_domain_size_array ) -{ - lbTest3dMinSizeArray(); -} -TEST( load_balancer, 2d_lb_test ) { lbTest2d(); } -TEST( load_balancer, 2d_lb_test_min_domain_size_scalar ) -{ - lbTest2dMinSizeScalar(); -} -TEST( load_balancer, 2d_lb_test_min_domain_size_array ) -{ - lbTest2dMinSizeArray(); -} +TEST( AllLoadBalancer, 3d ) { lbTest3d(); } +TEST( AllLoadBalancer, MinDomainScalar3d ) { lbTest3dMinSizeScalar(); } +TEST( AllLoadBalancer, MinDomainArray3d ) { lbTest3dMinSizeArray(); } +TEST( AllLoadBalancer, 2d ) { lbTest2d(); } +TEST( AllLoadBalancer, MinDomainScalar2d ) { lbTest2dMinSizeScalar(); } +TEST( AllLoadBalancer, MinDomainArray2d ) { lbTest2dMinSizeArray(); } //---------------------------------------------------------------------------// } // end namespace Test diff --git a/grid/unit_test/tstLocalGrid.hpp b/grid/unit_test/tstLocalGrid.hpp index 790bc489a..49e113264 100644 --- a/grid/unit_test/tstLocalGrid.hpp +++ b/grid/unit_test/tstLocalGrid.hpp @@ -3342,19 +3342,19 @@ void mutabilityTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( local_grid, 3d_api_test ) +TEST( LocalGrid, 3d ) { periodicTest3d(); notPeriodicTest3d(); } -TEST( local_grid, 2d_api_test ) +TEST( LocalGrid, 2d ) { periodicTest2d(); notPeriodicTest2d(); } -TEST( local_grid, mutability_test ) { mutabilityTest(); } +TEST( LocalGrid, Mutability ) { mutabilityTest(); } //---------------------------------------------------------------------------// diff --git a/grid/unit_test/tstLocalMesh2d.hpp b/grid/unit_test/tstLocalMesh2d.hpp index 83b747c3d..af2439ff3 100644 --- a/grid/unit_test/tstLocalMesh2d.hpp +++ b/grid/unit_test/tstLocalMesh2d.hpp @@ -507,7 +507,7 @@ void irregularTest2d( const std::array& ranks_per_dim ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( mesh, periodic_uniform_test ) +TEST( LocalMesh, PeriodicUniform2d ) { std::array is_dim_periodic = { true, true }; @@ -529,7 +529,7 @@ TEST( mesh, periodic_uniform_test ) } //---------------------------------------------------------------------------// -TEST( mesh, periodic_non_uniform_test ) +TEST( LocalMesh, PeriodicNonUniform2d ) { std::array is_dim_periodic = { true, true }; @@ -551,7 +551,7 @@ TEST( mesh, periodic_non_uniform_test ) } //---------------------------------------------------------------------------// -TEST( mesh, non_periodic_uniform_test ) +TEST( LocalMesh, NonPeriodicUniform2d ) { std::array is_dim_periodic = { false, false }; @@ -573,7 +573,7 @@ TEST( mesh, non_periodic_uniform_test ) } //---------------------------------------------------------------------------// -TEST( mesh, non_periodic_non_uniform_test ) +TEST( LocalMesh, NonPeriodicNonUniform2d ) { std::array is_dim_periodic = { false, false }; @@ -595,7 +595,7 @@ TEST( mesh, non_periodic_non_uniform_test ) } //---------------------------------------------------------------------------// -TEST( mesh, irregular_non_uniform_test ) +TEST( LocalMesh, IrregularNonUniform2d ) { // Let MPI compute the partitioning for this test. int comm_size; diff --git a/grid/unit_test/tstLocalMesh3d.hpp b/grid/unit_test/tstLocalMesh3d.hpp index 140e412a5..ec0bda4d4 100644 --- a/grid/unit_test/tstLocalMesh3d.hpp +++ b/grid/unit_test/tstLocalMesh3d.hpp @@ -766,7 +766,7 @@ void irregularTest3d( const std::array& ranks_per_dim ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( mesh, periodic_uniform_test ) +TEST( LocalMesh, PeriodicUniform3d ) { std::array is_dim_periodic = { true, true, true }; @@ -798,7 +798,7 @@ TEST( mesh, periodic_uniform_test ) } //---------------------------------------------------------------------------// -TEST( mesh, periodic_non_uniform_test ) +TEST( LocalMesh, PeriodicNonUniform3d ) { std::array is_dim_periodic = { true, true, true }; @@ -830,7 +830,7 @@ TEST( mesh, periodic_non_uniform_test ) } //---------------------------------------------------------------------------// -TEST( mesh, non_periodic_uniform_test ) +TEST( LocalMesh, NonPeriodicUniform3d ) { std::array is_dim_periodic = { false, false, false }; @@ -862,7 +862,7 @@ TEST( mesh, non_periodic_uniform_test ) } //---------------------------------------------------------------------------// -TEST( mesh, non_periodic_non_uniform_test ) +TEST( LocalMesh, NonPeriodicNonUniform3d ) { std::array is_dim_periodic = { false, false, false }; @@ -894,7 +894,7 @@ TEST( mesh, non_periodic_non_uniform_test ) } //---------------------------------------------------------------------------// -TEST( mesh, irregular_non_uniform_test ) +TEST( LocalMesh, IrregularNonUniform3d ) { // Let MPI compute the partitioning for this test. int comm_size; diff --git a/grid/unit_test/tstParallel.hpp b/grid/unit_test/tstParallel.hpp index fc50a9141..f1db87307 100644 --- a/grid/unit_test/tstParallel.hpp +++ b/grid/unit_test/tstParallel.hpp @@ -399,11 +399,11 @@ void parallelMultiSpaceTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, parallel_index_space_test ) { parallelIndexSpaceTest(); } +TEST( Parallel, IndexSpace ) { parallelIndexSpaceTest(); } -TEST( TEST_CATEGORY, parallel_local_grid_test ) { parallelLocalGridTest(); } +TEST( Parallel, LocalGrid ) { parallelLocalGridTest(); } -TEST( TEST_CATEGORY, parallel_multispace_test ) { parallelMultiSpaceTest(); } +TEST( Parallel, Multispace ) { parallelMultiSpaceTest(); } //---------------------------------------------------------------------------// diff --git a/grid/unit_test/tstParticleDistributor2d.hpp b/grid/unit_test/tstParticleDistributor2d.hpp index b6b67b58b..95ff07757 100644 --- a/grid/unit_test/tstParticleDistributor2d.hpp +++ b/grid/unit_test/tstParticleDistributor2d.hpp @@ -384,13 +384,13 @@ void testParticleMigrate( const bool periodic ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, not_periodic_test ) { testParticleMigrate( false ); } +TEST( ParticleDistributor, NonPeriodic2d ) { testParticleMigrate( false ); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, periodic_test ) { testParticleMigrate( true ); } +TEST( ParticleDistributor, Periodic2d ) { testParticleMigrate( true ); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, local_only_test ) +TEST( ParticleDistributor, LocalOnly2d ) { // Let MPI compute the partitioning for this test. int comm_size; @@ -411,7 +411,7 @@ TEST( TEST_CATEGORY, local_only_test ) //---------------------------------------------------------------------------// //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, remove_outside_domain_test ) +TEST( ParticleDistributor, RemoveOutsideDomain2d ) { // Let MPI compute the partitioning for this test. int comm_size; diff --git a/grid/unit_test/tstParticleDistributor3d.hpp b/grid/unit_test/tstParticleDistributor3d.hpp index b9492b619..36e00c4c3 100644 --- a/grid/unit_test/tstParticleDistributor3d.hpp +++ b/grid/unit_test/tstParticleDistributor3d.hpp @@ -413,13 +413,13 @@ void testParticleMigrate( const bool periodic ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, not_periodic_test ) { testParticleMigrate( false ); } +TEST( ParticleDistributor, NonPeriodic3d ) { testParticleMigrate( false ); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, periodic_test ) { testParticleMigrate( true ); } +TEST( ParticleDistributor, Periodic3d ) { testParticleMigrate( true ); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, local_only_test ) +TEST( ParticleDistributor, LocalOnly3d ) { // Let MPI compute the partitioning for this test. int comm_size; @@ -440,7 +440,7 @@ TEST( TEST_CATEGORY, local_only_test ) //---------------------------------------------------------------------------// //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, remove_outside_domain_test ) +TEST( ParticleDistributor, RemoveOutsideDomain3d ) { // Let MPI compute the partitioning for this test. int comm_size; diff --git a/grid/unit_test/tstParticleInit.hpp b/grid/unit_test/tstParticleInit.hpp index 0182444c1..a5f720249 100644 --- a/grid/unit_test/tstParticleInit.hpp +++ b/grid/unit_test/tstParticleInit.hpp @@ -228,25 +228,25 @@ void initSliceTest( InitType init_type, int ppc, const int multiplier = 1 ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, random_init_test ) +TEST( ParticleInit, Random ) { initParticleListTest( Cabana::InitRandom(), 17 ); initSliceTest( Cabana::InitRandom(), 12 ); } -TEST( TEST_CATEGORY, uniform_init_test ) +TEST( ParticleInit, Uniform ) { initParticleListTest( Cabana::InitUniform(), 3 ); initSliceTest( Cabana::InitUniform(), 2 ); } -TEST( TEST_CATEGORY, multiple_random_init_test ) +TEST( ParticleInit, MultipleRandom ) { initParticleListTest( Cabana::InitRandom(), 5, 4 ); initSliceTest( Cabana::InitRandom(), 9, 3 ); } -TEST( TEST_CATEGORY, multiple_uniform_init_test ) +TEST( ParticleInit, MultipleUniform ) { initParticleListTest( Cabana::InitUniform(), 2, 5 ); initSliceTest( Cabana::InitRandom(), 2, 3 ); diff --git a/grid/unit_test/tstParticleList.hpp b/grid/unit_test/tstParticleList.hpp index 68de431d1..b4bbdd3fd 100644 --- a/grid/unit_test/tstParticleList.hpp +++ b/grid/unit_test/tstParticleList.hpp @@ -26,7 +26,7 @@ namespace Test //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, particle_test ) +TEST( ParticleList, Test ) { // Create the global mesh. std::array low_corner = { -1.2, 0.1, 1.1 }; diff --git a/grid/unit_test/tstPartitioner.hpp b/grid/unit_test/tstPartitioner.hpp index b0bc1ac9d..5fc282bbf 100644 --- a/grid/unit_test/tstPartitioner.hpp +++ b/grid/unit_test/tstPartitioner.hpp @@ -231,13 +231,13 @@ void testManualPartitioner2d() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, partitioner_owned_cell_info_test_3d ) +TEST( Partitioner, OwnedCellInfo3d ) { testBlockPartitioner3d(); testManualPartitioner3d(); } -TEST( TEST_CATEGORY, partitioner_owned_cell_info_test_2d ) +TEST( Partitioner, OwnedCellInfo2d ) { testBlockPartitioner2d(); testManualPartitioner2d(); diff --git a/grid/unit_test/tstSiloParticleOutput.hpp b/grid/unit_test/tstSiloParticleOutput.hpp index f86a1c7fe..8307bd59a 100644 --- a/grid/unit_test/tstSiloParticleOutput.hpp +++ b/grid/unit_test/tstSiloParticleOutput.hpp @@ -159,7 +159,7 @@ void writeTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, write_test ) { writeTest(); } +TEST( Silo, Write ) { writeTest(); } //---------------------------------------------------------------------------// diff --git a/grid/unit_test/tstSparseArray.hpp b/grid/unit_test/tstSparseArray.hpp index 7a996d5d4..b7a57c288 100644 --- a/grid/unit_test/tstSparseArray.hpp +++ b/grid/unit_test/tstSparseArray.hpp @@ -604,13 +604,13 @@ void full_occupy_test( EntityType entity ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( sparse_array, 3d_sparse_array_sparse_occupy ) +TEST( SparseArray, SparseOccupation ) { sparse_array_test( 100, Node() ); sparse_array_test( 20, Cell() ); } -TEST( sparse_array, 3d_sparse_array_full_occupy ) +TEST( SparseArray, FullOccupation ) { full_occupy_test( Node() ); full_occupy_test( Cell() ); diff --git a/grid/unit_test/tstSparseDimPartitioner.hpp b/grid/unit_test/tstSparseDimPartitioner.hpp index da789bde2..6f888b847 100644 --- a/grid/unit_test/tstSparseDimPartitioner.hpp +++ b/grid/unit_test/tstSparseDimPartitioner.hpp @@ -458,15 +458,12 @@ void random_distribution_automatic_rank( int occupy_num_per_rank, //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( sparse_dim_partitioner, sparse_dim_partitioner_uniform_test ) -{ - uniform_distribution_automatic_rank(); -} -TEST( sparse_dim_partitioner, sparse_dim_partitioner_random_tile_test ) +TEST( SparseDimPartitioner, Uniform ) { uniform_distribution_automatic_rank(); } +TEST( SparseDimPartitioner, RandomTile ) { random_distribution_automatic_rank( 32, true ); } -TEST( sparse_dim_partitioner, sparse_dim_partitioner_random_par_test ) +TEST( SparseDimPartitioner, RandomParticle ) { random_distribution_automatic_rank( 50, false ); } diff --git a/grid/unit_test/tstSparseHalo.hpp b/grid/unit_test/tstSparseHalo.hpp index f82888b7e..ee51363c1 100644 --- a/grid/unit_test/tstSparseHalo.hpp +++ b/grid/unit_test/tstSparseHalo.hpp @@ -641,7 +641,7 @@ void haloScatterAndGatherTest( ReduceOp reduce_op, EntityType entity ) } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, sparse_halo_scatter_and_gather_sum ) +TEST( SparseHalo, ScatterGatherSum ) { haloScatterAndGatherTest( ScatterReduce::Sum(), Node() ); } @@ -649,7 +649,7 @@ TEST( TEST_CATEGORY, sparse_halo_scatter_and_gather_sum ) // TODO: test min/max // no need to check replace op since it is already called and tested inside // SparseHalo::gather(...)" -// TEST( TEST_CATEGORY, sparse_halo_scatter_and_gather_max ) {} -// TEST( TEST_CATEGORY, sparse_halo_scatter_and_gather_min ) {} +// TEST( SparseHalo, ScatterGatherMax ) {} +// TEST( SparseHalo, ScatterGatherMin ) {} }; // end namespace Test diff --git a/grid/unit_test/tstSparseIndexSpace.hpp b/grid/unit_test/tstSparseIndexSpace.hpp index fdd882373..8aacbe2fd 100644 --- a/grid/unit_test/tstSparseIndexSpace.hpp +++ b/grid/unit_test/tstSparseIndexSpace.hpp @@ -717,31 +717,31 @@ void tileIndexSpaceTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, atomic_test ) +TEST( SparseIndexSpace, Atomic ) { testAtomicOr(); testAtomicOrPro(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, tile_space_test ) +TEST( SparseIndexSpace, TileSpace ) { testTileSpace<2, 4>(); // tile size 4x4x4 } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, block_space_test ) +TEST( SparseIndexSpace, BlockSpace ) { testBlockSpace(); testBlockSpace(); } //---------------------------------------------------------------------------// -TEST( TEST_CATEGORY, sparse_map_space_test ) +TEST( SparseIndexSpace, SparseMapSpace ) { testSparseMapFullInsert(); testSparseMapSparseInsert(); testSparseMapReinsert(); } -TEST( TEST_CATEGORY, tile_index_space_test ) { tileIndexSpaceTest(); } +TEST( SparseIndexSpace, TileIndexSpace ) { tileIndexSpaceTest(); } //---------------------------------------------------------------------------// } // end namespace Test diff --git a/grid/unit_test/tstSparseLocalGrid.hpp b/grid/unit_test/tstSparseLocalGrid.hpp index b0fb43c27..5f9469903 100644 --- a/grid/unit_test/tstSparseLocalGrid.hpp +++ b/grid/unit_test/tstSparseLocalGrid.hpp @@ -469,7 +469,7 @@ void sparseLocalGridTest( EntityType t2 ) //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( sparse_local_grid, 3d_sprase_local_grid ) +TEST( SparseLocalGrid, Test ) { // Currently, periodic BC is not supported in Sparse Grid sparseLocalGridTest( Cell() ); diff --git a/grid/unit_test/tstSplineEvaluation2d.hpp b/grid/unit_test/tstSplineEvaluation2d.hpp index f2c0dcc1c..fe6397034 100644 --- a/grid/unit_test/tstSplineEvaluation2d.hpp +++ b/grid/unit_test/tstSplineEvaluation2d.hpp @@ -429,7 +429,7 @@ void splineEvaluationTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( splines, eval_test ) +TEST( Splines, Eval2d ) { // Check with default data members on spline data. splineEvaluationTest(); diff --git a/grid/unit_test/tstSplineEvaluation3d.hpp b/grid/unit_test/tstSplineEvaluation3d.hpp index 155ca9758..48a0bc996 100644 --- a/grid/unit_test/tstSplineEvaluation3d.hpp +++ b/grid/unit_test/tstSplineEvaluation3d.hpp @@ -499,7 +499,7 @@ void splineEvaluationTest() //---------------------------------------------------------------------------// // RUN TESTS //---------------------------------------------------------------------------// -TEST( splines, eval_test ) +TEST( Splines, Eval3d ) { // Check with default data members on spline data. splineEvaluationTest(); diff --git a/grid/unit_test/tstSplines.hpp b/grid/unit_test/tstSplines.hpp index bfb777607..6d32f3269 100644 --- a/grid/unit_test/tstSplines.hpp +++ b/grid/unit_test/tstSplines.hpp @@ -22,7 +22,7 @@ namespace Test //---------------------------------------------------------------------------// // TESTS //---------------------------------------------------------------------------// -TEST( splines, zero_spline_test ) +TEST( Splines, Zero ) { // Check partition of unity for the quadratic spline. double xp = -1.4; @@ -81,7 +81,7 @@ TEST( splines, zero_spline_test ) EXPECT_FLOAT_EQ( field_grad, 0.0 ); } -TEST( splines, linear_spline_test ) +TEST( Splines, Linear ) { // Check partition of unity for the linear spline. double xp = -1.4; @@ -143,7 +143,7 @@ TEST( splines, linear_spline_test ) EXPECT_FLOAT_EQ( field_grad, grid_deriv( xp ) ); } -TEST( splines, quadratic_spline_test ) +TEST( Splines, Quadratic ) { // Check partition of unity for the quadratic spline. double xp = -1.4; @@ -211,7 +211,7 @@ TEST( splines, quadratic_spline_test ) EXPECT_FLOAT_EQ( field_grad, grid_deriv( xp ) ); } -TEST( splines, cubic_spline_test ) +TEST( Splines, Cubic ) { // Check partition of unity for the cubic spline. double xp = -1.4;