From d1c08e85e754c1339cc0adc2153634dc667126c1 Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Thu, 9 Nov 2023 21:03:48 -0500 Subject: [PATCH] Rename janatests to jana-unit-tests This makes it symmetric with jana-perf-tests, and also easier for people to understand what's going on. --- .github/workflows/ccpp-docker.yml | 2 +- .github/workflows/ccpp-epscimac.yml | 2 +- .github/workflows/ccpp-linux.yml | 4 ++-- .github/workflows/ccpp-macos.yml | 4 ++-- CMakeLists.txt | 2 +- src/examples/UnitTestingExample/CMakeLists.txt | 2 +- .../{tests => unit_tests}/ArrowActivationTests.cc | 0 src/programs/{tests => unit_tests}/ArrowFixtures.h | 0 .../{tests => unit_tests}/BarrierEventTests.cc | 0 src/programs/{tests => unit_tests}/BarrierEventTests.h | 0 src/programs/{tests => unit_tests}/CMakeLists.txt | 10 +++++----- src/programs/{tests => unit_tests}/ExactlyOnceTests.cc | 0 src/programs/{tests => unit_tests}/ExactlyOnceTests.h | 0 src/programs/{tests => unit_tests}/GetObjectsTests.cc | 0 .../{tests => unit_tests}/JAutoactivableTests.cc | 0 .../{tests => unit_tests}/JCallGraphRecorderTests.cc | 0 .../{tests => unit_tests}/JEventGetAllTests.cc | 0 src/programs/{tests => unit_tests}/JEventGroupTests.cc | 0 .../JEventProcessorSequentialTests.cc | 0 src/programs/{tests => unit_tests}/JEventTests.cc | 0 src/programs/{tests => unit_tests}/JEventTests.h | 0 .../{tests => unit_tests}/JFactoryDefTagsTests.cc | 0 src/programs/{tests => unit_tests}/JFactoryTests.cc | 0 src/programs/{tests => unit_tests}/JFactoryTests.h | 0 .../{tests => unit_tests}/JMultiFactoryTests.cc | 0 src/programs/{tests => unit_tests}/JObjectTests.cc | 0 .../{tests => unit_tests}/JParameterManagerTests.cc | 0 .../{tests => unit_tests}/JServiceLocatorTests.cc | 0 .../{tests => unit_tests}/JServiceLocatorTests.h | 0 src/programs/{tests => unit_tests}/JStatusBitsTests.cc | 0 .../{tests => unit_tests}/JTablePrinterTests.cc | 0 src/programs/{tests => unit_tests}/MapArrow.h | 0 src/programs/{tests => unit_tests}/NEventNSkipTests.cc | 0 src/programs/{tests => unit_tests}/PerformanceTests.cc | 0 src/programs/{tests => unit_tests}/PerformanceTests.h | 0 src/programs/{tests => unit_tests}/PodioTests.cc | 0 src/programs/{tests => unit_tests}/QueueTests.cc | 0 src/programs/{tests => unit_tests}/ScaleTests.cc | 0 src/programs/{tests => unit_tests}/ScaleTests.h | 0 src/programs/{tests => unit_tests}/SchedulerTests.cc | 0 src/programs/{tests => unit_tests}/SinkArrow.h | 0 src/programs/{tests => unit_tests}/SourceArrow.h | 0 src/programs/{tests => unit_tests}/SubeventTests.cc | 0 src/programs/{tests => unit_tests}/TerminationTests.cc | 0 src/programs/{tests => unit_tests}/TerminationTests.h | 0 .../{tests => unit_tests}/TestTopologyComponents.h | 0 src/programs/{tests => unit_tests}/TimeoutTests.cc | 0 src/programs/{tests => unit_tests}/TimeoutTests.h | 0 src/programs/{tests => unit_tests}/TopologyTests.cc | 0 .../{tests => unit_tests}/UserExceptionTests.cc | 0 .../{tests => unit_tests}/UserExceptionTests.h | 0 src/programs/{tests => unit_tests}/catch.hpp | 0 52 files changed, 13 insertions(+), 13 deletions(-) rename src/programs/{tests => unit_tests}/ArrowActivationTests.cc (100%) rename src/programs/{tests => unit_tests}/ArrowFixtures.h (100%) rename src/programs/{tests => unit_tests}/BarrierEventTests.cc (100%) rename src/programs/{tests => unit_tests}/BarrierEventTests.h (100%) rename src/programs/{tests => unit_tests}/CMakeLists.txt (81%) rename src/programs/{tests => unit_tests}/ExactlyOnceTests.cc (100%) rename src/programs/{tests => unit_tests}/ExactlyOnceTests.h (100%) rename src/programs/{tests => unit_tests}/GetObjectsTests.cc (100%) rename src/programs/{tests => unit_tests}/JAutoactivableTests.cc (100%) rename src/programs/{tests => unit_tests}/JCallGraphRecorderTests.cc (100%) rename src/programs/{tests => unit_tests}/JEventGetAllTests.cc (100%) rename src/programs/{tests => unit_tests}/JEventGroupTests.cc (100%) rename src/programs/{tests => unit_tests}/JEventProcessorSequentialTests.cc (100%) rename src/programs/{tests => unit_tests}/JEventTests.cc (100%) rename src/programs/{tests => unit_tests}/JEventTests.h (100%) rename src/programs/{tests => unit_tests}/JFactoryDefTagsTests.cc (100%) rename src/programs/{tests => unit_tests}/JFactoryTests.cc (100%) rename src/programs/{tests => unit_tests}/JFactoryTests.h (100%) rename src/programs/{tests => unit_tests}/JMultiFactoryTests.cc (100%) rename src/programs/{tests => unit_tests}/JObjectTests.cc (100%) rename src/programs/{tests => unit_tests}/JParameterManagerTests.cc (100%) rename src/programs/{tests => unit_tests}/JServiceLocatorTests.cc (100%) rename src/programs/{tests => unit_tests}/JServiceLocatorTests.h (100%) rename src/programs/{tests => unit_tests}/JStatusBitsTests.cc (100%) rename src/programs/{tests => unit_tests}/JTablePrinterTests.cc (100%) rename src/programs/{tests => unit_tests}/MapArrow.h (100%) rename src/programs/{tests => unit_tests}/NEventNSkipTests.cc (100%) rename src/programs/{tests => unit_tests}/PerformanceTests.cc (100%) rename src/programs/{tests => unit_tests}/PerformanceTests.h (100%) rename src/programs/{tests => unit_tests}/PodioTests.cc (100%) rename src/programs/{tests => unit_tests}/QueueTests.cc (100%) rename src/programs/{tests => unit_tests}/ScaleTests.cc (100%) rename src/programs/{tests => unit_tests}/ScaleTests.h (100%) rename src/programs/{tests => unit_tests}/SchedulerTests.cc (100%) rename src/programs/{tests => unit_tests}/SinkArrow.h (100%) rename src/programs/{tests => unit_tests}/SourceArrow.h (100%) rename src/programs/{tests => unit_tests}/SubeventTests.cc (100%) rename src/programs/{tests => unit_tests}/TerminationTests.cc (100%) rename src/programs/{tests => unit_tests}/TerminationTests.h (100%) rename src/programs/{tests => unit_tests}/TestTopologyComponents.h (100%) rename src/programs/{tests => unit_tests}/TimeoutTests.cc (100%) rename src/programs/{tests => unit_tests}/TimeoutTests.h (100%) rename src/programs/{tests => unit_tests}/TopologyTests.cc (100%) rename src/programs/{tests => unit_tests}/UserExceptionTests.cc (100%) rename src/programs/{tests => unit_tests}/UserExceptionTests.h (100%) rename src/programs/{tests => unit_tests}/catch.hpp (100%) diff --git a/.github/workflows/ccpp-docker.yml b/.github/workflows/ccpp-docker.yml index 40543d1d3..54a40b8d7 100644 --- a/.github/workflows/ccpp-docker.yml +++ b/.github/workflows/ccpp-docker.yml @@ -16,5 +16,5 @@ jobs: steps: - name: Build and run id: build_and_run - uses: faustus123/DockerAction-JANA2@v2.0.0 + uses: nathanwbrei/DockerAction-JANA2@v2.0.1 diff --git a/.github/workflows/ccpp-epscimac.yml b/.github/workflows/ccpp-epscimac.yml index 9f4028fdf..0e0201920 100644 --- a/.github/workflows/ccpp-epscimac.yml +++ b/.github/workflows/ccpp-epscimac.yml @@ -51,4 +51,4 @@ jobs: needs: build-n-install-jana steps: - name: run jana tests - run: $GITHUB_WORKSPACE/Darwin/bin/janatests + run: $GITHUB_WORKSPACE/Darwin/bin/jana-unit-tests diff --git a/.github/workflows/ccpp-linux.yml b/.github/workflows/ccpp-linux.yml index 3514710b7..af6cd8f07 100644 --- a/.github/workflows/ccpp-linux.yml +++ b/.github/workflows/ccpp-linux.yml @@ -50,8 +50,8 @@ jobs: $GITHUB_WORKSPACE/Linux/bin/jana -PPLUGINS=JTest -Pjana:nevents=100 - name: janatests run: | - echo "--- Running janatests ------------------------------" - $GITHUB_WORKSPACE/Linux/bin/janatests + echo "--- Running jana-unit-tests ------------------------------" + $GITHUB_WORKSPACE/Linux/bin/jana-unit-tests - name: BlockExample run: | echo "--- Running BlockExample ------------------------------" diff --git a/.github/workflows/ccpp-macos.yml b/.github/workflows/ccpp-macos.yml index 643123c40..ca0d1e898 100644 --- a/.github/workflows/ccpp-macos.yml +++ b/.github/workflows/ccpp-macos.yml @@ -34,5 +34,5 @@ jobs: export JANA_PLUGIN_PATH=$GITHUB_WORKSPACE/Darwin/plugins echo "--- Running JTest plugin -----------------------" $GITHUB_WORKSPACE/Darwin/bin/jana -PPLUGINS=JTest -Pjana:nevents=100 - echo "--- Running janatests ------------------------------" - $GITHUB_WORKSPACE/Darwin/bin/janatests + echo "--- Running jana-unit-tests ------------------------------" + $GITHUB_WORKSPACE/Darwin/bin/jana-unit-tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 62df8749e..db14a5af4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ add_subdirectory(src/libraries/JANA) add_subdirectory(src/examples) add_subdirectory(src/plugins) add_subdirectory(src/programs/jana) -add_subdirectory(src/programs/tests) +add_subdirectory(src/programs/unit_tests) add_subdirectory(src/programs/perf_tests) add_subdirectory(src/python) diff --git a/src/examples/UnitTestingExample/CMakeLists.txt b/src/examples/UnitTestingExample/CMakeLists.txt index c56d5acfe..67924d719 100644 --- a/src/examples/UnitTestingExample/CMakeLists.txt +++ b/src/examples/UnitTestingExample/CMakeLists.txt @@ -6,7 +6,7 @@ set (UnitTestingExample_SOURCES add_executable(UnitTestingExample ${UnitTestingExample_SOURCES}) # Our copy of catch.hpp lives in this weird place. Maybe we should move it to ${CMAKE_SOURCE_DIR}/src/external -target_include_directories(UnitTestingExample PRIVATE ${CMAKE_SOURCE_DIR}/src/programs/tests) +target_include_directories(UnitTestingExample PRIVATE ${CMAKE_SOURCE_DIR}/src/programs/unit_tests) target_link_libraries(UnitTestingExample Tutorial_plugin jana2) set_target_properties(UnitTestingExample PROPERTIES PREFIX "" OUTPUT_NAME "UnitTestingExample") diff --git a/src/programs/tests/ArrowActivationTests.cc b/src/programs/unit_tests/ArrowActivationTests.cc similarity index 100% rename from src/programs/tests/ArrowActivationTests.cc rename to src/programs/unit_tests/ArrowActivationTests.cc diff --git a/src/programs/tests/ArrowFixtures.h b/src/programs/unit_tests/ArrowFixtures.h similarity index 100% rename from src/programs/tests/ArrowFixtures.h rename to src/programs/unit_tests/ArrowFixtures.h diff --git a/src/programs/tests/BarrierEventTests.cc b/src/programs/unit_tests/BarrierEventTests.cc similarity index 100% rename from src/programs/tests/BarrierEventTests.cc rename to src/programs/unit_tests/BarrierEventTests.cc diff --git a/src/programs/tests/BarrierEventTests.h b/src/programs/unit_tests/BarrierEventTests.h similarity index 100% rename from src/programs/tests/BarrierEventTests.h rename to src/programs/unit_tests/BarrierEventTests.h diff --git a/src/programs/tests/CMakeLists.txt b/src/programs/unit_tests/CMakeLists.txt similarity index 81% rename from src/programs/tests/CMakeLists.txt rename to src/programs/unit_tests/CMakeLists.txt index b3c0f6e29..a8749d7a2 100644 --- a/src/programs/tests/CMakeLists.txt +++ b/src/programs/unit_tests/CMakeLists.txt @@ -45,16 +45,16 @@ if (${USE_PODIO}) ) endif() -add_executable(janatests ${TEST_SOURCES}) +add_executable(jana-unit-tests ${TEST_SOURCES}) find_package(Threads REQUIRED) -target_include_directories(janatests PUBLIC .) -target_link_libraries(janatests jana2) +target_include_directories(jana-unit-tests PUBLIC .) +target_link_libraries(jana-unit-tests jana2) if (${USE_PODIO}) # Pull in the data model from examples/PodioExample. # We don't want to have two separate toy data models in the JANA codebase - target_link_libraries(janatests PodioExampleDatamodel PodioExampleDatamodelDict) + target_link_libraries(jana-unit-tests PodioExampleDatamodel PodioExampleDatamodelDict) endif() -install(TARGETS janatests DESTINATION bin) +install(TARGETS jana-unit-tests DESTINATION bin) install(FILES catch.hpp DESTINATION include/external) diff --git a/src/programs/tests/ExactlyOnceTests.cc b/src/programs/unit_tests/ExactlyOnceTests.cc similarity index 100% rename from src/programs/tests/ExactlyOnceTests.cc rename to src/programs/unit_tests/ExactlyOnceTests.cc diff --git a/src/programs/tests/ExactlyOnceTests.h b/src/programs/unit_tests/ExactlyOnceTests.h similarity index 100% rename from src/programs/tests/ExactlyOnceTests.h rename to src/programs/unit_tests/ExactlyOnceTests.h diff --git a/src/programs/tests/GetObjectsTests.cc b/src/programs/unit_tests/GetObjectsTests.cc similarity index 100% rename from src/programs/tests/GetObjectsTests.cc rename to src/programs/unit_tests/GetObjectsTests.cc diff --git a/src/programs/tests/JAutoactivableTests.cc b/src/programs/unit_tests/JAutoactivableTests.cc similarity index 100% rename from src/programs/tests/JAutoactivableTests.cc rename to src/programs/unit_tests/JAutoactivableTests.cc diff --git a/src/programs/tests/JCallGraphRecorderTests.cc b/src/programs/unit_tests/JCallGraphRecorderTests.cc similarity index 100% rename from src/programs/tests/JCallGraphRecorderTests.cc rename to src/programs/unit_tests/JCallGraphRecorderTests.cc diff --git a/src/programs/tests/JEventGetAllTests.cc b/src/programs/unit_tests/JEventGetAllTests.cc similarity index 100% rename from src/programs/tests/JEventGetAllTests.cc rename to src/programs/unit_tests/JEventGetAllTests.cc diff --git a/src/programs/tests/JEventGroupTests.cc b/src/programs/unit_tests/JEventGroupTests.cc similarity index 100% rename from src/programs/tests/JEventGroupTests.cc rename to src/programs/unit_tests/JEventGroupTests.cc diff --git a/src/programs/tests/JEventProcessorSequentialTests.cc b/src/programs/unit_tests/JEventProcessorSequentialTests.cc similarity index 100% rename from src/programs/tests/JEventProcessorSequentialTests.cc rename to src/programs/unit_tests/JEventProcessorSequentialTests.cc diff --git a/src/programs/tests/JEventTests.cc b/src/programs/unit_tests/JEventTests.cc similarity index 100% rename from src/programs/tests/JEventTests.cc rename to src/programs/unit_tests/JEventTests.cc diff --git a/src/programs/tests/JEventTests.h b/src/programs/unit_tests/JEventTests.h similarity index 100% rename from src/programs/tests/JEventTests.h rename to src/programs/unit_tests/JEventTests.h diff --git a/src/programs/tests/JFactoryDefTagsTests.cc b/src/programs/unit_tests/JFactoryDefTagsTests.cc similarity index 100% rename from src/programs/tests/JFactoryDefTagsTests.cc rename to src/programs/unit_tests/JFactoryDefTagsTests.cc diff --git a/src/programs/tests/JFactoryTests.cc b/src/programs/unit_tests/JFactoryTests.cc similarity index 100% rename from src/programs/tests/JFactoryTests.cc rename to src/programs/unit_tests/JFactoryTests.cc diff --git a/src/programs/tests/JFactoryTests.h b/src/programs/unit_tests/JFactoryTests.h similarity index 100% rename from src/programs/tests/JFactoryTests.h rename to src/programs/unit_tests/JFactoryTests.h diff --git a/src/programs/tests/JMultiFactoryTests.cc b/src/programs/unit_tests/JMultiFactoryTests.cc similarity index 100% rename from src/programs/tests/JMultiFactoryTests.cc rename to src/programs/unit_tests/JMultiFactoryTests.cc diff --git a/src/programs/tests/JObjectTests.cc b/src/programs/unit_tests/JObjectTests.cc similarity index 100% rename from src/programs/tests/JObjectTests.cc rename to src/programs/unit_tests/JObjectTests.cc diff --git a/src/programs/tests/JParameterManagerTests.cc b/src/programs/unit_tests/JParameterManagerTests.cc similarity index 100% rename from src/programs/tests/JParameterManagerTests.cc rename to src/programs/unit_tests/JParameterManagerTests.cc diff --git a/src/programs/tests/JServiceLocatorTests.cc b/src/programs/unit_tests/JServiceLocatorTests.cc similarity index 100% rename from src/programs/tests/JServiceLocatorTests.cc rename to src/programs/unit_tests/JServiceLocatorTests.cc diff --git a/src/programs/tests/JServiceLocatorTests.h b/src/programs/unit_tests/JServiceLocatorTests.h similarity index 100% rename from src/programs/tests/JServiceLocatorTests.h rename to src/programs/unit_tests/JServiceLocatorTests.h diff --git a/src/programs/tests/JStatusBitsTests.cc b/src/programs/unit_tests/JStatusBitsTests.cc similarity index 100% rename from src/programs/tests/JStatusBitsTests.cc rename to src/programs/unit_tests/JStatusBitsTests.cc diff --git a/src/programs/tests/JTablePrinterTests.cc b/src/programs/unit_tests/JTablePrinterTests.cc similarity index 100% rename from src/programs/tests/JTablePrinterTests.cc rename to src/programs/unit_tests/JTablePrinterTests.cc diff --git a/src/programs/tests/MapArrow.h b/src/programs/unit_tests/MapArrow.h similarity index 100% rename from src/programs/tests/MapArrow.h rename to src/programs/unit_tests/MapArrow.h diff --git a/src/programs/tests/NEventNSkipTests.cc b/src/programs/unit_tests/NEventNSkipTests.cc similarity index 100% rename from src/programs/tests/NEventNSkipTests.cc rename to src/programs/unit_tests/NEventNSkipTests.cc diff --git a/src/programs/tests/PerformanceTests.cc b/src/programs/unit_tests/PerformanceTests.cc similarity index 100% rename from src/programs/tests/PerformanceTests.cc rename to src/programs/unit_tests/PerformanceTests.cc diff --git a/src/programs/tests/PerformanceTests.h b/src/programs/unit_tests/PerformanceTests.h similarity index 100% rename from src/programs/tests/PerformanceTests.h rename to src/programs/unit_tests/PerformanceTests.h diff --git a/src/programs/tests/PodioTests.cc b/src/programs/unit_tests/PodioTests.cc similarity index 100% rename from src/programs/tests/PodioTests.cc rename to src/programs/unit_tests/PodioTests.cc diff --git a/src/programs/tests/QueueTests.cc b/src/programs/unit_tests/QueueTests.cc similarity index 100% rename from src/programs/tests/QueueTests.cc rename to src/programs/unit_tests/QueueTests.cc diff --git a/src/programs/tests/ScaleTests.cc b/src/programs/unit_tests/ScaleTests.cc similarity index 100% rename from src/programs/tests/ScaleTests.cc rename to src/programs/unit_tests/ScaleTests.cc diff --git a/src/programs/tests/ScaleTests.h b/src/programs/unit_tests/ScaleTests.h similarity index 100% rename from src/programs/tests/ScaleTests.h rename to src/programs/unit_tests/ScaleTests.h diff --git a/src/programs/tests/SchedulerTests.cc b/src/programs/unit_tests/SchedulerTests.cc similarity index 100% rename from src/programs/tests/SchedulerTests.cc rename to src/programs/unit_tests/SchedulerTests.cc diff --git a/src/programs/tests/SinkArrow.h b/src/programs/unit_tests/SinkArrow.h similarity index 100% rename from src/programs/tests/SinkArrow.h rename to src/programs/unit_tests/SinkArrow.h diff --git a/src/programs/tests/SourceArrow.h b/src/programs/unit_tests/SourceArrow.h similarity index 100% rename from src/programs/tests/SourceArrow.h rename to src/programs/unit_tests/SourceArrow.h diff --git a/src/programs/tests/SubeventTests.cc b/src/programs/unit_tests/SubeventTests.cc similarity index 100% rename from src/programs/tests/SubeventTests.cc rename to src/programs/unit_tests/SubeventTests.cc diff --git a/src/programs/tests/TerminationTests.cc b/src/programs/unit_tests/TerminationTests.cc similarity index 100% rename from src/programs/tests/TerminationTests.cc rename to src/programs/unit_tests/TerminationTests.cc diff --git a/src/programs/tests/TerminationTests.h b/src/programs/unit_tests/TerminationTests.h similarity index 100% rename from src/programs/tests/TerminationTests.h rename to src/programs/unit_tests/TerminationTests.h diff --git a/src/programs/tests/TestTopologyComponents.h b/src/programs/unit_tests/TestTopologyComponents.h similarity index 100% rename from src/programs/tests/TestTopologyComponents.h rename to src/programs/unit_tests/TestTopologyComponents.h diff --git a/src/programs/tests/TimeoutTests.cc b/src/programs/unit_tests/TimeoutTests.cc similarity index 100% rename from src/programs/tests/TimeoutTests.cc rename to src/programs/unit_tests/TimeoutTests.cc diff --git a/src/programs/tests/TimeoutTests.h b/src/programs/unit_tests/TimeoutTests.h similarity index 100% rename from src/programs/tests/TimeoutTests.h rename to src/programs/unit_tests/TimeoutTests.h diff --git a/src/programs/tests/TopologyTests.cc b/src/programs/unit_tests/TopologyTests.cc similarity index 100% rename from src/programs/tests/TopologyTests.cc rename to src/programs/unit_tests/TopologyTests.cc diff --git a/src/programs/tests/UserExceptionTests.cc b/src/programs/unit_tests/UserExceptionTests.cc similarity index 100% rename from src/programs/tests/UserExceptionTests.cc rename to src/programs/unit_tests/UserExceptionTests.cc diff --git a/src/programs/tests/UserExceptionTests.h b/src/programs/unit_tests/UserExceptionTests.h similarity index 100% rename from src/programs/tests/UserExceptionTests.h rename to src/programs/unit_tests/UserExceptionTests.h diff --git a/src/programs/tests/catch.hpp b/src/programs/unit_tests/catch.hpp similarity index 100% rename from src/programs/tests/catch.hpp rename to src/programs/unit_tests/catch.hpp