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.
JeffersonLab · Nov 10, 2023 · d1c08e8 · d1c08e8
1 parent 21bcc66
commit d1c08e8
Show file tree

Hide file tree

Showing 52 changed files with 13 additions and 13 deletions.
diff --git 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/[email protected].0
+      uses: nathanwbrei/[email protected].1
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 → ...ograms/unit_tests/ArrowActivationTests.cc b/src/programs/tests/ArrowActivationTests.cc → ...ograms/unit_tests/ArrowActivationTests.cc
diff --git a/src/programs/tests/ArrowFixtures.h → src/programs/unit_tests/ArrowFixtures.h b/src/programs/tests/ArrowFixtures.h → src/programs/unit_tests/ArrowFixtures.h
diff --git a/src/programs/tests/BarrierEventTests.cc → src/programs/unit_tests/BarrierEventTests.cc b/src/programs/tests/BarrierEventTests.cc → src/programs/unit_tests/BarrierEventTests.cc
diff --git a/src/programs/tests/BarrierEventTests.h → src/programs/unit_tests/BarrierEventTests.h b/src/programs/tests/BarrierEventTests.h → src/programs/unit_tests/BarrierEventTests.h
diff --git a/src/programs/tests/CMakeLists.txt → src/programs/unit_tests/CMakeLists.txt b/src/programs/tests/CMakeLists.txt → 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 → src/programs/unit_tests/ExactlyOnceTests.cc b/src/programs/tests/ExactlyOnceTests.cc → src/programs/unit_tests/ExactlyOnceTests.cc
diff --git a/src/programs/tests/ExactlyOnceTests.h → src/programs/unit_tests/ExactlyOnceTests.h b/src/programs/tests/ExactlyOnceTests.h → src/programs/unit_tests/ExactlyOnceTests.h
diff --git a/src/programs/tests/GetObjectsTests.cc → src/programs/unit_tests/GetObjectsTests.cc b/src/programs/tests/GetObjectsTests.cc → src/programs/unit_tests/GetObjectsTests.cc
diff --git a/src/programs/tests/JAutoactivableTests.cc → ...rograms/unit_tests/JAutoactivableTests.cc b/src/programs/tests/JAutoactivableTests.cc → ...rograms/unit_tests/JAutoactivableTests.cc
diff --git a/...programs/tests/JCallGraphRecorderTests.cc → ...ams/unit_tests/JCallGraphRecorderTests.cc b/...programs/tests/JCallGraphRecorderTests.cc → ...ams/unit_tests/JCallGraphRecorderTests.cc
diff --git a/src/programs/tests/JEventGetAllTests.cc → src/programs/unit_tests/JEventGetAllTests.cc b/src/programs/tests/JEventGetAllTests.cc → src/programs/unit_tests/JEventGetAllTests.cc
diff --git a/src/programs/tests/JEventGroupTests.cc → src/programs/unit_tests/JEventGroupTests.cc b/src/programs/tests/JEventGroupTests.cc → src/programs/unit_tests/JEventGroupTests.cc
diff --git a/...s/tests/JEventProcessorSequentialTests.cc → ...t_tests/JEventProcessorSequentialTests.cc b/...s/tests/JEventProcessorSequentialTests.cc → ...t_tests/JEventProcessorSequentialTests.cc
diff --git a/src/programs/tests/JEventTests.cc → src/programs/unit_tests/JEventTests.cc b/src/programs/tests/JEventTests.cc → src/programs/unit_tests/JEventTests.cc
diff --git a/src/programs/tests/JEventTests.h → src/programs/unit_tests/JEventTests.h b/src/programs/tests/JEventTests.h → src/programs/unit_tests/JEventTests.h
diff --git a/src/programs/tests/JFactoryDefTagsTests.cc → ...ograms/unit_tests/JFactoryDefTagsTests.cc b/src/programs/tests/JFactoryDefTagsTests.cc → ...ograms/unit_tests/JFactoryDefTagsTests.cc
diff --git a/src/programs/tests/JFactoryTests.cc → src/programs/unit_tests/JFactoryTests.cc b/src/programs/tests/JFactoryTests.cc → src/programs/unit_tests/JFactoryTests.cc
diff --git a/src/programs/tests/JFactoryTests.h → src/programs/unit_tests/JFactoryTests.h b/src/programs/tests/JFactoryTests.h → src/programs/unit_tests/JFactoryTests.h
diff --git a/src/programs/tests/JMultiFactoryTests.cc → ...programs/unit_tests/JMultiFactoryTests.cc b/src/programs/tests/JMultiFactoryTests.cc → ...programs/unit_tests/JMultiFactoryTests.cc
diff --git a/src/programs/tests/JObjectTests.cc → src/programs/unit_tests/JObjectTests.cc b/src/programs/tests/JObjectTests.cc → src/programs/unit_tests/JObjectTests.cc
diff --git a/src/programs/tests/JParameterManagerTests.cc → ...rams/unit_tests/JParameterManagerTests.cc b/src/programs/tests/JParameterManagerTests.cc → ...rams/unit_tests/JParameterManagerTests.cc
diff --git a/src/programs/tests/JServiceLocatorTests.cc → ...ograms/unit_tests/JServiceLocatorTests.cc b/src/programs/tests/JServiceLocatorTests.cc → ...ograms/unit_tests/JServiceLocatorTests.cc
diff --git a/src/programs/tests/JServiceLocatorTests.h → ...rograms/unit_tests/JServiceLocatorTests.h b/src/programs/tests/JServiceLocatorTests.h → ...rograms/unit_tests/JServiceLocatorTests.h
diff --git a/src/programs/tests/JStatusBitsTests.cc → src/programs/unit_tests/JStatusBitsTests.cc b/src/programs/tests/JStatusBitsTests.cc → src/programs/unit_tests/JStatusBitsTests.cc
diff --git a/src/programs/tests/JTablePrinterTests.cc → ...programs/unit_tests/JTablePrinterTests.cc b/src/programs/tests/JTablePrinterTests.cc → ...programs/unit_tests/JTablePrinterTests.cc
diff --git a/src/programs/tests/MapArrow.h → src/programs/unit_tests/MapArrow.h b/src/programs/tests/MapArrow.h → src/programs/unit_tests/MapArrow.h
diff --git a/src/programs/tests/NEventNSkipTests.cc → src/programs/unit_tests/NEventNSkipTests.cc b/src/programs/tests/NEventNSkipTests.cc → src/programs/unit_tests/NEventNSkipTests.cc
diff --git a/src/programs/tests/PerformanceTests.cc → src/programs/unit_tests/PerformanceTests.cc b/src/programs/tests/PerformanceTests.cc → src/programs/unit_tests/PerformanceTests.cc
diff --git a/src/programs/tests/PerformanceTests.h → src/programs/unit_tests/PerformanceTests.h b/src/programs/tests/PerformanceTests.h → src/programs/unit_tests/PerformanceTests.h
diff --git a/src/programs/tests/PodioTests.cc → src/programs/unit_tests/PodioTests.cc b/src/programs/tests/PodioTests.cc → src/programs/unit_tests/PodioTests.cc
diff --git a/src/programs/tests/QueueTests.cc → src/programs/unit_tests/QueueTests.cc b/src/programs/tests/QueueTests.cc → src/programs/unit_tests/QueueTests.cc
diff --git a/src/programs/tests/ScaleTests.cc → src/programs/unit_tests/ScaleTests.cc b/src/programs/tests/ScaleTests.cc → src/programs/unit_tests/ScaleTests.cc
diff --git a/src/programs/tests/ScaleTests.h → src/programs/unit_tests/ScaleTests.h b/src/programs/tests/ScaleTests.h → src/programs/unit_tests/ScaleTests.h
diff --git a/src/programs/tests/SchedulerTests.cc → src/programs/unit_tests/SchedulerTests.cc b/src/programs/tests/SchedulerTests.cc → src/programs/unit_tests/SchedulerTests.cc
diff --git a/src/programs/tests/SinkArrow.h → src/programs/unit_tests/SinkArrow.h b/src/programs/tests/SinkArrow.h → src/programs/unit_tests/SinkArrow.h
diff --git a/src/programs/tests/SourceArrow.h → src/programs/unit_tests/SourceArrow.h b/src/programs/tests/SourceArrow.h → src/programs/unit_tests/SourceArrow.h
diff --git a/src/programs/tests/SubeventTests.cc → src/programs/unit_tests/SubeventTests.cc b/src/programs/tests/SubeventTests.cc → src/programs/unit_tests/SubeventTests.cc
diff --git a/src/programs/tests/TerminationTests.cc → src/programs/unit_tests/TerminationTests.cc b/src/programs/tests/TerminationTests.cc → src/programs/unit_tests/TerminationTests.cc
diff --git a/src/programs/tests/TerminationTests.h → src/programs/unit_tests/TerminationTests.h b/src/programs/tests/TerminationTests.h → src/programs/unit_tests/TerminationTests.h
diff --git a/src/programs/tests/TestTopologyComponents.h → ...grams/unit_tests/TestTopologyComponents.h b/src/programs/tests/TestTopologyComponents.h → ...grams/unit_tests/TestTopologyComponents.h
diff --git a/src/programs/tests/TimeoutTests.cc → src/programs/unit_tests/TimeoutTests.cc b/src/programs/tests/TimeoutTests.cc → src/programs/unit_tests/TimeoutTests.cc
diff --git a/src/programs/tests/TimeoutTests.h → src/programs/unit_tests/TimeoutTests.h b/src/programs/tests/TimeoutTests.h → src/programs/unit_tests/TimeoutTests.h
diff --git a/src/programs/tests/TopologyTests.cc → src/programs/unit_tests/TopologyTests.cc b/src/programs/tests/TopologyTests.cc → src/programs/unit_tests/TopologyTests.cc
diff --git a/src/programs/tests/UserExceptionTests.cc → ...programs/unit_tests/UserExceptionTests.cc b/src/programs/tests/UserExceptionTests.cc → ...programs/unit_tests/UserExceptionTests.cc
diff --git a/src/programs/tests/UserExceptionTests.h → src/programs/unit_tests/UserExceptionTests.h b/src/programs/tests/UserExceptionTests.h → src/programs/unit_tests/UserExceptionTests.h
diff --git a/src/programs/tests/catch.hpp → src/programs/unit_tests/catch.hpp b/src/programs/tests/catch.hpp → src/programs/unit_tests/catch.hpp