From 28b2aa9673b99b6c7164ead803b9478b55ea8784 Mon Sep 17 00:00:00 2001 From: AliceMazzoleni99 Date: Tue, 3 Feb 2026 11:45:12 +0100 Subject: [PATCH] Dev/add simulator tests in GitHub workflows (#1337) * added simulator tests in github workflows * indentation error * typo * debug * Logging for debugging * added more debug lines * more debugging * debug * debug * debug * dont throw if process does not exist * debug * added absolute path to sls_detector commands * some refactoring in test scripts * added absolute path to all slsdet command * typo * ../tests/scripts/test_frame_synchronizer.py * raise exception upon failure for github workflows * removed hidden tags * some refactoring in test scripts * some refactoring * fixed CMakeLists * fixed unsuccesful merge * updated python tests using simulators * debug import error * debug module import * python -m runs module pytest as script - everything in path available * removed integartion tests * enable file write not to log files * run tests without log files * increased sleep time for udp packets * added logg level variable to cmake * added testing policies to documenattion * disabled check for num_frames for jungfrau & xilinx * set log level as cmake cached variable * disable tests for jungfrau and xilinx_ctb * check frames for HDF5 * updated Documentation of Testing * changed withdetectorsimulators to detectorintegration * replaced [.cmdcall] with [.detectorintegration] * check_file_size only disabled for jungfrau - disable for all roi tests * changed time to wait after receive to 5 ms * take into account half modules of eiger * num udp interfaces needs to be consistent across modules * suppressed warning enclosing if * config added 2 udp ports per default for moench and jungfrau * write detector output to console * allow jungfrau to tests num frames, remove unused variable (numinterfaces), add comment for future to handle traceback to know which calling function threw the files unmatched, added documentation for tests (examples for .detectoritnegration and how to disable marked tests, removed addditional argumetns to disable for test_simulator as one can just use ~, removed the check that checks for jungfrau checking number of frames at master attributes and at rx test, removed unused advanced_test_settings in test_simulator script, the num_mods check for multiple modules is removed and default num modules set to 1 for test_simulator (to be increased later), back to raising exception for killprocess * removed integration tests from cmakelists.txt and cmk.sh, modified the tests workflow command to reflect the disable argument and removed xilinx_ctb from test (fix fromdeveloper merge to be done) * filtering by actual name for disable certain tests on github workflow * minor refactor * wip * wip * changes to run on local rh9 runner instead of github workfloa * modified yml to remove some leftover from github workflow * test * fix build_dir in scripts (github workflow) and pytest dir in gitea workflow * making the local machine use python3.13 binary * pythonpath added * changes for build_Dir back * allowing ctb api tests * allowed ctb api tests and set up slsdetname envt variable for shared memory being reserved just for these tests * added rh8 workflow for local runner on gitea * remnants from rh9 local runner * remnants from rh9 local runner * conda env for all shell for local runner * allowing hdf5 to build on local runner * run all tests for both the runners * refactored fixtures a bit and merged some tests that use one session for entire server * test fail * test fix * adding github workflow to test without data file checks and without logs * documentation changes * unnecessary import in conftest * allowing the session_simulator to test for multiple modules and interfaces etc * allow test_simulator script to run for 2 modules for all modules except ctb and xilinx ctb * run upon push * removing the disable file check on github workflow * minor adjustment * testing without synch * reverting to previous * with log file * without the space * summary from file and more error extracts from file to terminal * minor * trying nlf for more details * updated with no log file to print everything to screen also for det and rxr * trying a no throw * stoi was more about indent in yaml * tries * wip * debug * number of frames inconsistent fix=>just take first one, only test xilinx * jungfrau tests without frames caught check * extend the disable file check to everywhere that creates files * specify path for test_simulator * withoutprinting == * wip * back with printing===, but not parsing file for errors anymore * lang? * wip * safe log? * wip2 * wip * dont split error as its streaming live, just raise * with log files * lang? * last resort * wip * test no det with general tests * show tests live * also include hidden integration tests * without extra summary? * revert * last resort again * tsquash on int64_t? * tsquash on int64_t? mroe print * writing to /tmp? * all tests * might be the fix? * write to file * fixed a few quiet mode no log file tests * work on any branch for github tests, work on also release candidates for gitea tests * added frame synchronizer tests to github workflow * moved tests to run_tests.yaml from cmake.yaml * documentation * disabled general tests --------- Co-authored-by: Dhanya Thattil --- .gitea/workflows/rh8-local-tests.yml | 62 +++ .gitea/workflows/rh9-local-tests.yml | 53 ++ .github/workflows/cmake.yaml | 19 +- .github/workflows/run_tests.yaml | 57 ++ CMakeLists.txt | 12 +- cmk.sh | 2 +- docs/src/Testing.rst | 166 ++++++ docs/src/index.rst | 1 + integrationTests/CMakeLists.txt | 40 -- integrationTests/test-eigerIntegration.cpp | 204 ------- .../test-integrationDectector.cpp | 522 ------------------ integrationTests/test-integrationMulti.cpp | 108 ---- integrationTests/test.cpp | 5 - python/tests/conftest.py | 166 ++++-- .../tests/{test_CtbAPI.py => test_det_api.py} | 159 +++--- {tests/scripts => python/tests}/test_free.py | 26 +- python/tests/test_pythonAPI.py | 19 +- .../tests/Caller/test-Caller-acquire.cpp | 20 +- .../Caller/test-Caller-chiptestboard.cpp | 174 +++--- .../tests/Caller/test-Caller-eiger.cpp | 51 +- .../tests/Caller/test-Caller-global.cpp | 22 +- .../tests/Caller/test-Caller-global.h | 2 - .../tests/Caller/test-Caller-gotthard2.cpp | 45 +- .../tests/Caller/test-Caller-jungfrau.cpp | 35 +- .../Caller/test-Caller-master-attributes.cpp | 6 +- .../tests/Caller/test-Caller-moench.cpp | 3 +- .../tests/Caller/test-Caller-mythen3.cpp | 33 +- .../tests/Caller/test-Caller-pattern.cpp | 28 +- .../tests/Caller/test-Caller-rx-running.cpp | 31 +- .../tests/Caller/test-Caller-rx.cpp | 80 +-- .../test-Caller-xilinx-chiptestboard.cpp | 2 +- .../tests/Caller/test-Caller.cpp | 282 +++++----- slsReceiverSoftware/src/Implementation.cpp | 3 +- .../tests/test-ArrangeDataBasedOnBitList.cpp | 12 +- slsSupportLib/tests/test-Timer.cpp | 4 +- slsSupportLib/tests/test-Version.cpp | 2 +- tests/CMakeLists.txt | 4 - tests/scripts/test_commands.py | 100 ---- tests/scripts/test_frame_synchronizer.py | 47 +- tests/scripts/test_roi.py | 82 --- tests/scripts/test_simulators.py | 95 ++-- tests/scripts/utils_for_test.py | 217 +++++--- 42 files changed, 1243 insertions(+), 1758 deletions(-) create mode 100644 .gitea/workflows/rh8-local-tests.yml create mode 100644 .gitea/workflows/rh9-local-tests.yml create mode 100644 .github/workflows/run_tests.yaml create mode 100644 docs/src/Testing.rst delete mode 100755 integrationTests/CMakeLists.txt delete mode 100644 integrationTests/test-eigerIntegration.cpp delete mode 100644 integrationTests/test-integrationDectector.cpp delete mode 100644 integrationTests/test-integrationMulti.cpp delete mode 100755 integrationTests/test.cpp rename python/tests/{test_CtbAPI.py => test_det_api.py} (82%) rename {tests/scripts => python/tests}/test_free.py (94%) delete mode 100644 tests/scripts/test_commands.py delete mode 100644 tests/scripts/test_roi.py diff --git a/.gitea/workflows/rh8-local-tests.yml b/.gitea/workflows/rh8-local-tests.yml new file mode 100644 index 000000000..8865e43ce --- /dev/null +++ b/.gitea/workflows/rh8-local-tests.yml @@ -0,0 +1,62 @@ +name: Run Simulator Tests on local RHEL8 + +on: + push: + branches: + - developer + - main + - 'dev/*' + - '*.*.*.rc' + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Debug + + +jobs: + build: + runs-on: "detectors-software-RH8" + steps: + - uses: actions/checkout@v4 + + - name: Configure CMake + run: | + source /home/gitea_runner/.bashrc + conda activate det + cmake -B build \ + -DCMAKE_BUILD_TYPE=Debug \ + -DSLS_USE_TESTS=ON \ + -DSLS_USE_SIMULATOR=ON \ + -DSLS_USE_PYTHON=On \ + -DSLS_USE_HDF5=ON + + - name: Build + # Build your program with the given configuration + run: | + source /home/gitea_runner/.bashrc + conda activate det + cmake --build build -j4 --config Debug + + - name: Python unit tests with simulators + run: | + source /home/gitea_runner/.bashrc + conda activate det + export PYTHONPATH=$PWD/build/bin:$PYTHONPATH + export SLSDETNAME=gitea_runner_tests + python -m pytest -m detectorintegration python/tests --detector-integration + python -m pytest python/tests + + + - name: Simulator unit tests + run: | + source /home/gitea_runner/.bashrc + conda activate det + cd build/bin + python test_simulators.py -g + + - name: Run frame synchronizer tests + run: | + source /home/gitea_runner/.bashrc + conda activate det + cd build/bin + python test_frame_synchronizer.py diff --git a/.gitea/workflows/rh9-local-tests.yml b/.gitea/workflows/rh9-local-tests.yml new file mode 100644 index 000000000..4aa1a9f98 --- /dev/null +++ b/.gitea/workflows/rh9-local-tests.yml @@ -0,0 +1,53 @@ +name: Run Simulator Tests on local RHEL9 + +on: + push: + branches: + - developer + - main + - 'dev/*' + - '*.*.*.rc' + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Debug + + +jobs: + build: + runs-on: "detectors-software-RH9" + steps: + - uses: actions/checkout@v4 + + - name: Configure CMake + run: | + cmake -B build \ + -DCMAKE_BUILD_TYPE=Debug \ + -DSLS_USE_TESTS=ON \ + -DSLS_USE_SIMULATOR=ON \ + -DSLS_USE_PYTHON=On \ + -DPython_EXECUTABLE=/usr/bin/python3.13 \ + -DPython_INCLUDE_DIR=/usr/include/python3.13 \ + -DPython_LIBRARY=/usr/lib64/libpython3.13.so \ + -DSLS_USE_HDF5=ON + + - name: Build + # Build your program with the given configuration + run: cmake --build build -j4 --config Debug + + - name: Python unit tests with simulators + run: | + export PYTHONPATH=$PWD/build/bin:$PYTHONPATH + export SLSDETNAME=gitea_runner_tests + python3.13 -m pytest -m detectorintegration python/tests --detector-integration + python3.13 -m pytest python/tests + + - name: Simulator unit tests + run: | + cd build/bin + python3.13 test_simulators.py -g + + - name: Run frame synchronizer tests + run: | + cd build/bin + python3.13 test_frame_synchronizer.py diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml index 32aba389c..a7a161c56 100644 --- a/.github/workflows/cmake.yaml +++ b/.github/workflows/cmake.yaml @@ -29,19 +29,20 @@ jobs: - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSLS_USE_TESTS=ON -DSLS_USE_HDF5=ON -DSLS_USE_GUI=ON -DSLS_USE_MOENCH=ON -DSLS_USE_PYTHON=ON + run: | + cmake -B ${{github.workspace}}/build \ + -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ + -DSLS_USE_TESTS=ON \ + -DSLS_USE_SIMULATOR=ON \ + -DSLS_USE_PYTHON=ON \ + -DSLS_USE_HDF5=ON \ + -DSLS_USE_GUI=ON \ + -DSLS_USE_MOENCH=ON - name: Build # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build -j4 --config ${{env.BUILD_TYPE}} - - name: C++ unit tests - working-directory: ${{github.workspace}}/build - run: ctest -C ${{env.BUILD_TYPE}} -j1 --rerun-failed --output-on-failure - - - name: Python unit tests - working-directory: ${{github.workspace}}/build/bin - run: | - python -m pytest ${{github.workspace}}/python/tests + diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml new file mode 100644 index 000000000..215efb8a3 --- /dev/null +++ b/.github/workflows/run_tests.yaml @@ -0,0 +1,57 @@ +name: Run Simulator Tests + +on: + push: + + + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Debug + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: 3.12 + cache: 'pip' + - run: pip install pytest numpy colorama + + - uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: libhdf5-dev + version: 1.0 + + - name: Configure CMake + run: | + cmake -B ${{github.workspace}}/build \ + -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ + -DSLS_USE_TESTS=ON \ + -DSLS_USE_SIMULATOR=ON \ + -DSLS_USE_PYTHON=ON \ + -DSLS_USE_HDF5=ON + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build -j4 --config ${{env.BUILD_TYPE}} + + - name: Simulator unit tests + working-directory: ${{github.workspace}}/build/bin + run: | + python test_simulators.py --no-log-file --quiet --tests "[detectorintegration]~[disable_check_data_file]" + #remove --quiet to see more prints from simulator, receiver and tests + python test_frame_synchronizer.py + + + - name: Python unit tests with simulators + working-directory: ${{github.workspace}}/build/bin + run: | + python -m pytest -m detectorintegration ${{github.workspace}}/python/tests --detector-integration + python -m pytest ${{github.workspace}}/python/tests + + - name: C++ unit tests + working-directory: ${{github.workspace}}/build + run: ctest -C ${{env.BUILD_TYPE}} -j1 --rerun-failed --output-on-failure diff --git a/CMakeLists.txt b/CMakeLists.txt index 194a2abad..b4ea785fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,6 @@ include(FetchContent) option(SLS_FETCH_ZMQ_FROM_GITHUB "Fetch zmq from github" OFF) option(SLS_FETCH_PYBIND11_FROM_GITHUB "Fetch pybind11 from github" OFF) - - # Allow FetchContent_Populate to be called with a single argument # otherwise deprecated warning is issued # Note: From cmake 3.28 we can pass EXCLUDE_FROM_ALL to FetchContent_Declare @@ -200,7 +198,6 @@ option(SLS_USE_RECEIVER_BINARIES "Receiver binaries" ON) option(SLS_USE_GUI "GUI" OFF) option(SLS_USE_SIMULATOR "Simulator" OFF) option(SLS_USE_TESTS "TESTS" OFF) -option(SLS_USE_INTEGRATION_TESTS "Integration Tests" OFF) option(SLS_USE_SANITIZER "Sanitizers for debugging" OFF) option(SLS_USE_PYTHON "Python bindings" OFF) option(SLS_INSTALL_PYTHONEXT "Install the python extension in the install tree under CMAKE_INSTALL_PREFIX/python/" OFF) @@ -292,6 +289,11 @@ if(NOT TARGET slsProjectOptions) target_compile_features(slsProjectOptions INTERFACE cxx_std_17) endif() +set(LOG_MAX_REPORTING_LEVEL sls::logINFO CACHE STRING "set logging level") +target_compile_definitions(slsProjectOptions + INTERFACE LOG_MAX_REPORTING_LEVEL=${LOG_MAX_REPORTING_LEVEL} +) + if (NOT TARGET slsProjectWarnings) add_library(slsProjectWarnings INTERFACE) target_compile_options(slsProjectWarnings INTERFACE @@ -400,10 +402,6 @@ if (SLS_USE_SIMULATOR) add_subdirectory(slsDetectorServers) endif (SLS_USE_SIMULATOR) -if (SLS_USE_INTEGRATION_TESTS) - add_subdirectory(integrationTests) -endif (SLS_USE_INTEGRATION_TESTS) - if (SLS_USE_PYTHON) find_package (Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED) set(PYBIND11_FINDPYTHON ON) # Needed for RH8 diff --git a/cmk.sh b/cmk.sh index dd58a37e1..498d590bd 100755 --- a/cmk.sh +++ b/cmk.sh @@ -250,7 +250,7 @@ fi #Tests if [ $TESTS -eq 1 ]; then - CMAKE_POST+=" -DSLS_USE_TESTS=ON -DSLS_USE_INTEGRATION_TESTS=ON" + CMAKE_POST+=" -DSLS_USE_TESTS=ON " echo "Tests Option enabled" fi diff --git a/docs/src/Testing.rst b/docs/src/Testing.rst new file mode 100644 index 000000000..515571788 --- /dev/null +++ b/docs/src/Testing.rst @@ -0,0 +1,166 @@ +Testing +========== + +We use ``catch2`` and ``pytest`` for unit testing the C++ and Python code. + +CATCH2 Tests +---------------- + +To build and run the catch2 tests use the following commands: + +.. code-block:: console + + cd build + cmake -DSLS_USE_TESTS=ON ../ + bin/tests + +Note that this requires that you have catch2 installed on your system. + +Naming Policy: +----------------- + +Per default all tests should be visible to catch2. + +If a test fails in the github or gitea actions hide the test by adding the tag ``[.]`` to the test name. + +.. code-block:: cpp + + TEST_CASE("This test is hidden from default runs", "[.]") { + REQUIRE(1 == 2); + } + +You can run all tests requiring a detector by running the following command: + +.. code-block:: console + + tests "[.detectorintegration]" + + +.. note :: + + This only works if a configured simulator (or an actual configured detector) and receiver are already set up to run the tests. There is a script that automatically sets up virtual detectors and runs all integration tests. See Section :ref:`Simulator Script. ` below. + + +If you want to disable testing that involves a data file that require pc tuning optimizations, add the hidden tag ``[.disable_check_data_file]`` to the test case. Please note that only some specific disable tests have been implemented so far. + +.. code-block:: console + + tests "[detectorintegration]~[disable_check_data_file]" + +.. note :: + + Ensure that there are no spaces betweent the tags and no '.', else hardly any test will be matched. + +.. _python simulator script: + +Simulator Script: +----------------- + +One can also just run the following script, which will run your tests for all the detector types (simulators only) with a pre-determined configuration. + +.. code-block:: console + + cd build + python bin/test_simulators.py + +This runs all tests marked with the tag ``[.detectorintegration]`` for all detector simulators. +If you want to run them for a specific virtual detector or a specific test use the following command: + +.. code-block:: console + cd build + python bin/test_simulators.py --servers jungfrau --test "[.rx]" + +You can exclude specific tests by adding the option ``~[]``. Again, we assume that this marker is added to the tests that you want to exclude. + +.. code-block:: console + cd build + python bin/test_simulators.py --servers eiger jungfrau moench --test "[detectorintegration]~[disable_check_data_file]" + +You can additionally run all the tests not requiring detectors using the script ``bin/test_simulators.py`` by passing the option ``--general-tests``. + +One can use ``--no-log-file`` if you dont want to create a log files and instead print to console. If you prefer to not print to console either, add ``--quiet``. + + +Pytest Tests +----------------- + +To run the python tests use the following commands: + +.. code-block:: console + + cd build + cmake ../ -DSLS_USE_PYTHON=ON + export PYTHONPATH=$PWD/bin + python -m pytest ../python/tests/ + +If a test requires a detector mark them with the pytest marker ``@pytest.mark.detectorintegration``. + +To run only tests requiring virtual detectors use the following command: + +.. code-block:: console + #in build + python -m pytest -m detectorintegration ../python/tests/ + +There is a helper test fixture in ``slsDetectorSoftware/python/tests/conftest.py`` called ``test_with_simulators`` that sets up virtual detectors and yields the test for all detectors. The set up is done for every test automatically. + +Example usage: + +.. code-block:: python + + import pytest + + @pytest.mark.detectorintegration + def test_example_with_simulator(test_with_simulators): + # your test code here + +If you want to run the test only for a specific test use the parametrized test fixture: + +Example usage: + +.. code-block:: python + + import pytest + + @pytest.mark.detectorintegration + @pytest.mark.parametrize("setup_parameters", [([""], )], indirect=True) + def test_example_with_specific_simulators(test_with_simulators, setup_parameters): + # your test code here + + +There is another helper test fixture in ``slsDetectorSoftware/python/tests/conftest.py`` called ``session_simulator`` that sets up virtual detectors and yields the test for all detectors. The difference with the previous fixture ``test_with_simulators`` is that this fixture will set up one detector at a time and run all the tests using this fixture before cleaning up and moving on to the next detector. It saves time if the setup and cleanup is expensive. + +Example usage: + +.. code-block:: python + + import pytest + + @pytest.mark.detectorintegration + def test_define_reg(session_simulator, request): + """ Test setting define_reg for ctb and xilinx_ctb.""" + det_type, num_interfaces, num_mods, d = session_simulator + assert d is not None + + from slsdet import RegisterAddress + + if det_type in ['ctb', 'xilinx_ctb']: + # your test code here + +For more specific parameters, you can parametrize the fixture like below: + +.. code-block:: python + + import pytest + + @pytest.mark.detectorintegration + @pytest.mark.parametrize( + "session_simulator", + [ + ("ctb", 1, 1), + ("xilinx_ctb", 1, 1), + ], + indirect=True, + ) + def test_define_reg(session_simulator): + det_type, num_interfaces, num_mods, d = session_simulator + # your test code here diff --git a/docs/src/index.rst b/docs/src/index.rst index 4ba406a17..d62597601 100644 --- a/docs/src/index.rst +++ b/docs/src/index.rst @@ -66,6 +66,7 @@ slsDetectorPackage container_utils type_traits ToString + Testing .. toctree:: :caption: Firmware diff --git a/integrationTests/CMakeLists.txt b/integrationTests/CMakeLists.txt deleted file mode 100755 index a270593fe..000000000 --- a/integrationTests/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# SPDX-License-Identifier: LGPL-3.0-or-other -# Copyright (C) 2021 Contributors to the SLS Detector Package -# MESSAGE( STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR} ) -# MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} ) - - - -# include_directories( -# ${PROJECT_SOURCE_DIR}/catch -# ) - -# target_sources(tests PRIVATE -# ${CMAKE_CURRENT_SOURCE_DIR}/test-integrationMulti.cpp -# ${CMAKE_CURRENT_SOURCE_DIR}/test-integrationDectector.cpp -# ${CMAKE_CURRENT_SOURCE_DIR}/test-eigerIntegration.cpp -# ) - -# if(SLS_USE_TESTS) -# set(TEST_SOURCES -# src/test-slsDetector.cpp -# src/test.cpp -# ) -# add_executable(detector_test ${TEST_SOURCES}) - -# target_link_libraries(detector_test -# slsDetectorShared -# slsProjectOptions -# slsProjectWarnings -# slsSupportLib -# pthread -# rt -# ) -# set_target_properties(detector_test PROPERTIES -# RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin -# ) - - - -# endif() - diff --git a/integrationTests/test-eigerIntegration.cpp b/integrationTests/test-eigerIntegration.cpp deleted file mode 100644 index 6fa4124d2..000000000 --- a/integrationTests/test-eigerIntegration.cpp +++ /dev/null @@ -1,204 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-other -// Copyright (C) 2021 Contributors to the SLS Detector Package -#include "DetectorImpl.h" -#include "catch.hpp" -#include "sls/string_utils.h" -#include "tests/globals.h" -#include - -namespace sls { - -class MultiDetectorFixture { - protected: - DetectorImpl d; - - public: - MultiDetectorFixture() : d(0, true, true) { - d.setHostname(test::hostname.c_str()); - if (test::my_ip != "undefined") - d.setReceiverHostname(test::my_ip); - } - ~MultiDetectorFixture() { d.freeSharedMemory(); } -}; - -TEST_CASE_METHOD(MultiDetectorFixture, "Set and get dacs", - "[.eigerintegration][cli]") { - auto th = 1000; - - // set and read back each individual dac of EIGER - d.setDAC(0, di::SVP, 0); - CHECK(d.setDAC(-1, di::SVP, 0) == 0); - d.setDAC(4000, di::SVN, 0); - CHECK(d.setDAC(-1, di::SVN, 0) == 4000); - d.setDAC(2000, di::VTR, 0); - CHECK(d.setDAC(-1, di::VTR, 0) == 2000); - d.setDAC(3500, di::VRF, 0); - CHECK(d.setDAC(-1, di::VRF, 0) == 3500); - d.setDAC(1400, di::VRS, 0); - CHECK(d.setDAC(-1, di::VRS, 0) == 1400); - d.setDAC(2556, di::VTGSTV, 0); - CHECK(d.setDAC(-1, di::VTGSTV, 0) == 2556); - d.setDAC(1500, di::VCMP_LL, 0); - CHECK(d.setDAC(-1, di::VCMP_LL, 0) == 1500); - d.setDAC(1400, di::VCMP_LR, 0); - CHECK(d.setDAC(-1, di::VCMP_LR, 0) == 1400); - d.setDAC(4000, di::CAL, 0); - CHECK(d.setDAC(-1, di::CAL, 0) == 4000); - d.setDAC(1300, di::VCMP_RL, 0); - CHECK(d.setDAC(-1, di::VCMP_RL, 0) == 1300); - d.setDAC(1200, di::VCMP_RR, 0); - CHECK(d.setDAC(-1, di::VCMP_RR, 0) == 1200); - d.setDAC(1100, di::RXB_RB, 0); - CHECK(d.setDAC(-1, di::RXB_RB, 0) == 1100); - d.setDAC(1100, di::RXB_LB, 0); - CHECK(d.setDAC(-1, di::RXB_LB, 0) == 1100); - d.setDAC(1500, di::VCP, 0); - CHECK(d.setDAC(-1, di::VCP, 0) == 1500); - d.setDAC(2000, di::VCN, 0); - CHECK(d.setDAC(-1, di::VCN, 0) == 2000); - d.setDAC(1550, di::VIS, 0); - CHECK(d.setDAC(-1, di::VIS, 0) == 1550); - d.setDAC(660, di::IO_DELAY, 0); - CHECK(d.setDAC(-1, di::IO_DELAY, 0) == 660); - - // setting threshold sets all individual vcmp - d.setDAC(th, di::THRESHOLD, 0); - CHECK(d.setDAC(-1, di::THRESHOLD, 0) == th); - CHECK(d.setDAC(-1, di::VCMP_LL, 0) == th); - CHECK(d.setDAC(-1, di::VCMP_LR, 0) == th); - CHECK(d.setDAC(-1, di::VCMP_RL, 0) == th); - CHECK(d.setDAC(-1, di::VCMP_RR, 0) == th); - - // different values gives -1 - if (d.getNumberOfDetectors() > 1) { - d.setDAC(1600, di::VCMP_LL, 0, 0); - d.setDAC(1700, di::VCMP_LL, 0, 1); - CHECK(d.setDAC(-1, di::VCMP_LL, 0, 0) == 1600); - CHECK(d.setDAC(-1, di::VCMP_LL, 0, 1) == 1700); - CHECK(d.setDAC(-1, di::VCMP_LL, 0) == -1); - CHECK(d.setDAC(-1, di::THRESHOLD, 0) == -1); - CHECK(d.setDAC(-1, di::THRESHOLD, 0, 0) == -1); - CHECK(d.setDAC(-1, di::THRESHOLD, 0, 1) == -1); - } -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Read temperatures", - "[.eigerintegration][cli]") { - std::vector tempindex{di::TEMPERATURE_FPGA, di::TEMPERATURE_FPGA2, - di::TEMPERATURE_FPGA3}; - for (auto index : tempindex) { - for (int i = 0; i != d.getNumberOfDetectors(); ++i) { - double temp = static_cast(d.getADC(index, 0)) / 1000; - CHECK(temp > 20); - CHECK(temp < 60); - } - } -} - -int to_time(uint32_t reg) { - uint32_t clocks = reg >> 3; - uint32_t exponent = (reg & 0b111) + 1; - return clocks * pow(10, exponent); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Read/write register", - "[.eigerintegration][cli]") { - d.setNumberOfFrames(1); - d.setExposureTime(10000); - d.acquire(); - CHECK(to_time(d.readRegister(0x4, 0)) == 10000); - - d.writeRegister(0x4, 500); - CHECK(d.readRegister(0x4) == 500); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Set dynamic range", - "[.eigerintegration][cli][dr]") { - std::vector dynamic_range{4, 8, 16, 32}; - for (auto dr : dynamic_range) { - d.setDynamicRange(dr); - CHECK(d.setDynamicRange() == dr); - } -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Set clock divider", - "[.eigerintegration][cli][this]") { - for (int i = 0; i != 3; ++i) { - d.setSpeed(sv::CLOCK_DIVIDER, i); - CHECK(d.setSpeed(sv::CLOCK_DIVIDER) == i); - } -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Get time left", - "[.eigerintegration][cli]") { - CHECK_THROWS(d.getTimeLeft(ti::PROGRESS)); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Get ID", "[.eigerintegration][cli]") { - std::string hn = test::hostname; - hn.erase(std::remove(begin(hn), end(hn), 'b'), end(hn)); - hn.erase(std::remove(begin(hn), end(hn), 'e'), end(hn)); - auto hostnames = split(hn, '+'); - CHECK(hostnames.size() == d.getNumberOfDetectors()); - for (int i = 0; i != d.getNumberOfDetectors(); ++i) { - CHECK(d.getId(defs::DETECTOR_SERIAL_NUMBER, 0) == - std::stoi(hostnames[0])); - } -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Lock server", - "[.eigerintegration][cli]") { - - d.lockServer(1); - CHECK(d.lockServer() == 1); - d.lockServer(0); - CHECK(d.lockServer() == 0); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Settings", "[.eigerintegration][cli]") { - CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "Set readout flags", - "[.eigerintegration][cli]") { - d.setReadOutFlags(defs::PARALLEL); - CHECK((d.setReadOutFlags() & defs::PARALLEL)); - - d.setReadOutFlags(defs::NONPARALLEL); - CHECK_FALSE((d.setReadOutFlags() & defs::PARALLEL)); - CHECK((d.setReadOutFlags() & defs::NONPARALLEL)); -} - -// TEST_CASE_METHOD(MultiDetectorFixture, "Flow control and tengiga", -// "[.eigerintegration][cli]") { -// d.setFlowControl10G(1); -// CHECK(d.setFlowControl10G() == 1); -// d.setFlowControl10G(0); -// CHECK(d.setFlowControl10G() == 0); - -// d.enableTenGigabitEthernet(1); -// CHECK(d.enableTenGigabitEthernet() == 1); -// d.enableTenGigabitEthernet(0); -// CHECK(d.enableTenGigabitEthernet() == 0); -// } - -TEST_CASE_METHOD(MultiDetectorFixture, "activate", "[.eigerintegration][cli]") { - d.activate(0); - CHECK(d.activate() == 0); - d.activate(1); - CHECK(d.activate() == 1); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "all trimbits", - "[.eigerintegration][cli]") { - d.setAllTrimbits(32); - CHECK(d.setAllTrimbits(-1) == 32); -} - -TEST_CASE_METHOD(MultiDetectorFixture, "rate correction", - "[.eigerintegration][cli]") { - d.setRateCorrection(200); - CHECK(d.getRateCorrection() == 200); -} - -} // namespace sls diff --git a/integrationTests/test-integrationDectector.cpp b/integrationTests/test-integrationDectector.cpp deleted file mode 100644 index c02066513..000000000 --- a/integrationTests/test-integrationDectector.cpp +++ /dev/null @@ -1,522 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-other -// Copyright (C) 2021 Contributors to the SLS Detector Package - -#include "catch.hpp" - -#include "DetectorImpl.h" -#include "Module.h" -#include "sls/ClientSocket.h" -#include "sls/logger.h" -#include "sls/sls_detector_defs.h" - -#include "sls/Timer.h" -#include "sls/sls_detector_funcs.h" -#include -#include -#define VERBOSE - -// Header holding all configurations for different detectors -#include "tests/config.h" -#include "tests/globals.h" -// using namespace test; -// using dt = slsDetectorDefs::detectorType; -// extern std::string hostname; -// extern std::string detector_type; -// extern dt type; - -namespace sls { - -TEST_CASE("Single detector no receiver", "[.integration][.single]") { - auto t = Module::getTypeFromDetector(test::hostname); - CHECK(t == test::type); - - Module d(t); - CHECK(d.getDetectorTypeAsEnum() == t); - CHECK(d.getDetectorTypeAsString() == test::detector_type); - - d.setHostname(test::hostname); - CHECK(d.getHostname() == test::hostname); - - CHECK(d.setDetectorType() == test::type); - - d.freeSharedMemory(); -} - -TEST_CASE("Set control port then create a new object with this control port", - "[.integration][.single]") { - /* - TODO! - Standard port but should not be hardcoded - Is this the best way to initialize the detectors - Using braces to make the object go out of scope - */ - int old_cport = DEFAULT_TCP_CNTRL_PORTNO; - int old_sport = DEFAULT_TCP_STOP_PORTNO; - int new_cport = 1993; - int new_sport = 2000; - { - Module d(test::type); - d.setHostname(test::hostname); - CHECK(d.getControlPort() == old_cport); - d.setControlPort(new_cport); - CHECK(d.getStopPort() == old_sport); - d.setStopPort(new_sport); - d.freeSharedMemory(); - } - { - Module d(test::type); - d.setHostname(test::hostname); - d.setControlPort(new_cport); - d.setStopPort(new_sport); - CHECK(d.getControlPort() == new_cport); - CHECK(d.getStopPort() == new_sport); - - // Reset standard ports - d.setControlPort(old_cport); - d.setStopPort(old_sport); - d.freeSharedMemory(); - } - - Module d(test::type); - d.setHostname(test::hostname); - CHECK(d.getStopPort() == DEFAULT_TCP_STOP_PORTNO); - d.freeSharedMemory(); -} - -TEST_CASE("single EIGER detector no receiver basic set and get", - "[.integration][eiger]") { - // TODO! this test should take command line arguments for config - SingleDetectorConfig c; - - // Read type by connecting to the detector - auto type = Module::getTypeFromDetector(c.hostname); - CHECK(type == c.type_enum); - - // Create Module of said type and set hostname and detector online - Module d(type); - CHECK(d.getDetectorTypeAsEnum() == type); - CHECK(d.getDetectorTypeAsString() == c.type_string); - - d.setHostname(c.hostname); - CHECK(d.getHostname() == c.hostname); - - CHECK(d.getUseReceiverFlag() == false); - CHECK_NOTHROW(d.checkDetectorVersionCompatibility()); - - // Setting and reading exposure time - auto t = 1000000000; - d.setExptime(t); - CHECK(d.getExptime() == t); - - // size of an eiger half module with and without gap pixels - CHECK(d.getTotalNumberOfChannels() == 256 * 256 * 4); - CHECK(d.getTotalNumberOfChannels(slsDetectorDefs::dimension::X) == 1024); - CHECK(d.getTotalNumberOfChannels(slsDetectorDefs::dimension::Y) == 256); - // CHECK(d.getTotalNumberOfChannels(slsDetectorDefs::dimension::Z) == 1); - CHECK(d.getTotalNumberOfChannelsInclGapPixels( - slsDetectorDefs::dimension::X) == 1024); - CHECK(d.getTotalNumberOfChannelsInclGapPixels( - slsDetectorDefs::dimension::Y) == 256); - // CHECK(d.getTotalNumberOfChannelsInclGapPixels(slsDetectorDefs::dimension::Z) - // == 1); - - CHECK(d.getNChans() == 256 * 256); - CHECK(d.getNChans(slsDetectorDefs::dimension::X) == 256); - CHECK(d.getNChans(slsDetectorDefs::dimension::Y) == 256); - // CHECK(d.getNChans(slsDetectorDefs::dimension::Z) == 1); - - CHECK(d.getNChips() == 4); - CHECK(d.getNChips(slsDetectorDefs::dimension::X) == 4); - CHECK(d.getNChips(slsDetectorDefs::dimension::Y) == 1); - // CHECK(d.getNChips(slsDetectorDefs::dimension::Z) == 1); - - d.freeSharedMemory(); -} - -TEST_CASE("Locking mechanism and last ip", "[.integration][.single]") { - Module d(test::type); - d.setHostname(test::hostname); - - // Check that detector server is unlocked then lock - CHECK(d.lockServer() == 0); - d.lockServer(1); - CHECK(d.lockServer() == 1); - - // Can we still access the detector while it's locked - auto t = 1300000000; - d.setExptime(t); - CHECK(d.getExptime() == t); - - // unlock again and free - d.lockServer(0); - CHECK(d.lockServer() == 0); - - CHECK(d.getLastClientIP() == test::my_ip); - d.freeSharedMemory(); -} - -TEST_CASE("Set settings", "[.integration][.single]") { - Module d(test::type); - d.setHostname(test::hostname); - CHECK(d.setSettings(defs::STANDARD) == defs::STANDARD); -} - -TEST_CASE("Timer functions", "[.integration][cli]") { - // FRAME_NUMBER, /**< number of real time frames: total number of - // acquisitions is number or frames*number of triggers */ ACQUISITION_TIME, - // /**< exposure time */ FRAME_PERIOD, /**< period between exposures */ - // DELAY_AFTER_TRIGGER, /**< delay between trigger and start of exposure or - // readout (in triggered mode) */ GATES_NUMBER, /**< number of gates per - // frame (in gated mode) */ TRIGGER_NUMBER, /**< number of triggers: total - // number of acquisitions is number or frames*number of triggers */ - // ACTUAL_TIME, /**< Actual time of the detector's internal timer */ - // MEASUREMENT_TIME, /**< Time of the measurement from the detector (fifo) - // */ - - // PROGRESS, /**< fraction of measurement elapsed - only get! */ - // MEASUREMENTS_NUMBER, - // FRAMES_FROM_START, - // FRAMES_FROM_START_PG, - // SAMPLES, - // SUBFRAME_ACQUISITION_TIME, /**< subframe exposure time */ - // STORAGE_CELL_NUMBER, /** list = m.getReceiverDbitList(); - list.clear(); - for (int i = 0; i < 10; ++i) - list.push_back(i); - m.setReceiverDbitList(list); - - CHECK(m.getReceiverDbitList().size() == 10); - - list.push_back(64); - CHECK_THROWS_AS(m.setReceiverDbitList(list), RuntimeError); - CHECK_THROWS_WITH(m.setReceiverDbitList(list), - Catch::Matchers::Contains("be between 0 and 63")); - - list.clear(); - for (int i = 0; i < 65; ++i) - list.push_back(i); - CHECK(list.size() == 65); - CHECK_THROWS_WITH(m.setReceiverDbitList(list), - Catch::Matchers::Contains("be greater than 64")); - - list.clear(); - m.setReceiverDbitList(list); - CHECK(m.getReceiverDbitList().empty()); - - // adcinvert - m.setADCInvert(0); - CHECK(m.getADCInvert() == 0); - m.setADCInvert(5); - CHECK(m.getADCInvert() == 5); - m.setADCInvert(-1); - CHECK(m.getADCInvert() == -1); - - // ext sampling reg - m.setExternalSamplingSource(0); - CHECK(m.getExternalSamplingSource() == 0); - m.setExternalSamplingSource(62); - CHECK(m.getExternalSamplingSource() == 62); - CHECK_THROWS_WITH(m.setExternalSamplingSource(64), - Catch::Matchers::Contains("be 0-63")); - CHECK(m.getExternalSamplingSource() == 62); - m.setExternalSampling(1); - CHECK(m.getExternalSampling() == 1); - m.setExternalSampling(0); - CHECK(m.getExternalSampling() == 0); - m.setExternalSampling(1); - CHECK(m.getExternalSampling() == 1); - CHECK(m.readRegister(0x7b) == 0x1003E); -} - -TEST_CASE("Eiger or Jungfrau nextframenumber", - "[.eigerintegration][.jungfrauintegration][nextframenumber]") { - SingleDetectorConfig c; - - // pick up multi detector from shm id 0 - DetectorImpl m(0); - - // ensure ctb detector type, hostname and online - REQUIRE( - ((m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER) || - (m.getDetectorTypeAsEnum() == - slsDetectorDefs::detectorType::JUNGFRAU))); - REQUIRE(m.getHostname() == c.hostname); - - CHECK(m.setNumberOfFrames(1) == 1); - - // starting fnum - uint64_t val = 8; - - m.setNextFrameNumber(val); - CHECK(m.getNextFrameNumber() == val); - CHECK(m.acquire() == slsDetectorDefs::OK); - CHECK(m.getReceiverCurrentFrameIndex() == val); - - ++val; - CHECK(m.acquire() == slsDetectorDefs::OK); - CHECK(m.getReceiverCurrentFrameIndex() == val); - - CHECK_THROWS_AS(m.setNextFrameNumber(0), RuntimeError); - - if (m.getDetectorTypeAsString() == "Eiger") { - val = 281474976710655; - } else if (m.getDetectorTypeAsString() == "Jungfrau") { - val = 18446744073709551615; - } - m.setNextFrameNumber(val); - CHECK(m.getNextFrameNumber() == val); - CHECK(m.acquire() == slsDetectorDefs::OK); - CHECK(m.getReceiverCurrentFrameIndex() == val); - CHECK(m.getNextFrameNumber() == (val + 1)); -} - -TEST_CASE("Eiger partialread", "[.eigerintegration][partialread]") { - SingleDetectorConfig c; - - // pick up multi detector from shm id 0 - DetectorImpl m(0); - - // ensure detector type, hostname - REQUIRE( - (m.getDetectorTypeAsEnum() == slsDetectorDefs::detectorType::EIGER)); - REQUIRE(m.getHostname() == c.hostname); - - m.setDynamicRange(16); - m.enableTenGigabitEthernet(0); - m.setPartialReadout(256); - CHECK(m.getPartialReadout() == 256); - m.setPartialReadout(1); - CHECK(m.getPartialReadout() == 1); - - m.setDynamicRange(8); - m.setPartialReadout(256); - CHECK(m.getPartialReadout() == 256); - CHECK_THROWS_AS(m.setPartialReadout(1), RuntimeError); - CHECK(m.getPartialReadout() == 256); - CHECK_THROWS_AS(m.setPartialReadout(0), RuntimeError); - m.setPartialReadout(256); -} - -} // namespace sls diff --git a/integrationTests/test-integrationMulti.cpp b/integrationTests/test-integrationMulti.cpp deleted file mode 100644 index 40f77c6dd..000000000 --- a/integrationTests/test-integrationMulti.cpp +++ /dev/null @@ -1,108 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-other -// Copyright (C) 2021 Contributors to the SLS Detector Package -#include "DetectorImpl.h" -#include "catch.hpp" -#include "sls/string_utils.h" -#include "tests/globals.h" -#include - -namespace sls { - -using namespace Catch::literals; - -TEST_CASE("Initialize a multi detector", "[.integration][.multi]") { - auto hostnames = split(test::hostname, '+'); - - DetectorImpl d(0, true, true); - d.setHostname(test::hostname.c_str()); - - CHECK(d.getHostname() == test::hostname); - for (size_t i = 0; i != hostnames.size(); ++i) { - CHECK(d.getHostname(i) == hostnames[i]); - } - - CHECK(d.getDetectorTypeAsEnum() == test::type); - CHECK(d.getDetectorTypeAsString() == test::detector_type); - - CHECK(d.getNumberOfDetectors() == hostnames.size()); - d.freeSharedMemory(); -} - -TEST_CASE("Set and read timers", "[.integration][.multi]") { - - DetectorImpl d(0, true, true); - d.setHostname(test::hostname.c_str()); - - // FRAME_NUMBER - int n_frames = 3; - d.setNumberOfFrames(n_frames); - CHECK(d.setNumberOfFrames() == n_frames); - - // ACQUISITION_TIME - double exptime = 0.3; - d.setExposureTime(exptime, true); - CHECK(d.setExposureTime(-1, true) == Approx(exptime)); - CHECK(d.setExposureTime(-1) == Approx(exptime * 1E9)); - - // FRAME_PERIOD, - double period = 0.5; - d.setExposurePeriod(period, true); - CHECK(d.setExposurePeriod(-1, true) == Approx(period)); - CHECK(d.setExposurePeriod(-1) == Approx(period * 1E9)); - - // DELAY_AFTER_TRIGGER, - // GATES_NUMBER, - // TRIGGER_NUMBER, - // ACTUAL_TIME - // MEASUREMENT_TIME - - // PROGRESS, /**< fraction of measurement elapsed - only get! */ - // MEASUREMENTS_NUMBER, - - // FRAMES_FROM_START, - // FRAMES_FROM_START_PG, - // SAMPLES, - - // SUBFRAME_ACQUISITION_TIME, /**< subframe exposure time */ - double subframe_exposure = 2000000; // ns - if (test::type == dt::EIGER) { - d.setSubFrameExposureTime(subframe_exposure); - CHECK(d.setSubFrameExposureTime(-1) == Approx(subframe_exposure)); - } - - // STORAGE_CELL_NUMBER, /** cmds{"v_a", "v_b", "v_c", "v_d"}; + std::vector indices{defs::V_POWER_A, defs::V_POWER_B, + defs::V_POWER_C, defs::V_POWER_D}; + if (det.isVirtualDetectorServer().tsquash("Inconsistent virtual servers")) { + cmds.push_back("v_io"); + indices.push_back(defs::V_POWER_IO); + } - std::vector cmds{"v_a", "v_b", "v_c", "v_d", "v_io"}; - std::vector indices{defs::V_POWER_A, defs::V_POWER_B, - defs::V_POWER_C, defs::V_POWER_D, - defs::V_POWER_IO}; - - for (size_t i = 0; i < cmds.size(); ++i) { - if (det_type == defs::CHIPTESTBOARD || - det_type == defs::XILINX_CHIPTESTBOARD) { - auto prev_val = det.getPower(indices[i]); - // this is the first command touching power dacs, should not be - // -100 - if (det_type == defs::XILINX_CHIPTESTBOARD) { - REQUIRE(prev_val.any(-100) == false); - REQUIRE(prev_val.any(-1) == false); - } - { - std::ostringstream oss; - caller.call(cmds[i], {"0"}, -1, PUT, oss); - REQUIRE(oss.str() == cmds[i] + " 0\n"); - } - { - std::ostringstream oss1, oss2; - caller.call(cmds[i], {"1200"}, -1, PUT, oss1); - REQUIRE(oss1.str() == cmds[i] + " 1200\n"); - caller.call(cmds[i], {}, -1, GET, oss2); - REQUIRE(oss2.str() == cmds[i] + " 1200\n"); - } - for (int i = 0; i != det.size(); ++i) { - if (det_type == defs::XILINX_CHIPTESTBOARD && - prev_val[i] == -100) { - prev_val[i] = 0; - continue; - } - det.setPower(indices[i], prev_val[i], {i}); - } - - } else { - REQUIRE_THROWS(caller.call(cmds[i], {}, -1, GET)); + for (size_t i = 0; i < cmds.size(); ++i) { + if (det_type == defs::CHIPTESTBOARD || + det_type == defs::XILINX_CHIPTESTBOARD) { + auto prev_val = det.getPower(indices[i]); + // this is the first command touching power dacs, should not be + // -100 + if (det_type == defs::XILINX_CHIPTESTBOARD) { + REQUIRE(prev_val.any(-100) == false); + REQUIRE(prev_val.any(-1) == false); } + { + std::ostringstream oss; + caller.call(cmds[i], {"0"}, -1, PUT, oss); + REQUIRE(oss.str() == cmds[i] + " 0\n"); + } + { + std::ostringstream oss1, oss2; + caller.call(cmds[i], {"1200"}, -1, PUT, oss1); + REQUIRE(oss1.str() == cmds[i] + " 1200\n"); + caller.call(cmds[i], {}, -1, GET, oss2); + REQUIRE(oss2.str() == cmds[i] + " 1200\n"); + } + for (int imod = 0; imod != det.size(); ++imod) { + if (det_type == defs::XILINX_CHIPTESTBOARD && + prev_val[imod] == -100) { + prev_val[imod] = 0; + } + det.setPower(indices[i], prev_val[imod], {imod}); + } + + } else { + REQUIRE_THROWS(caller.call(cmds[i], {}, -1, GET)); } } } -TEST_CASE("v_io", "[.cmdcall]") { +TEST_CASE("v_io", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1093,7 +1093,7 @@ TEST_CASE("v_io", "[.cmdcall]") { } } -TEST_CASE("v_chip", "[.cmdcall]") { +TEST_CASE("v_chip", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1105,7 +1105,7 @@ TEST_CASE("v_chip", "[.cmdcall]") { } } -TEST_CASE("vm_a", "[.cmdcall]") { +TEST_CASE("vm_a", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1116,7 +1116,7 @@ TEST_CASE("vm_a", "[.cmdcall]") { } } -TEST_CASE("vm_b", "[.cmdcall]") { +TEST_CASE("vm_b", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1127,7 +1127,7 @@ TEST_CASE("vm_b", "[.cmdcall]") { } } -TEST_CASE("vm_c", "[.cmdcall]") { +TEST_CASE("vm_c", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1138,7 +1138,7 @@ TEST_CASE("vm_c", "[.cmdcall]") { } } -TEST_CASE("vm_d", "[.cmdcall]") { +TEST_CASE("vm_d", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1149,7 +1149,7 @@ TEST_CASE("vm_d", "[.cmdcall]") { } } -TEST_CASE("vm_io", "[.cmdcall]") { +TEST_CASE("vm_io", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1160,7 +1160,7 @@ TEST_CASE("vm_io", "[.cmdcall]") { } } -TEST_CASE("im_a", "[.cmdcall]") { +TEST_CASE("im_a", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1171,7 +1171,7 @@ TEST_CASE("im_a", "[.cmdcall]") { } } -TEST_CASE("im_b", "[.cmdcall]") { +TEST_CASE("im_b", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1182,7 +1182,7 @@ TEST_CASE("im_b", "[.cmdcall]") { } } -TEST_CASE("im_c", "[.cmdcall]") { +TEST_CASE("im_c", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1193,7 +1193,7 @@ TEST_CASE("im_c", "[.cmdcall]") { } } -TEST_CASE("im_d", "[.cmdcall]") { +TEST_CASE("im_d", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1204,7 +1204,7 @@ TEST_CASE("im_d", "[.cmdcall]") { } } -TEST_CASE("im_io", "[.cmdcall]") { +TEST_CASE("im_io", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1215,7 +1215,7 @@ TEST_CASE("im_io", "[.cmdcall]") { } } -TEST_CASE("slowadc", "[.cmdcall]") { +TEST_CASE("slowadc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1231,7 +1231,7 @@ TEST_CASE("slowadc", "[.cmdcall]") { } } -TEST_CASE("extsampling", "[.cmdcall]") { +TEST_CASE("extsampling", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1261,7 +1261,7 @@ TEST_CASE("extsampling", "[.cmdcall]") { } } -TEST_CASE("extsamplingsrc", "[.cmdcall]") { +TEST_CASE("extsamplingsrc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1292,7 +1292,7 @@ TEST_CASE("extsamplingsrc", "[.cmdcall]") { } } -TEST_CASE("diodelay", "[.cmdcall]") { +TEST_CASE("diodelay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1315,7 +1315,7 @@ TEST_CASE("diodelay", "[.cmdcall]") { } } -TEST_CASE("led", "[.cmdcall]") { +TEST_CASE("led", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp index ae6a6c824..4f05256fa 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-eiger.cpp @@ -19,7 +19,7 @@ using test::PUT; /** temperature */ -TEST_CASE("temp_fpgaext", "[.cmdcall]") { +TEST_CASE("temp_fpgaext", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -34,7 +34,7 @@ TEST_CASE("temp_fpgaext", "[.cmdcall]") { } } -TEST_CASE("temp_10ge", "[.cmdcall]") { +TEST_CASE("temp_10ge", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -49,7 +49,7 @@ TEST_CASE("temp_10ge", "[.cmdcall]") { } } -TEST_CASE("temp_dcdc", "[.cmdcall]") { +TEST_CASE("temp_dcdc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -64,7 +64,7 @@ TEST_CASE("temp_dcdc", "[.cmdcall]") { } } -TEST_CASE("temp_sodl", "[.cmdcall]") { +TEST_CASE("temp_sodl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -79,7 +79,7 @@ TEST_CASE("temp_sodl", "[.cmdcall]") { } } -TEST_CASE("temp_sodr", "[.cmdcall]") { +TEST_CASE("temp_sodr", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -94,7 +94,7 @@ TEST_CASE("temp_sodr", "[.cmdcall]") { } } -TEST_CASE("temp_fpgafl", "[.cmdcall]") { +TEST_CASE("temp_fpgafl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -109,7 +109,7 @@ TEST_CASE("temp_fpgafl", "[.cmdcall]") { } } -TEST_CASE("temp_fpgafr", "[.cmdcall]") { +TEST_CASE("temp_fpgafr", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -126,7 +126,8 @@ TEST_CASE("temp_fpgafr", "[.cmdcall]") { /* dacs */ -TEST_CASE("Setting and reading back EIGER dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back EIGER dacs", + "[.detectorintegration][.dacs]") { // vsvp, vtr, vrf, vrs, vsvn, vtgstv, vcmp_ll, vcmp_lr, vcal, vcmp_rl, // rxb_rb, rxb_lb, vcmp_rr, vcp, vcn, vis, vthreshold Detector det; @@ -232,7 +233,7 @@ TEST_CASE("Setting and reading back EIGER dacs", "[.cmdcall][.dacs]") { /* Network Configuration (Detector<->Receiver) */ -TEST_CASE("txdelay_left", "[.cmdcall]") { +TEST_CASE("txdelay_left", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -253,7 +254,7 @@ TEST_CASE("txdelay_left", "[.cmdcall]") { } } -TEST_CASE("txdelay_right", "[.cmdcall]") { +TEST_CASE("txdelay_right", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -276,7 +277,7 @@ TEST_CASE("txdelay_right", "[.cmdcall]") { /* Eiger Specific */ -TEST_CASE("subexptime", "[.cmdcall]") { +TEST_CASE("subexptime", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -297,7 +298,7 @@ TEST_CASE("subexptime", "[.cmdcall]") { } } -TEST_CASE("subdeadtime", "[.cmdcall]") { +TEST_CASE("subdeadtime", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -318,7 +319,7 @@ TEST_CASE("subdeadtime", "[.cmdcall]") { } } -TEST_CASE("overflow", "[.cmdcall]") { +TEST_CASE("overflow", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -339,7 +340,7 @@ TEST_CASE("overflow", "[.cmdcall]") { } } -TEST_CASE("ratecorr", "[.cmdcall]") { +TEST_CASE("ratecorr", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -373,7 +374,7 @@ TEST_CASE("ratecorr", "[.cmdcall]") { } } -TEST_CASE("interruptsubframe", "[.cmdcall]") { +TEST_CASE("interruptsubframe", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -397,7 +398,7 @@ TEST_CASE("interruptsubframe", "[.cmdcall]") { } } -TEST_CASE("measuredperiod", "[.cmdcall]") { +TEST_CASE("measuredperiod", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -434,7 +435,7 @@ TEST_CASE("measuredperiod", "[.cmdcall]") { } } -TEST_CASE("measuredsubperiod", "[.cmdcall]") { +TEST_CASE("measuredsubperiod", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -474,7 +475,7 @@ TEST_CASE("measuredsubperiod", "[.cmdcall]") { } } -TEST_CASE("activate", "[.cmdcall]") { +TEST_CASE("activate", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -505,7 +506,7 @@ TEST_CASE("activate", "[.cmdcall]") { } } -TEST_CASE("partialreset", "[.cmdcall]") { +TEST_CASE("partialreset", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -527,7 +528,7 @@ TEST_CASE("partialreset", "[.cmdcall]") { } } -TEST_CASE("pulse", "[.cmdcall]") { +TEST_CASE("pulse", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -542,7 +543,7 @@ TEST_CASE("pulse", "[.cmdcall]") { } } -TEST_CASE("pulsenmove", "[.cmdcall]") { +TEST_CASE("pulsenmove", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -557,7 +558,7 @@ TEST_CASE("pulsenmove", "[.cmdcall]") { } } -TEST_CASE("pulsechip", "[.cmdcall]") { +TEST_CASE("pulsechip", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -572,7 +573,7 @@ TEST_CASE("pulsechip", "[.cmdcall]") { } } -TEST_CASE("quad", "[.cmdcall]") { +TEST_CASE("quad", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -588,7 +589,7 @@ TEST_CASE("quad", "[.cmdcall]") { } } -TEST_CASE("datastream", "[.cmdcall]") { +TEST_CASE("datastream", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -628,7 +629,7 @@ TEST_CASE("datastream", "[.cmdcall]") { } } -TEST_CASE("top", "[.cmdcall]") { +TEST_CASE("top", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp index c27ff05d5..0dfc527ac 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-global.cpp @@ -125,12 +125,6 @@ void test_acquire_binary_file_size(const testFileInfo &file_info, REQUIRE(actual_file_size == expected_file_size); } -void test_frames_caught(const Detector &det, int num_frames_to_acquire) { - auto frames_caught = det.getFramesCaught().tsquash( - "Inconsistent number of frames caught")[0]; - REQUIRE(frames_caught == num_frames_to_acquire); -} - void test_acquire_with_receiver(Caller &caller, const Detector &det) { REQUIRE_NOTHROW(caller.call("rx_start", {}, -1, PUT)); REQUIRE_NOTHROW(caller.call("start", {}, -1, PUT)); @@ -172,9 +166,12 @@ void create_files_for_acquire( // acquire and get num frames caught REQUIRE_NOTHROW(test_acquire_with_receiver(caller, det)); - auto frames_caught = det.getFramesCaught().tsquash( - "Inconsistent number of frames caught")[0]; - REQUIRE(frames_caught == num_frames); + // TODO: maybe there should not be REQUIRE statements in void function at + // all, but traceback should be handled + { + auto frames_caught = det.getFramesCaught()[0][0]; + REQUIRE(frames_caught == num_frames); + } // hdf5 #ifdef HDF5C @@ -184,9 +181,10 @@ void create_files_for_acquire( // acquire and get num frames caught test_acquire_with_receiver(caller, det); - frames_caught = det.getFramesCaught().tsquash( - "Inconsistent number of frames caught")[0]; - REQUIRE(frames_caught == num_frames); + { + auto frames_caught = det.getFramesCaught()[0][0]; + REQUIRE(frames_caught == num_frames); + } #endif // restore previous state diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-global.h b/slsDetectorSoftware/tests/Caller/test-Caller-global.h index f93fc3cdd..3042b91cd 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-global.h +++ b/slsDetectorSoftware/tests/Caller/test-Caller-global.h @@ -88,8 +88,6 @@ void test_acquire_binary_file_size(const testFileInfo &file_info, uint64_t num_frames_to_acquire, uint64_t expected_image_size); -void test_frames_caught(const Detector &det, int num_frames_to_acquire); - void test_acquire_with_receiver(Caller &caller, const Detector &det); void create_files_for_acquire( diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp index 54bba5ce2..b5264f5b7 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp @@ -18,7 +18,7 @@ using test::GET; using test::PUT; // time specific measurements for gotthard2 -TEST_CASE("timegotthard2", "[.cmdcall]") { +TEST_CASE("timegotthard2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -106,7 +106,8 @@ TEST_CASE("timegotthard2", "[.cmdcall]") { } /* dacs */ -TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back GOTTHARD2 dacs", + "[.detectorintegration][.dacs]") { // vref_h_adc, vb_comp_fe, vb_comp_adc, vcom_cds, // vref_restore, vb_opa_1st, vref_comp_fe, vcom_adc1, // vref_prech, vref_l_adc, vref_cds, vb_cs, @@ -215,7 +216,7 @@ TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmdcall][.dacs]") { /* on chip dacs */ -TEST_CASE("vchip_comp_fe", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_comp_fe", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -228,7 +229,7 @@ TEST_CASE("vchip_comp_fe", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_opa_1st", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_opa_1st", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -241,7 +242,7 @@ TEST_CASE("vchip_opa_1st", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_opa_fd", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_opa_fd", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -254,7 +255,7 @@ TEST_CASE("vchip_opa_fd", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_comp_adc", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_comp_adc", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -267,7 +268,7 @@ TEST_CASE("vchip_comp_adc", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_ref_comp_fe", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_ref_comp_fe", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -281,7 +282,7 @@ TEST_CASE("vchip_ref_comp_fe", "[.cmdcall][.onchipdacs]") { } } -TEST_CASE("vchip_cs", "[.cmdcall][.onchipdacs]") { +TEST_CASE("vchip_cs", "[.detectorintegration][.onchipdacs]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -296,7 +297,7 @@ TEST_CASE("vchip_cs", "[.cmdcall][.onchipdacs]") { /* Gotthard2 Specific */ -TEST_CASE("bursts", "[.cmdcall]") { +TEST_CASE("bursts", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -370,7 +371,7 @@ TEST_CASE("bursts", "[.cmdcall]") { } } -TEST_CASE("burstperiod", "[.cmdcall]") { +TEST_CASE("burstperiod", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -392,7 +393,7 @@ TEST_CASE("burstperiod", "[.cmdcall]") { } } -TEST_CASE("burstsl", "[.cmdcall]") { +TEST_CASE("burstsl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -403,7 +404,7 @@ TEST_CASE("burstsl", "[.cmdcall]") { } } -TEST_CASE("inj_ch", "[.cmdcall]") { +TEST_CASE("inj_ch", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -428,7 +429,7 @@ TEST_CASE("inj_ch", "[.cmdcall]") { } } -TEST_CASE("vetophoton", "[.cmdcall]") { +TEST_CASE("vetophoton", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -450,7 +451,7 @@ TEST_CASE("vetophoton", "[.cmdcall]") { } } -TEST_CASE("vetoref", "[.cmdcall]") { +TEST_CASE("vetoref", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -465,7 +466,7 @@ TEST_CASE("vetoref", "[.cmdcall]") { } } -TEST_CASE("vetofile", "[.cmdcall]") { +TEST_CASE("vetofile", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -479,7 +480,7 @@ TEST_CASE("vetofile", "[.cmdcall]") { } } -TEST_CASE("burstmode", "[.cmdcall]") { +TEST_CASE("burstmode", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -510,7 +511,7 @@ TEST_CASE("burstmode", "[.cmdcall]") { } } -TEST_CASE("cdsgain", "[.cmdcall]") { +TEST_CASE("cdsgain", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -540,7 +541,7 @@ TEST_CASE("cdsgain", "[.cmdcall]") { } } -TEST_CASE("timingsource", "[.cmdcall]") { +TEST_CASE("timingsource", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -570,7 +571,7 @@ TEST_CASE("timingsource", "[.cmdcall]") { } } -TEST_CASE("veto", "[.cmdcall]") { +TEST_CASE("veto", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -600,7 +601,7 @@ TEST_CASE("veto", "[.cmdcall]") { } } -TEST_CASE("vetostream", "[.cmdcall]") { +TEST_CASE("vetostream", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -646,7 +647,7 @@ TEST_CASE("vetostream", "[.cmdcall]") { REQUIRE_THROWS(caller.call("vetostream", {"dfgd"}, -1, GET)); } -TEST_CASE("vetoalg", "[.cmdcall]") { +TEST_CASE("vetoalg", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -702,7 +703,7 @@ TEST_CASE("vetoalg", "[.cmdcall]") { REQUIRE_THROWS(caller.call("vetoalg", {"dfgd"}, -1, GET)); } -TEST_CASE("confadc", "[.cmdcall]") { +TEST_CASE("confadc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp index 4563cd32f..02334f40f 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp @@ -17,7 +17,8 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back Jungfrau dacs", + "[.detectorintegration][.dacs]") { // vb_comp, vdd_prot, vin_com, vref_prech, vb_pixbuf, vb_ds, vref_ds, // vref_comp Detector det; @@ -95,7 +96,7 @@ TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmdcall][.dacs]") { /* Network Configuration (Detector<->Receiver) */ -TEST_CASE("selinterface", "[.cmdcall]") { +TEST_CASE("selinterface", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -126,7 +127,7 @@ TEST_CASE("selinterface", "[.cmdcall]") { /* Jungfrau/moench Specific */ -TEST_CASE("temp_threshold", "[.cmdcall]") { +TEST_CASE("temp_threshold", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -156,7 +157,7 @@ TEST_CASE("temp_threshold", "[.cmdcall]") { } } -TEST_CASE("chipversion", "[.cmdcall]") { +TEST_CASE("chipversion", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -168,7 +169,7 @@ TEST_CASE("chipversion", "[.cmdcall]") { REQUIRE_THROWS(caller.call("chipversion", {"0"}, -1, PUT)); } -TEST_CASE("temp_control", "[.cmdcall]") { +TEST_CASE("temp_control", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -198,7 +199,7 @@ TEST_CASE("temp_control", "[.cmdcall]") { } } -TEST_CASE("temp_event", "[.cmdcall]") { +TEST_CASE("temp_event", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -219,7 +220,7 @@ TEST_CASE("temp_event", "[.cmdcall]") { } } -TEST_CASE("autocompdisable", "[.cmdcall]") { +TEST_CASE("autocompdisable", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -249,7 +250,7 @@ TEST_CASE("autocompdisable", "[.cmdcall]") { } } -TEST_CASE("compdisabletime", "[.cmdcall]") { +TEST_CASE("compdisabletime", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -279,7 +280,7 @@ TEST_CASE("compdisabletime", "[.cmdcall]") { } } -TEST_CASE("extrastoragecells", "[.cmdcall]") { +TEST_CASE("extrastoragecells", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -322,7 +323,7 @@ TEST_CASE("extrastoragecells", "[.cmdcall]") { } } -TEST_CASE("storagecell_start", "[.cmdcall]") { +TEST_CASE("storagecell_start", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -367,7 +368,7 @@ TEST_CASE("storagecell_start", "[.cmdcall]") { } } -TEST_CASE("storagecell_delay", "[.cmdcall]") { +TEST_CASE("storagecell_delay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -408,7 +409,7 @@ TEST_CASE("storagecell_delay", "[.cmdcall]") { } } -TEST_CASE("gainmode", "[.cmdcall]") { +TEST_CASE("gainmode", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -457,7 +458,7 @@ TEST_CASE("gainmode", "[.cmdcall]") { } } -TEST_CASE("filtercells", "[.cmdcall]") { +TEST_CASE("filtercells", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -501,7 +502,7 @@ TEST_CASE("filtercells", "[.cmdcall]") { REQUIRE_THROWS(caller.call("filtercells", {"0"}, -1, PUT)); } } -TEST_CASE("pedestalmode", "[.cmdcall]") { +TEST_CASE("pedestalmode", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -657,7 +658,7 @@ TEST_CASE("pedestalmode", "[.cmdcall]") { } } -TEST_CASE("timing_info_decoder", "[.cmdcall]") { +TEST_CASE("timing_info_decoder", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::JUNGFRAU && @@ -686,7 +687,7 @@ TEST_CASE("timing_info_decoder", "[.cmdcall]") { } } -TEST_CASE("collectionmode", "[.cmdcall]") { +TEST_CASE("collectionmode", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::JUNGFRAU) { @@ -714,7 +715,7 @@ TEST_CASE("collectionmode", "[.cmdcall]") { } } -TEST_CASE("sync", "[.cmdcall]") { +TEST_CASE("sync", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp index bf4cf9bac..e2ef3c9d0 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp @@ -1032,7 +1032,9 @@ void open_hdf5_file(const std::string &file_path) { } #endif -TEST_CASE("check_master_file_attributes", "[.cmdcall][.cmdacquire][.cmdattr]") { +TEST_CASE( + "check_master_file_attributes", + "[.detectorintegration][.cmdacquire][.cmdattr][.disable_check_data_file]") { Detector det; Caller caller(&det); @@ -1041,8 +1043,8 @@ TEST_CASE("check_master_file_attributes", "[.cmdcall][.cmdacquire][.cmdattr]") { int64_t num_frames = 1; switch (det_type) { - case defs::EIGER: case defs::JUNGFRAU: + case defs::EIGER: case defs::MOENCH: case defs::MYTHEN3: case defs::GOTTHARD2: diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp index 56353f44b..17ee3be1a 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-moench.cpp @@ -17,7 +17,8 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back moench dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back moench dacs", + "[.detectorintegration][.dacs]") { // vbp_colbuf, vipre, vin_cm, vb_sda, vcasc_sfp, vout_cm, vipre_cds, // ibias_sfp Detector det; diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp index 16295a3e1..602d0b2db 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp @@ -19,7 +19,8 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back MYTHEN3 dacs", + "[.detectorintegration][.dacs]") { // vcassh, vth2, vshaper, vshaperneg, vipre_out, vth3, vth1, // vicin, vcas, vpreamp, vpl, vipre, viinsh, vph, vtrim, vdcsh, @@ -184,7 +185,7 @@ TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmdcall][.dacs]") { /* acquisition */ -TEST_CASE("readout", "[.cmdcall]") { +TEST_CASE("readout", "[.detectorintegration]") { Detector det; Caller caller(&det); // PUT only command @@ -201,7 +202,7 @@ TEST_CASE("readout", "[.cmdcall]") { /* Mythen3 Specific */ -TEST_CASE("counters", "[.cmdcall]") { +TEST_CASE("counters", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -233,7 +234,7 @@ TEST_CASE("counters", "[.cmdcall]") { } } -TEST_CASE("gates", "[.cmdcall]") { +TEST_CASE("gates", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -263,7 +264,7 @@ TEST_CASE("gates", "[.cmdcall]") { } } -TEST_CASE("exptime1", "[.cmdcall]") { +TEST_CASE("exptime1", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -292,7 +293,7 @@ TEST_CASE("exptime1", "[.cmdcall]") { } } -TEST_CASE("exptime2", "[.cmdcall]") { +TEST_CASE("exptime2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -321,7 +322,7 @@ TEST_CASE("exptime2", "[.cmdcall]") { } } -TEST_CASE("exptime3", "[.cmdcall]") { +TEST_CASE("exptime3", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -350,7 +351,7 @@ TEST_CASE("exptime3", "[.cmdcall]") { } } -TEST_CASE("gatedelay", "[.cmdcall]") { +TEST_CASE("gatedelay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -386,7 +387,7 @@ TEST_CASE("gatedelay", "[.cmdcall]") { } } -TEST_CASE("gatedelay1", "[.cmdcall]") { +TEST_CASE("gatedelay1", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -415,7 +416,7 @@ TEST_CASE("gatedelay1", "[.cmdcall]") { } } -TEST_CASE("gatedelay2", "[.cmdcall]") { +TEST_CASE("gatedelay2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -444,7 +445,7 @@ TEST_CASE("gatedelay2", "[.cmdcall]") { } } -TEST_CASE("gatedelay3", "[.cmdcall]") { +TEST_CASE("gatedelay3", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -473,7 +474,7 @@ TEST_CASE("gatedelay3", "[.cmdcall]") { } } -TEST_CASE("polarity", "[.cmdcall]") { +TEST_CASE("polarity", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { @@ -501,7 +502,7 @@ TEST_CASE("polarity", "[.cmdcall]") { } } -TEST_CASE("interpolation", "[.cmdcall]") { +TEST_CASE("interpolation", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { @@ -555,7 +556,7 @@ TEST_CASE("interpolation", "[.cmdcall]") { } } -TEST_CASE("pumpprobe", "[.cmdcall]") { +TEST_CASE("pumpprobe", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { @@ -632,7 +633,7 @@ TEST_CASE("pumpprobe", "[.cmdcall]") { } } -TEST_CASE("apulse", "[.cmdcall]") { +TEST_CASE("apulse", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { @@ -660,7 +661,7 @@ TEST_CASE("apulse", "[.cmdcall]") { } } -TEST_CASE("dpulse", "[.cmdcall]") { +TEST_CASE("dpulse", "[.detectorintegration]") { Detector det; Caller caller(&det); if (det.getDetectorType().squash() == defs::MYTHEN3) { diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-pattern.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-pattern.cpp index 60dafd4f4..cd49c5ae4 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-pattern.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-pattern.cpp @@ -19,7 +19,7 @@ using test::PUT; /* Pattern */ -TEST_CASE("patfname", "[.cmdcall]") { +TEST_CASE("patfname", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -32,7 +32,7 @@ TEST_CASE("patfname", "[.cmdcall]") { } } -TEST_CASE("pattern", "[.cmdcall]") { +TEST_CASE("pattern", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -45,7 +45,7 @@ TEST_CASE("pattern", "[.cmdcall]") { } } -TEST_CASE("savepattern", "[.cmdcall]") { +TEST_CASE("savepattern", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -63,7 +63,7 @@ TEST_CASE("savepattern", "[.cmdcall]") { } } -TEST_CASE("defaultpattern", "[.cmdcall]") { +TEST_CASE("defaultpattern", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -76,7 +76,7 @@ TEST_CASE("defaultpattern", "[.cmdcall]") { } } -TEST_CASE("patioctrl", "[.cmdcall]") { +TEST_CASE("patioctrl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -107,7 +107,7 @@ TEST_CASE("patioctrl", "[.cmdcall]") { } } -TEST_CASE("patword", "[.cmdcall]") { +TEST_CASE("patword", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -149,7 +149,7 @@ TEST_CASE("patword", "[.cmdcall]") { } } -TEST_CASE("patlimits", "[.cmdcall]") { +TEST_CASE("patlimits", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -176,7 +176,7 @@ TEST_CASE("patlimits", "[.cmdcall]") { } } -TEST_CASE("patloop", "[.cmdcall]") { +TEST_CASE("patloop", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -225,7 +225,7 @@ TEST_CASE("patloop", "[.cmdcall]") { } } -TEST_CASE("patnloop", "[.cmdcall]") { +TEST_CASE("patnloop", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -271,7 +271,7 @@ TEST_CASE("patnloop", "[.cmdcall]") { } } -TEST_CASE("patwait", "[.cmdcall]") { +TEST_CASE("patwait", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -317,7 +317,7 @@ TEST_CASE("patwait", "[.cmdcall]") { } } -TEST_CASE("patwaittime", "[.cmdcall]") { +TEST_CASE("patwaittime", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -379,7 +379,7 @@ TEST_CASE("patwaittime", "[.cmdcall]") { } } -TEST_CASE("patmask", "[.cmdcall]") { +TEST_CASE("patmask", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -405,7 +405,7 @@ TEST_CASE("patmask", "[.cmdcall]") { } } -TEST_CASE("patsetbit", "[.cmdcall]") { +TEST_CASE("patsetbit", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -431,7 +431,7 @@ TEST_CASE("patsetbit", "[.cmdcall]") { } } -TEST_CASE("patternstart", "[.cmdcall]") { +TEST_CASE("patternstart", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("patternstart", {}, -1, GET)); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-rx-running.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-rx-running.cpp index 844df6419..dc736e27a 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-rx-running.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-rx-running.cpp @@ -12,7 +12,7 @@ namespace sls { using test::PUT; TEST_CASE("Ctb and xilinx - cant put if receiver is not idle", - "[.cmdcall][.rx]") { + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -60,7 +60,8 @@ TEST_CASE("Ctb and xilinx - cant put if receiver is not idle", } } -TEST_CASE("adcenable - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("adcenable - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -83,7 +84,8 @@ TEST_CASE("adcenable - cant put if receiver is not idle", "[.cmdcall][.rx]") { } } -TEST_CASE("bursts - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("bursts - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -105,7 +107,8 @@ TEST_CASE("bursts - cant put if receiver is not idle", "[.cmdcall][.rx]") { } } -TEST_CASE("counters - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("counters - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -129,30 +132,30 @@ TEST_CASE("counters - cant put if receiver is not idle", "[.cmdcall][.rx]") { } TEST_CASE("numinterfaces - cant put if receiver is not idle", - "[.cmdcall][.rx]") { + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) { - auto prev_numinterfaces = det.getNumberofUDPInterfaces(); + auto prev_numinterfaces = det.getNumberofUDPInterfaces().tsquash( + "Number of UDP Interfaces is not consistent among modules"); // start receiver REQUIRE_NOTHROW(caller.call("rx_start", {}, -1, PUT)); - REQUIRE_THROWS(caller.call("numinterafaces", {"2"}, -1, PUT)); + REQUIRE_THROWS(caller.call("numinterfaces", {"2"}, -1, PUT)); // stop receiver REQUIRE_NOTHROW(caller.call("rx_stop", {}, -1, PUT)); - for (int i = 0; i != det.size(); ++i) { - det.setNumberofUDPInterfaces(prev_numinterfaces[i], {i}); - } + det.setNumberofUDPInterfaces(prev_numinterfaces); } } -TEST_CASE("dr - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("dr - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -174,7 +177,8 @@ TEST_CASE("dr - cant put if receiver is not idle", "[.cmdcall][.rx]") { } } -TEST_CASE("tengiga - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("tengiga - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); @@ -198,7 +202,8 @@ TEST_CASE("tengiga - cant put if receiver is not idle", "[.cmdcall][.rx]") { } } -TEST_CASE("general - cant put if receiver is not idle", "[.cmdcall][.rx]") { +TEST_CASE("general - cant put if receiver is not idle", + "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp index 74fa821d8..f00c239e3 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-rx.cpp @@ -25,7 +25,7 @@ python/scripts/list_tested_cmd.py to check if all commands are covered /* configuration */ -TEST_CASE("rx_version", "[.cmdcall][.rx]") { +TEST_CASE("rx_version", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); std::ostringstream oss; @@ -39,7 +39,7 @@ TEST_CASE("rx_version", "[.cmdcall][.rx]") { } /* acquisition */ -TEST_CASE("rx_start", "[.cmdcall][.rx]") { +TEST_CASE("rx_start", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); det.setFileWrite(false); // avoid writing or error on file creation @@ -57,7 +57,7 @@ TEST_CASE("rx_start", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_stop", "[.cmdcall][.rx]") { +TEST_CASE("rx_stop", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); // PUT only command @@ -74,7 +74,7 @@ TEST_CASE("rx_stop", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_status", "[.cmdcall][.rx]") { +TEST_CASE("rx_status", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); det.setFileWrite(false); // avoid writing or error on file creation @@ -92,7 +92,7 @@ TEST_CASE("rx_status", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_framescaught", "[.cmdcall][.rx]") { +TEST_CASE("rx_framescaught", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); // This ensures 0 caught frames @@ -126,7 +126,7 @@ TEST_CASE("rx_framescaught", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_missingpackets", "[.cmdcall][.rx]") { +TEST_CASE("rx_missingpackets", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getFileWrite(); @@ -171,7 +171,7 @@ TEST_CASE("rx_missingpackets", "[.cmdcall][.rx]") { det.setNumberOfFrames(prev_frames); } -TEST_CASE("rx_frameindex", "[.cmdcall][.rx]") { +TEST_CASE("rx_frameindex", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); caller.call("rx_frameindex", {}, -1, GET); @@ -182,7 +182,7 @@ TEST_CASE("rx_frameindex", "[.cmdcall][.rx]") { /* Network Configuration (Detector<->Receiver) */ -TEST_CASE("rx_printconfig", "[.cmdcall][.rx]") { +TEST_CASE("rx_printconfig", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("rx_printconfig", {}, -1, GET)); @@ -190,7 +190,7 @@ TEST_CASE("rx_printconfig", "[.cmdcall][.rx]") { /* Receiver Config */ -TEST_CASE("rx_hostname", "[.cmdcall][.rx]") { +TEST_CASE("rx_hostname", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxHostname(); @@ -222,7 +222,7 @@ TEST_CASE("rx_hostname", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_tcpport", "[.cmdcall][.rx]") { +TEST_CASE("rx_tcpport", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxPort(); @@ -261,7 +261,7 @@ TEST_CASE("rx_tcpport", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_fifodepth", "[.cmdcall][.rx]") { +TEST_CASE("rx_fifodepth", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxFifoDepth(); @@ -285,7 +285,7 @@ TEST_CASE("rx_fifodepth", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_silent", "[.cmdcall][.rx]") { +TEST_CASE("rx_silent", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxSilentMode(); @@ -309,7 +309,7 @@ TEST_CASE("rx_silent", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_discardpolicy", "[.cmdcall][.rx]") { +TEST_CASE("rx_discardpolicy", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxFrameDiscardPolicy(); @@ -338,7 +338,7 @@ TEST_CASE("rx_discardpolicy", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_padding", "[.cmdcall][.rx]") { +TEST_CASE("rx_padding", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getPartialFramesPadding(); @@ -362,7 +362,7 @@ TEST_CASE("rx_padding", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_udpsocksize", "[.cmdcall][.rx]") { +TEST_CASE("rx_udpsocksize", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); int64_t prev_val = det.getRxUDPSocketBufferSize().tsquash( @@ -382,7 +382,7 @@ TEST_CASE("rx_udpsocksize", "[.cmdcall][.rx]") { det.setRxUDPSocketBufferSize(prev_val); } -TEST_CASE("rx_realudpsocksize", "[.cmdcall][.rx]") { +TEST_CASE("rx_realudpsocksize", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); uint64_t val = 0; @@ -401,7 +401,7 @@ TEST_CASE("rx_realudpsocksize", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_lock", "[.cmdcall][.rx]") { +TEST_CASE("rx_lock", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxLock(); @@ -425,7 +425,7 @@ TEST_CASE("rx_lock", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_lastclient", "[.cmdcall][.rx]") { +TEST_CASE("rx_lastclient", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); std::ostringstream oss; @@ -435,14 +435,14 @@ TEST_CASE("rx_lastclient", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_threads", "[.cmdcall][.rx]") { +TEST_CASE("rx_threads", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); std::ostringstream oss; REQUIRE_NOTHROW(caller.call("rx_threads", {}, -1, GET, oss)); } -TEST_CASE("rx_arping", "[.cmdcall][.rx]") { +TEST_CASE("rx_arping", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxArping(); @@ -467,7 +467,7 @@ TEST_CASE("rx_arping", "[.cmdcall][.rx]") { } } } -TEST_CASE("rx_roi", "[.cmdcall]") { +TEST_CASE("rx_roi", "[.detectorintegration][.disable_check_data_file]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -782,7 +782,7 @@ TEST_CASE("rx_roi", "[.cmdcall]") { } } -TEST_CASE("rx_clearroi", "[.cmdcall]") { +TEST_CASE("rx_clearroi", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -808,7 +808,7 @@ TEST_CASE("rx_clearroi", "[.cmdcall]") { /* File */ -TEST_CASE("fformat", "[.cmdcall]") { +TEST_CASE("fformat", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFileFormat(); @@ -827,7 +827,7 @@ TEST_CASE("fformat", "[.cmdcall]") { } } -TEST_CASE("fpath", "[.cmdcall]") { +TEST_CASE("fpath", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFilePath(); @@ -849,7 +849,7 @@ TEST_CASE("fpath", "[.cmdcall]") { } } -TEST_CASE("fname", "[.cmdcall]") { +TEST_CASE("fname", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFileNamePrefix(); @@ -876,7 +876,7 @@ TEST_CASE("fname", "[.cmdcall]") { } } -TEST_CASE("findex", "[.cmdcall]") { +TEST_CASE("findex", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getAcquisitionIndex(); @@ -900,7 +900,7 @@ TEST_CASE("findex", "[.cmdcall]") { } } -TEST_CASE("fwrite", "[.cmdcall]") { +TEST_CASE("fwrite", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFileWrite(); @@ -924,7 +924,7 @@ TEST_CASE("fwrite", "[.cmdcall]") { } } -TEST_CASE("fmaster", "[.cmdcall]") { +TEST_CASE("fmaster", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getMasterFileWrite(); @@ -946,7 +946,7 @@ TEST_CASE("fmaster", "[.cmdcall]") { det.setMasterFileWrite(prev_val); } -TEST_CASE("foverwrite", "[.cmdcall]") { +TEST_CASE("foverwrite", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getFileOverWrite(); @@ -970,7 +970,7 @@ TEST_CASE("foverwrite", "[.cmdcall]") { } } -TEST_CASE("rx_framesperfile", "[.cmdcall][.rx]") { +TEST_CASE("rx_framesperfile", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getFramesPerFile(); @@ -1001,7 +1001,7 @@ TEST_CASE("rx_framesperfile", "[.cmdcall][.rx]") { /* ZMQ Streaming Parameters (Receiver<->Client) */ -TEST_CASE("rx_zmqstream", "[.cmdcall][.rx]") { +TEST_CASE("rx_zmqstream", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxZmqDataStream(); @@ -1027,7 +1027,7 @@ TEST_CASE("rx_zmqstream", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_zmqfreq", "[.cmdcall][.rx]") { +TEST_CASE("rx_zmqfreq", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxZmqFrequency(); @@ -1051,7 +1051,7 @@ TEST_CASE("rx_zmqfreq", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_zmqstartfnum", "[.cmdcall][.rx]") { +TEST_CASE("rx_zmqstartfnum", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getRxZmqStartingFrame(); @@ -1075,7 +1075,7 @@ TEST_CASE("rx_zmqstartfnum", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_zmqport", "[.cmdcall][.rx]") { +TEST_CASE("rx_zmqport", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val_zmqport = det.getRxZmqPort(); @@ -1123,7 +1123,7 @@ TEST_CASE("rx_zmqport", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_zmqhwm", "[.cmdcall]") { +TEST_CASE("rx_zmqhwm", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = @@ -1153,7 +1153,7 @@ TEST_CASE("rx_zmqhwm", "[.cmdcall]") { /* CTB Specific */ -TEST_CASE("rx_dbitlist", "[.cmdcall][.rx]") { +TEST_CASE("rx_dbitlist", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1183,7 +1183,7 @@ TEST_CASE("rx_dbitlist", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_dbitoffset", "[.cmdcall][.rx]") { +TEST_CASE("rx_dbitoffset", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1218,7 +1218,7 @@ TEST_CASE("rx_dbitoffset", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_dbitreorder", "[.cmdcall][.rx]") { +TEST_CASE("rx_dbitreorder", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1249,7 +1249,7 @@ TEST_CASE("rx_dbitreorder", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_jsonaddheader", "[.cmdcall][.rx]") { +TEST_CASE("rx_jsonaddheader", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getAdditionalJsonHeader(); @@ -1275,7 +1275,7 @@ TEST_CASE("rx_jsonaddheader", "[.cmdcall][.rx]") { } } -TEST_CASE("rx_jsonpara", "[.cmdcall][.rx]") { +TEST_CASE("rx_jsonpara", "[.detectorintegration][.rx]") { Detector det; Caller caller(&det); auto prev_val = det.getAdditionalJsonHeader(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-xilinx-chiptestboard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-xilinx-chiptestboard.cpp index 6133962f4..3849be6fb 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-xilinx-chiptestboard.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-xilinx-chiptestboard.cpp @@ -19,7 +19,7 @@ using test::PUT; /* dacs */ -TEST_CASE("configtransceiver", "[.cmdcall]") { +TEST_CASE("configtransceiver", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); diff --git a/slsDetectorSoftware/tests/Caller/test-Caller.cpp b/slsDetectorSoftware/tests/Caller/test-Caller.cpp index 65fd764fa..93c88713e 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller.cpp @@ -21,7 +21,7 @@ using test::GET; using test::PUT; TEST_CASE("Calling help doesn't throw or cause segfault") { - // Dont add [.cmdcall] tag this should run with normal tests + // Dont add [.detectorintegration] tag this should run with normal tests Caller caller(nullptr); std::ostringstream os; for (std::string cmd : caller.getAllCommands()) @@ -29,7 +29,7 @@ TEST_CASE("Calling help doesn't throw or cause segfault") { caller.call(cmd, {}, -1, slsDetectorDefs::HELP_ACTION, os)); } -TEST_CASE("Unknown command", "[.cmdcall]") { +TEST_CASE("Unknown command", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("vsaevrreavv", {}, -1, PUT)); @@ -37,7 +37,7 @@ TEST_CASE("Unknown command", "[.cmdcall]") { /* configuration */ -TEST_CASE("config", "[.cmdcall]") { +TEST_CASE("config", "[.detectorintegration]") { Detector det; Caller caller(&det); // put only @@ -59,7 +59,11 @@ void test_include_file(const std::string &cmd) { det.getFileWrite().tsquash("File write enable has to be same to test"); { - system("echo -e 'frames 2\nfwrite 1' > /tmp/tempsetup.det "); + std::ofstream f("/tmp/tempsetup.det", std::ios::trunc); + f << "frames 2\n"; + f << "fwrite 1\n"; + } + { std::ostringstream oss; caller.call(cmd, {"/tmp/tempsetup.det"}, -1, PUT, oss); REQUIRE(oss.str() == cmd + " /tmp/tempsetup.det\n"); @@ -69,7 +73,11 @@ void test_include_file(const std::string &cmd) { 1); } { - system("echo -e 'frames 3\nfwrite 0' > /tmp/tempsetup.det "); + std::ofstream f("/tmp/tempsetup.det", std::ios::trunc); + f << "frames 3\n"; + f << "fwrite 0\n"; + } + { std::ostringstream oss; caller.call(cmd, {"/tmp/tempsetup.det"}, -1, PUT, oss); REQUIRE(oss.str() == cmd + " /tmp/tempsetup.det\n"); @@ -82,17 +90,19 @@ void test_include_file(const std::string &cmd) { det.setFileWrite(prev_fwrite); } -TEST_CASE("parameters", "[.cmdcall]") { test_include_file("parameters"); } +TEST_CASE("parameters", "[.detectorintegration]") { + test_include_file("parameters"); +} -TEST_CASE("include", "[.cmdcall]") { test_include_file("include"); } +TEST_CASE("include", "[.detectorintegration]") { test_include_file("include"); } -TEST_CASE("hostname", "[.cmdcall]") { +TEST_CASE("hostname", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("hostname", {}, -1, GET)); } -TEST_CASE("virtual", "[.cmdcall]") { +TEST_CASE("virtual", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("virtual", {}, -1, GET)); @@ -100,56 +110,56 @@ TEST_CASE("virtual", "[.cmdcall]") { REQUIRE_THROWS(caller.call("virtual", {"3", "65534"}, -1, PUT)); } -TEST_CASE("versions", "[.cmdcall]") { +TEST_CASE("versions", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("versions", {}, -1, GET)); REQUIRE_THROWS(caller.call("versions", {"0"}, -1, PUT)); } -TEST_CASE("packageversion", "[.cmdcall]") { +TEST_CASE("packageversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("packageversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("packageversion", {"0"}, -1, PUT)); } -TEST_CASE("clientversion", "[.cmdcall]") { +TEST_CASE("clientversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("clientversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("clientversion", {"0"}, -1, PUT)); } -TEST_CASE("firmwareversion", "[.cmdcall]") { +TEST_CASE("firmwareversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("firmwareversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("firmwareversion", {"0"}, -1, PUT)); } -TEST_CASE("detectorserverversion", "[.cmdcall]") { +TEST_CASE("detectorserverversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("detectorserverversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("detectorserverversion", {"0"}, -1, PUT)); } -TEST_CASE("hardwareversion", "[.cmdcall]") { +TEST_CASE("hardwareversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("hardwareversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("hardwareversion", {"0"}, -1, PUT)); } -TEST_CASE("kernelversion", "[.cmdcall]") { +TEST_CASE("kernelversion", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("kernelversion", {}, -1, GET)); REQUIRE_THROWS(caller.call("kernelversion", {"0"}, -1, PUT)); } -TEST_CASE("serialnumber", "[.cmdcall]") { +TEST_CASE("serialnumber", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -160,7 +170,7 @@ TEST_CASE("serialnumber", "[.cmdcall]") { } } -TEST_CASE("moduleid", "[.cmdcall]") { +TEST_CASE("moduleid", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -173,7 +183,7 @@ TEST_CASE("moduleid", "[.cmdcall]") { } } -TEST_CASE("type", "[.cmdcall]") { +TEST_CASE("type", "[.detectorintegration]") { Detector det; Caller caller(&det); auto dt = det.getDetectorType().squash(); @@ -185,13 +195,13 @@ TEST_CASE("type", "[.cmdcall]") { // REQUIRE(dt == test::type); } -TEST_CASE("detsize", "[.cmdcall]") { +TEST_CASE("detsize", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("detsize", {}, -1, GET)); } -TEST_CASE("settingslist", "[.cmdcall]") { +TEST_CASE("settingslist", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -204,7 +214,7 @@ TEST_CASE("settingslist", "[.cmdcall]") { } } -TEST_CASE("settings", "[.cmdcall]") { +TEST_CASE("settings", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -295,7 +305,7 @@ TEST_CASE("settings", "[.cmdcall]") { } } -TEST_CASE("threshold", "[.cmdcall]") { +TEST_CASE("threshold", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -374,7 +384,7 @@ TEST_CASE("threshold", "[.cmdcall]") { } } -TEST_CASE("thresholdnotb", "[.cmdcall]") { +TEST_CASE("thresholdnotb", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -454,7 +464,7 @@ TEST_CASE("thresholdnotb", "[.cmdcall]") { } } -TEST_CASE("settingspath", "[.cmdcall]") { +TEST_CASE("settingspath", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getSettingsPath(); @@ -470,13 +480,13 @@ TEST_CASE("settingspath", "[.cmdcall]") { } } -TEST_CASE("trimbits", "[.cmdcall]") { +TEST_CASE("trimbits", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("trimbits", {}, -1, GET)); } -TEST_CASE("trimval", "[.cmdcall]") { +TEST_CASE("trimval", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -510,7 +520,7 @@ TEST_CASE("trimval", "[.cmdcall]") { } } -TEST_CASE("trimen", "[.cmdcall][.this]") { +TEST_CASE("trimen", "[.detectorintegration][.this]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -532,7 +542,7 @@ TEST_CASE("trimen", "[.cmdcall][.this]") { } } -TEST_CASE("gappixels", "[.cmdcall]") { +TEST_CASE("gappixels", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -582,7 +592,7 @@ TEST_CASE("gappixels", "[.cmdcall]") { } } -TEST_CASE("fliprows", "[.cmdcall]") { +TEST_CASE("fliprows", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -617,7 +627,7 @@ TEST_CASE("fliprows", "[.cmdcall]") { } } -TEST_CASE("master", "[.cmdcall]") { +TEST_CASE("master", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -662,7 +672,7 @@ TEST_CASE("master", "[.cmdcall]") { } } -TEST_CASE("badchannels", "[.cmdcall]") { +TEST_CASE("badchannels", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -732,7 +742,7 @@ TEST_CASE("badchannels", "[.cmdcall]") { } } -TEST_CASE("row", "[.cmdcall]") { +TEST_CASE("row", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getRow()[0]; @@ -755,7 +765,7 @@ TEST_CASE("row", "[.cmdcall]") { det.setRow(prev_val, {0}); } -TEST_CASE("column", "[.cmdcall]") { +TEST_CASE("column", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getColumn()[0]; @@ -782,7 +792,7 @@ TEST_CASE("column", "[.cmdcall]") { // acquire: not testing -TEST_CASE("frames", "[.cmdcall]") { +TEST_CASE("frames", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = @@ -806,7 +816,7 @@ TEST_CASE("frames", "[.cmdcall]") { det.setNumberOfFrames(prev_val); } -TEST_CASE("triggers", "[.cmdcall]") { +TEST_CASE("triggers", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = @@ -830,7 +840,7 @@ TEST_CASE("triggers", "[.cmdcall]") { det.setNumberOfTriggers(prev_val); } -TEST_CASE("exptime", "[.cmdcall][.time]") { +TEST_CASE("exptime", "[.detectorintegration][.time]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -880,7 +890,7 @@ TEST_CASE("exptime", "[.cmdcall][.time]") { det.setExptime(-1, prev_val); } -TEST_CASE("period", "[.cmdcall]") { +TEST_CASE("period", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getPeriod(); @@ -904,7 +914,7 @@ TEST_CASE("period", "[.cmdcall]") { } } -TEST_CASE("delay", "[.cmdcall]") { +TEST_CASE("delay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -934,7 +944,7 @@ TEST_CASE("delay", "[.cmdcall]") { } } -TEST_CASE("framesl", "[.cmdcall]") { +TEST_CASE("framesl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -945,7 +955,7 @@ TEST_CASE("framesl", "[.cmdcall]") { } } -TEST_CASE("triggersl", "[.cmdcall]") { +TEST_CASE("triggersl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -956,7 +966,7 @@ TEST_CASE("triggersl", "[.cmdcall]") { } } -TEST_CASE("delayl", "[.cmdcall]") { +TEST_CASE("delayl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -970,7 +980,7 @@ TEST_CASE("delayl", "[.cmdcall]") { } } -TEST_CASE("periodl", "[.cmdcall]") { +TEST_CASE("periodl", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -984,7 +994,7 @@ TEST_CASE("periodl", "[.cmdcall]") { } } -TEST_CASE("dr", "[.cmdcall]") { +TEST_CASE("dr", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1026,14 +1036,14 @@ TEST_CASE("dr", "[.cmdcall]") { } } -TEST_CASE("drlist", "[.cmdcall]") { +TEST_CASE("drlist", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("drlist", {}, -1, GET)); REQUIRE_THROWS(caller.call("drlist", {}, -1, PUT)); } -TEST_CASE("timing", "[.cmdcall]") { +TEST_CASE("timing", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1095,14 +1105,14 @@ TEST_CASE("timing", "[.cmdcall]") { } } -TEST_CASE("timinglist", "[.cmdcall]") { +TEST_CASE("timinglist", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("timinglist", {}, -1, GET)); REQUIRE_THROWS(caller.call("timinglist", {}, -1, PUT)); } -TEST_CASE("readoutspeed", "[.cmdcall]") { +TEST_CASE("readoutspeed", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1192,7 +1202,7 @@ TEST_CASE("readoutspeed", "[.cmdcall]") { } } -TEST_CASE("readoutspeedlist", "[.cmdcall]") { +TEST_CASE("readoutspeedlist", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1206,7 +1216,7 @@ TEST_CASE("readoutspeedlist", "[.cmdcall]") { } } -TEST_CASE("adcphase", "[.cmdcall]") { +TEST_CASE("adcphase", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1236,7 +1246,7 @@ TEST_CASE("adcphase", "[.cmdcall]") { } } -TEST_CASE("maxadcphaseshift", "[.cmdcall]") { +TEST_CASE("maxadcphaseshift", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1250,7 +1260,7 @@ TEST_CASE("maxadcphaseshift", "[.cmdcall]") { } } -TEST_CASE("dbitphase", "[.cmdcall]") { +TEST_CASE("dbitphase", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1279,7 +1289,7 @@ TEST_CASE("dbitphase", "[.cmdcall]") { } } -TEST_CASE("maxdbitphaseshift", "[.cmdcall]") { +TEST_CASE("maxdbitphaseshift", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1292,7 +1302,7 @@ TEST_CASE("maxdbitphaseshift", "[.cmdcall]") { } } -TEST_CASE("clkfreq", "[.cmdcall]") { +TEST_CASE("clkfreq", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1312,7 +1322,7 @@ TEST_CASE("clkfreq", "[.cmdcall]") { } } -TEST_CASE("clkphase", "[.cmdcall]") { +TEST_CASE("clkphase", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1362,7 +1372,7 @@ TEST_CASE("clkphase", "[.cmdcall]") { } } -TEST_CASE("clkdiv", "[.cmdcall]") { +TEST_CASE("clkdiv", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1426,7 +1436,7 @@ TEST_CASE("clkdiv", "[.cmdcall]") { } } -TEST_CASE("maxclkphaseshift", "[.cmdcall]") { +TEST_CASE("maxclkphaseshift", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1446,7 +1456,7 @@ TEST_CASE("maxclkphaseshift", "[.cmdcall]") { } } -TEST_CASE("highvoltage", "[.cmdcall]") { +TEST_CASE("highvoltage", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1531,7 +1541,7 @@ TEST_CASE("highvoltage", "[.cmdcall]") { } } -TEST_CASE("powerchip", "[.cmdcall]") { +TEST_CASE("powerchip", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1583,7 +1593,7 @@ TEST_CASE("powerchip", "[.cmdcall]") { } } -TEST_CASE("imagetest", "[.cmdcall]") { +TEST_CASE("imagetest", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1595,7 +1605,7 @@ TEST_CASE("imagetest", "[.cmdcall]") { } } -TEST_CASE("extsig", "[.cmdcall]") { +TEST_CASE("extsig", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1649,7 +1659,7 @@ TEST_CASE("extsig", "[.cmdcall]") { } } -TEST_CASE("parallel", "[.cmdcall]") { +TEST_CASE("parallel", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1680,7 +1690,7 @@ TEST_CASE("parallel", "[.cmdcall]") { } } -TEST_CASE("filterresistor", "[.cmdcall]") { +TEST_CASE("filterresistor", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1724,7 +1734,7 @@ TEST_CASE("filterresistor", "[.cmdcall]") { } } -TEST_CASE("dbitpipeline", "[.cmdcall]") { +TEST_CASE("dbitpipeline", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1774,7 +1784,7 @@ TEST_CASE("dbitpipeline", "[.cmdcall]") { } } -TEST_CASE("readnrows", "[.cmdcall]") { +TEST_CASE("readnrows", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1826,7 +1836,7 @@ TEST_CASE("readnrows", "[.cmdcall]") { } } -TEST_CASE("currentsource", "[.cmdcall]") { +TEST_CASE("currentsource", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1968,21 +1978,21 @@ TEST_CASE("currentsource", "[.cmdcall]") { /** temperature */ -TEST_CASE("templist", "[.cmdcall]") { +TEST_CASE("templist", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("templist", {}, -1, GET)); REQUIRE_THROWS(caller.call("templist", {}, -1, PUT)); } -TEST_CASE("tempvalues", "[.cmdcall]") { +TEST_CASE("tempvalues", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("tempvalues", {}, -1, GET)); REQUIRE_THROWS(caller.call("tempvalues", {}, -1, PUT)); } -TEST_CASE("temp_adc", "[.cmdcall]") { +TEST_CASE("temp_adc", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -1997,7 +2007,7 @@ TEST_CASE("temp_adc", "[.cmdcall]") { } } -TEST_CASE("temp_fpga", "[.cmdcall]") { +TEST_CASE("temp_fpga", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2014,7 +2024,7 @@ TEST_CASE("temp_fpga", "[.cmdcall]") { /* list */ -TEST_CASE("daclist", "[.cmdcall]") { +TEST_CASE("daclist", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2050,14 +2060,14 @@ TEST_CASE("daclist", "[.cmdcall]") { /* dacs */ -TEST_CASE("dacvalues", "[.cmdcall]") { +TEST_CASE("dacvalues", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("dacvalues", {}, -1, GET)); REQUIRE_THROWS(caller.call("dacvalues", {}, -1, PUT)); } -TEST_CASE("defaultdac", "[.cmdcall]") { +TEST_CASE("defaultdac", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2117,7 +2127,7 @@ TEST_CASE("defaultdac", "[.cmdcall]") { } } -TEST_CASE("resetdacs", "[.cmdcall]") { +TEST_CASE("resetdacs", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2142,7 +2152,7 @@ TEST_CASE("resetdacs", "[.cmdcall]") { /* acquisition */ -TEST_CASE("trigger", "[.cmdcall]") { +TEST_CASE("trigger", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("trigger", {}, -1, GET)); @@ -2185,7 +2195,7 @@ TEST_CASE("trigger", "[.cmdcall]") { } } -TEST_CASE("blockingtrigger", "[.cmdcall]") { +TEST_CASE("blockingtrigger", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("blockingtrigger", {}, -1, GET)); @@ -2229,7 +2239,7 @@ TEST_CASE("blockingtrigger", "[.cmdcall]") { } } -TEST_CASE("clearbusy", "[.cmdcall]") { +TEST_CASE("clearbusy", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("clearbusy", {}, -1, PUT)); @@ -2237,7 +2247,7 @@ TEST_CASE("clearbusy", "[.cmdcall]") { REQUIRE_THROWS(caller.call("clearbusy", {}, -1, GET)); } -TEST_CASE("start", "[.cmdcall]") { +TEST_CASE("start", "[.detectorintegration]") { Detector det; Caller caller(&det); // PUT only command @@ -2276,7 +2286,7 @@ TEST_CASE("start", "[.cmdcall]") { det.setNumberOfFrames(prev_frames); } -TEST_CASE("stop", "[.cmdcall]") { +TEST_CASE("stop", "[.detectorintegration]") { Detector det; Caller caller(&det); // PUT only command @@ -2321,7 +2331,7 @@ TEST_CASE("stop", "[.cmdcall]") { det.setNumberOfFrames(prev_frames); } -TEST_CASE("status", "[.cmdcall]") { +TEST_CASE("status", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2360,7 +2370,7 @@ TEST_CASE("status", "[.cmdcall]") { det.setNumberOfFrames(prev_frames); } -TEST_CASE("nextframenumber", "[.cmdcall]") { +TEST_CASE("nextframenumber", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2467,7 +2477,7 @@ TEST_CASE("nextframenumber", "[.cmdcall]") { } } -TEST_CASE("scan", "[.cmdcall]") { +TEST_CASE("scan", "[.detectorintegration]") { Detector det; Caller caller(&det); defs::dacIndex ind = defs::DAC_0; @@ -2593,7 +2603,7 @@ TEST_CASE("scan", "[.cmdcall]") { } } -TEST_CASE("scanerrmsg", "[.cmdcall]") { +TEST_CASE("scanerrmsg", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("scanerrmsg", {}, -1, GET)); @@ -2602,17 +2612,17 @@ TEST_CASE("scanerrmsg", "[.cmdcall]") { /* Network Configuration (Detector<->Receiver) */ -TEST_CASE("numinterfaces", "[.cmdcall]") { +TEST_CASE("numinterfaces", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); if (det_type == defs::JUNGFRAU || det_type == defs::MOENCH) { auto prev_val = det.getNumberofUDPInterfaces().tsquash( "inconsistent numinterfaces to test"); - UdpDestination prev_udp_dest{}; + Result prev_udp_dest; IpAddr prev_src_ip2{}; if (prev_val == 2 && det_type != defs::EIGER) { - prev_udp_dest = det.getDestinationUDPList(0)[0]; + prev_udp_dest = det.getDestinationUDPList(0); prev_src_ip2 = det.getSourceUDPIP2()[0]; } { @@ -2631,8 +2641,10 @@ TEST_CASE("numinterfaces", "[.cmdcall]") { REQUIRE(oss.str() == "numinterfaces 1\n"); } if (prev_val == 2 && det_type != defs::EIGER) { - det.setDestinationUDPList({prev_udp_dest}, 0); - det.setSourceUDPIP2({prev_src_ip2}, {0}); + for (int i = 0; i != det.size(); ++i) { + det.setDestinationUDPList({prev_udp_dest[i]}, {i}); + } + det.setSourceUDPIP2({prev_src_ip2}); } det.setNumberofUDPInterfaces(prev_val); } else if (det_type == defs::EIGER) { @@ -2652,7 +2664,7 @@ TEST_CASE("numinterfaces", "[.cmdcall]") { REQUIRE_THROWS(caller.call("numinterfaces", {"0"}, -1, PUT)); } -TEST_CASE("udp_srcip", "[.cmdcall]") { +TEST_CASE("udp_srcip", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getSourceUDPIP(); @@ -2667,7 +2679,7 @@ TEST_CASE("udp_srcip", "[.cmdcall]") { } } -TEST_CASE("udp_dstlist", "[.cmdcall]") { +TEST_CASE("udp_dstlist", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2683,7 +2695,7 @@ TEST_CASE("udp_dstlist", "[.cmdcall]") { } } -TEST_CASE("udp_numdst", "[.cmdcall]") { +TEST_CASE("udp_numdst", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2696,7 +2708,7 @@ TEST_CASE("udp_numdst", "[.cmdcall]") { } } -TEST_CASE("udp_cleardst", "[.cmdcall]") { +TEST_CASE("udp_cleardst", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_cleardst", {}, -1, GET)); @@ -2704,7 +2716,7 @@ TEST_CASE("udp_cleardst", "[.cmdcall]") { /*REQUIRE_NOTHROW(caller.call("udp_cleardst", {}, -1, PUT));*/ } -TEST_CASE("udp_firstdst", "[.cmdcall]") { +TEST_CASE("udp_firstdst", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2738,13 +2750,13 @@ TEST_CASE("udp_firstdst", "[.cmdcall]") { } } -TEST_CASE("udp_dstip", "[.cmdcall]") { +TEST_CASE("udp_dstip", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_dstip", {"0.0.0.0"}, -1, PUT)); } -TEST_CASE("udp_srcmac", "[.cmdcall]") { +TEST_CASE("udp_srcmac", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getSourceUDPMAC(); @@ -2761,13 +2773,13 @@ TEST_CASE("udp_srcmac", "[.cmdcall]") { } } -TEST_CASE("udp_dstmac", "[.cmdcall]") { +TEST_CASE("udp_dstmac", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_dstmac", {"00:00:00:00:00:00"}, -1, PUT)); } -TEST_CASE("udp_dstport", "[.cmdcall]") { +TEST_CASE("udp_dstport", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getDestinationUDPPort(); @@ -2788,7 +2800,7 @@ TEST_CASE("udp_dstport", "[.cmdcall]") { } } -TEST_CASE("udp_srcip2", "[.cmdcall]") { +TEST_CASE("udp_srcip2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2810,7 +2822,7 @@ TEST_CASE("udp_srcip2", "[.cmdcall]") { } } -TEST_CASE("udp_dstip2", "[.cmdcall]") { +TEST_CASE("udp_dstip2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2822,7 +2834,7 @@ TEST_CASE("udp_dstip2", "[.cmdcall]") { } } -TEST_CASE("udp_srcmac2", "[.cmdcall]") { +TEST_CASE("udp_srcmac2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2846,7 +2858,7 @@ TEST_CASE("udp_srcmac2", "[.cmdcall]") { } } -TEST_CASE("udp_dstmac2", "[.cmdcall]") { +TEST_CASE("udp_dstmac2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2859,7 +2871,7 @@ TEST_CASE("udp_dstmac2", "[.cmdcall]") { } } -TEST_CASE("udp_dstport2", "[.cmdcall]") { +TEST_CASE("udp_dstport2", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2888,21 +2900,21 @@ TEST_CASE("udp_dstport2", "[.cmdcall]") { } } -TEST_CASE("udp_reconfigure", "[.cmdcall]") { +TEST_CASE("udp_reconfigure", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_reconfigure", {}, -1, GET)); REQUIRE_NOTHROW(caller.call("udp_reconfigure", {}, -1, PUT)); } -TEST_CASE("udp_validate", "[.cmdcall]") { +TEST_CASE("udp_validate", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_THROWS(caller.call("udp_validate", {}, -1, GET)); REQUIRE_NOTHROW(caller.call("udp_validate", {}, -1, PUT)); } -TEST_CASE("tengiga", "[.cmdcall]") { +TEST_CASE("tengiga", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -2926,7 +2938,7 @@ TEST_CASE("tengiga", "[.cmdcall]") { } } -TEST_CASE("flowcontrol10g", "[.cmdcall]") { +TEST_CASE("flowcontrol10g", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2957,7 +2969,7 @@ TEST_CASE("flowcontrol10g", "[.cmdcall]") { } } -TEST_CASE("txdelay_frame", "[.cmdcall]") { +TEST_CASE("txdelay_frame", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -2985,7 +2997,7 @@ TEST_CASE("txdelay_frame", "[.cmdcall]") { } } -TEST_CASE("txdelay", "[.cmdcall]") { +TEST_CASE("txdelay", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3061,7 +3073,7 @@ TEST_CASE("txdelay", "[.cmdcall]") { /* ZMQ Streaming Parameters (Receiver<->Client) */ -TEST_CASE("zmqport", "[.cmdcall]") { +TEST_CASE("zmqport", "[.detectorintegration]") { Detector det; Caller caller(&det); @@ -3116,7 +3128,7 @@ TEST_CASE("zmqport", "[.cmdcall]") { } } -TEST_CASE("zmqip", "[.cmdcall]") { +TEST_CASE("zmqip", "[.detectorintegration]") { Detector det; Caller caller(&det); std::ostringstream oss1, oss2; @@ -3132,7 +3144,7 @@ TEST_CASE("zmqip", "[.cmdcall]") { } } -TEST_CASE("zmqhwm", "[.cmdcall]") { +TEST_CASE("zmqhwm", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getClientZmqHwm(); @@ -3161,7 +3173,7 @@ TEST_CASE("zmqhwm", "[.cmdcall]") { /* Advanced */ -TEST_CASE("adcpipeline", "[.cmdcall]") { +TEST_CASE("adcpipeline", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3196,7 +3208,7 @@ TEST_CASE("adcpipeline", "[.cmdcall]") { } } -TEST_CASE("programfpga", "[.cmdcall]") { +TEST_CASE("programfpga", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3212,7 +3224,7 @@ TEST_CASE("programfpga", "[.cmdcall]") { } } -TEST_CASE("resetfpga", "[.cmdcall]") { +TEST_CASE("resetfpga", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3228,7 +3240,7 @@ TEST_CASE("resetfpga", "[.cmdcall]") { } } -TEST_CASE("updatekernel", "[.cmdcall]") { +TEST_CASE("updatekernel", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3247,7 +3259,7 @@ TEST_CASE("updatekernel", "[.cmdcall]") { } } -TEST_CASE("rebootcontroller", "[.cmdcall]") { +TEST_CASE("rebootcontroller", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3263,7 +3275,7 @@ TEST_CASE("rebootcontroller", "[.cmdcall]") { } } -TEST_CASE("update", "[.cmdcall]") { +TEST_CASE("update", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3281,7 +3293,7 @@ TEST_CASE("update", "[.cmdcall]") { } } -TEST_CASE("reg", "[.cmdcall][.definecmds]") { +TEST_CASE("reg", "[.detectorintegration][.definecmds]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3319,7 +3331,7 @@ TEST_CASE("reg", "[.cmdcall][.definecmds]") { } } -TEST_CASE("adcreg", "[.cmdcall]") { +TEST_CASE("adcreg", "[.detectorintegration]") { // TODO! what is a safe value to use? Detector det; Caller caller(&det); @@ -3340,7 +3352,7 @@ TEST_CASE("adcreg", "[.cmdcall]") { } } -TEST_CASE("setbit", "[.cmdcall][.definecmds]") { +TEST_CASE("setbit", "[.detectorintegration][.definecmds]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3370,7 +3382,7 @@ TEST_CASE("setbit", "[.cmdcall][.definecmds]") { } } -TEST_CASE("clearbit", "[.cmdcall][.definecmds]") { +TEST_CASE("clearbit", "[.detectorintegration][.definecmds]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3400,7 +3412,7 @@ TEST_CASE("clearbit", "[.cmdcall][.definecmds]") { } } -TEST_CASE("getbit", "[.cmdcall][.definecmds]") { +TEST_CASE("getbit", "[.detectorintegration][.definecmds]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3430,7 +3442,7 @@ TEST_CASE("getbit", "[.cmdcall][.definecmds]") { } } -TEST_CASE("firmwaretest", "[.cmdcall]") { +TEST_CASE("firmwaretest", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3447,7 +3459,7 @@ TEST_CASE("firmwaretest", "[.cmdcall]") { } } -TEST_CASE("bustest", "[.cmdcall]") { +TEST_CASE("bustest", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3464,7 +3476,7 @@ TEST_CASE("bustest", "[.cmdcall]") { } } -TEST_CASE("initialchecks", "[.cmdcall]") { +TEST_CASE("initialchecks", "[.detectorintegration]") { Detector det; Caller caller(&det); auto check = det.getInitialChecks(); @@ -3486,7 +3498,7 @@ TEST_CASE("initialchecks", "[.cmdcall]") { det.setInitialChecks(check); } -TEST_CASE("adcinvert", "[.cmdcall]") { +TEST_CASE("adcinvert", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3514,7 +3526,7 @@ TEST_CASE("adcinvert", "[.cmdcall]") { /* Insignificant */ -TEST_CASE("port", "[.cmdcall]") { +TEST_CASE("port", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getControlPort({0}).squash(); @@ -3538,7 +3550,7 @@ TEST_CASE("port", "[.cmdcall]") { det.setControlPort(prev_val, {0}); } -TEST_CASE("stopport", "[.cmdcall]") { +TEST_CASE("stopport", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getStopPort({0}).squash(); @@ -3562,7 +3574,7 @@ TEST_CASE("stopport", "[.cmdcall]") { det.setStopPort(prev_val, {0}); } -TEST_CASE("lock", "[.cmdcall]") { +TEST_CASE("lock", "[.detectorintegration]") { Detector det; Caller caller(&det); auto prev_val = det.getDetectorLock(); @@ -3586,13 +3598,13 @@ TEST_CASE("lock", "[.cmdcall]") { } } -TEST_CASE("execcommand", "[.cmdcall]") { +TEST_CASE("execcommand", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("execcommand", {"ls *.txt"}, -1, PUT)); } -TEST_CASE("framecounter", "[.cmdcall]") { +TEST_CASE("framecounter", "[.detectorintegration]") { Detector det; Caller caller(&det); auto det_type = det.getDetectorType().squash(); @@ -3610,7 +3622,7 @@ TEST_CASE("framecounter", "[.cmdcall]") { } } -TEST_CASE("runtime", "[.cmdcall]") { +TEST_CASE("runtime", "[.detectorintegration]") { // TODO! can we test this? Detector det; Caller caller(&det); @@ -3628,7 +3640,7 @@ TEST_CASE("runtime", "[.cmdcall]") { } } -TEST_CASE("frametime", "[.cmdcall]") { +TEST_CASE("frametime", "[.detectorintegration]") { // TODO! can we test this? Detector det; Caller caller(&det); @@ -3646,14 +3658,14 @@ TEST_CASE("frametime", "[.cmdcall]") { } } -TEST_CASE("user", "[.cmdcall]") { +TEST_CASE("user", "[.detectorintegration]") { Detector det; Caller caller(&det); // caller only has help. cmdApp takes care of put and get REQUIRE_NOTHROW(caller.call("user", {}, -1, defs::HELP_ACTION)); } -TEST_CASE("sleep", "[.cmdcall]") { +TEST_CASE("sleep", "[.detectorintegration]") { Detector det; Caller caller(&det); REQUIRE_NOTHROW(caller.call("sleep", {"1"}, -1, PUT)); diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index afffb317d..84b248835 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -813,7 +813,8 @@ void Implementation::startReadout() { << "waiting for all packets, previousValue:" << previousValue << " totalPacketsReceived: " << totalPacketsReceived; - /* TODO! Need to find optimal time **/ + /* TODO! Need to find optimal time - xilinx and jungfrau need + * more time */ std::this_thread::sleep_for(std::chrono::milliseconds(5)); previousValue = totalPacketsReceived; totalPacketsReceived = 0; diff --git a/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp b/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp index db278658e..54f60d0cb 100644 --- a/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp +++ b/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp @@ -140,7 +140,7 @@ class DataProcessorTestFixture { }; TEST_CASE_METHOD(DataProcessorTestFixture, "Remove Trailing Bits", - "[.dataprocessor][.bitoffset]") { + "[dataprocessor][bitoffset]") { const size_t num_random_offset_bytes = 3; set_random_offset_bytes(num_random_offset_bytes); @@ -170,7 +170,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Remove Trailing Bits", // parametric test tested with num_samples = 5, num_samples = 10, num_samples = // 8 TEST_CASE_METHOD(DataProcessorTestFixture, "Reorder all", - "[.dataprocessor][.reorder]") { + "[dataprocessor][reorder]") { // parameters: num_samples, expected_num_digital_bytes, // expected_digital_part_for_each_bit auto parameters = GENERATE( @@ -219,7 +219,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Reorder all", TEST_CASE_METHOD(DataProcessorTestFixture, "Reorder all and remove trailing bits", - "[.dataprocessor][.reorder]") { + "[dataprocessor][reorder]") { // set number of samples for test fixture -> create data const size_t num_random_offset_bytes = 3; @@ -261,7 +261,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, } TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder false", - "[.dataprocessor][.retrievebitlist]") { + "[dataprocessor][retrievebitlist]") { // parameters: num_samples, bitlist, expected_num_digital_bytes, // expected_digital_part auto parameters = GENERATE( @@ -315,7 +315,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder false", } TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder true", - "[.dataprocessor][.retrievebitlist]") { + "[dataprocessor][retrievebitlist]") { // parameters: num_samples, bitlist, expected_num_digital_bytes, // expected_digital_part auto parameters = GENERATE( @@ -369,7 +369,7 @@ TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist with reorder true", TEST_CASE_METHOD(DataProcessorTestFixture, "Arrange bitlist and remove trailing bits", - "[.dataprocessor][.retrievebitlist]") { + "[dataprocessor][retrievebitlist]") { size_t num_random_offset_bytes = 3; std::vector bitlist{1, 4, 5}; diff --git a/slsSupportLib/tests/test-Timer.cpp b/slsSupportLib/tests/test-Timer.cpp index 6d94f1f7b..a4e768334 100644 --- a/slsSupportLib/tests/test-Timer.cpp +++ b/slsSupportLib/tests/test-Timer.cpp @@ -8,7 +8,7 @@ namespace sls { -TEST_CASE("Time 1s restart then time 2s", "[.timer]") { +TEST_CASE("Time 1s restart then time 2s", "[timer]") { auto sleep_duration = std::chrono::seconds(1); auto t = Timer(); std::this_thread::sleep_for(sleep_duration); @@ -19,7 +19,7 @@ TEST_CASE("Time 1s restart then time 2s", "[.timer]") { REQUIRE(t.elapsed_s() == Approx(2).epsilon(0.01)); } -TEST_CASE("Return ms", "[.timer]") { +TEST_CASE("Return ms", "[timer]") { auto sleep_duration = std::chrono::milliseconds(1300); auto t = Timer(); std::this_thread::sleep_for(sleep_duration); diff --git a/slsSupportLib/tests/test-Version.cpp b/slsSupportLib/tests/test-Version.cpp index 9c1f1d3f8..5870c9b56 100644 --- a/slsSupportLib/tests/test-Version.cpp +++ b/slsSupportLib/tests/test-Version.cpp @@ -5,7 +5,7 @@ namespace sls { -TEST_CASE("check if version is semantic", "[.version]") { +TEST_CASE("check if version is semantic", "[version]") { auto [version_string, has_semantic_version] = GENERATE(std::make_tuple("developer 0x250512", false), diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9f3d1b7c9..84e727629 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -60,7 +60,3 @@ catch_discover_tests(tests) configure_file(scripts/test_simulators.py ${CMAKE_BINARY_DIR}/bin/test_simulators.py COPYONLY) configure_file(scripts/test_frame_synchronizer.py ${CMAKE_BINARY_DIR}/bin/test_frame_synchronizer.py COPYONLY) configure_file(scripts/utils_for_test.py ${CMAKE_BINARY_DIR}/bin/utils_for_test.py COPYONLY) -configure_file(scripts/test_roi.py ${CMAKE_BINARY_DIR}/bin/test_roi.py COPYONLY) -configure_file(scripts/test_free.py ${CMAKE_BINARY_DIR}/bin/test_free.py COPYONLY) -configure_file(scripts/test_commands.py ${CMAKE_BINARY_DIR}/bin/test_commands.py COPYONLY) - diff --git a/tests/scripts/test_commands.py b/tests/scripts/test_commands.py deleted file mode 100644 index 73d28442e..000000000 --- a/tests/scripts/test_commands.py +++ /dev/null @@ -1,100 +0,0 @@ -# SPDX-License-Identifier: LGPL-3.0-or-other -# Copyright (C) 2021 Contributors to the SLS Detector Package -''' -This file is used to start up simulators and test for freeing shm and accessing it from python. -Run this using: pytest -s test_free.py -''' - -from time import time -import pytest, sys, time - -from slsdet import Detector, Ctb, freeSharedMemory -from slsdet.defines import DEFAULT_TCP_RX_PORTNO -from utils_for_test import ( - Log, - LogLevel, - cleanup, - startDetectorVirtualServer, - startProcessInBackground, - loadConfig, - loadBasicSettings -) - -def startReceiver(num_mods, fp): - if num_mods == 1: - cmd = ['slsReceiver'] - else: - cmd = ['slsMultiReceiver', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] - # in 10.0.0 - #cmd = ['slsMultiReceiver', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)] - startProcessInBackground(cmd, fp) - time.sleep(1) - -''' -scope = module =>Once per test file/module -to share expensive setup like startDetectorVirtualServer -''' -@pytest.fixture(scope="module") -def det_config(): - return { - "name": "ctb", - "num_mods": 1 - } - -# autouse is false to pass explictly -@pytest.fixture(scope="module", autouse=False) -def setup_simulator(det_config): - """Fixture to start the detector server once and clean up at the end.""" - fp = sys.stdout - - cleanup(fp) - # server - startDetectorVirtualServer(det_config["name"], det_config["num_mods"], fp) - # receiver - startReceiver(det_config["num_mods"], fp) - # config and basic settings - d = loadConfig(name=det_config["name"], rx_hostname="localhost", settingsdir="", fp=fp, num_mods=det_config["num_mods"]) - loadBasicSettings(name=det_config["name"], d=d, fp=fp) - - yield d # tests run here - - cleanup(fp) - - - -def test_parameters_file(setup_simulator): - d = setup_simulator - Log(LogLevel.INFOBLUE, f'\nRunning test_parameters_file') - - assert isinstance(d, Detector) - - with open("/tmp/params.det", "w") as f: - f.write("frames 2\n") - f.write("fwrite 1\n") - - # this should not throw - d.parameters = "/tmp/params.det" - - assert d.frames == 2 - assert d.fwrite == 1 - - Log(LogLevel.INFOGREEN, f"✅ Test passed. Command: parameters") - - -def test_include_file(setup_simulator): - d = setup_simulator - Log(LogLevel.INFOBLUE, f'\test_include_file test_parameters_file') - - assert isinstance(d, Detector) - - with open("/tmp/params.det", "w") as f: - f.write("frames 3\n") - f.write("fwrite 0\n") - - # this should not throw - d.include = "/tmp/params.det" - - assert d.frames == 3 - assert d.fwrite == 0 - - Log(LogLevel.INFOGREEN, f"✅ Test passed. Command: include") diff --git a/tests/scripts/test_frame_synchronizer.py b/tests/scripts/test_frame_synchronizer.py index 6653c96cb..0f25b02a4 100644 --- a/tests/scripts/test_frame_synchronizer.py +++ b/tests/scripts/test_frame_synchronizer.py @@ -14,44 +14,43 @@ from utils_for_test import ( Log, LogLevel, RuntimeException, - checkIfProcessRunning, - killProcess, cleanup, - cleanSharedmemory, startProcessInBackground, - startProcessInBackgroundWithLogFile, checkLogForErrors, startDetectorVirtualServer, loadConfig, loadBasicSettings, - ParseArguments + ParseArguments, + build_dir, + optional_file ) LOG_PREFIX_FNAME = '/tmp/slsFrameSynchronizer_test' MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt' PULL_SOCKET_PREFIX_FNAME = LOG_PREFIX_FNAME + '_pull_socket_' +SYNCHRONIZER_SUFFIX_FNAME = LOG_PREFIX_FNAME + '_synchronizer.txt' -def startFrameSynchronizerPullSocket(name, fp): - fname = PULL_SOCKET_PREFIX_FNAME + name + '.txt' +def startFrameSynchronizerPullSocket(name, fp, quiet_mode=False): cmd = ['python', '-u', 'frameSynchronizerPullSocket.py'] - startProcessInBackgroundWithLogFile(cmd, fp, fname) + fname = PULL_SOCKET_PREFIX_FNAME + name + '.txt' + startProcessInBackground(cmd, fp, fname, quiet_mode) time.sleep(1) checkLogForErrors(fp, fname) -def startFrameSynchronizer(num_mods, fp): - cmd = ['slsFrameSynchronizer', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] +def startFrameSynchronizer(num_mods, fp, quiet_mode=False): + cmd = [str(build_dir / 'slsFrameSynchronizer'), str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] # in 10.0.0 #cmd = ['slsFrameSynchronizer', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)] - startProcessInBackground(cmd, fp) + fname = SYNCHRONIZER_SUFFIX_FNAME + startProcessInBackground(cmd, fp, fname, quiet_mode) time.sleep(1) def acquire(fp, det): - Log(LogLevel.INFO, 'Acquiring') - Log(LogLevel.INFO, 'Acquiring', fp) + Log(LogLevel.INFO, 'Acquiring', fp, True) det.acquire() @@ -60,14 +59,12 @@ def testFramesCaught(name, det, num_frames): if fnum != num_frames: raise RuntimeException(f"{name} caught only {fnum}. Expected {num_frames}") - Log(LogLevel.INFOGREEN, f'Frames caught test passed for {name}') - Log(LogLevel.INFOGREEN, f'Frames caught test passed for {name}', fp) + Log(LogLevel.INFOGREEN, f'Frames caught test passed for {name}', fp, True) def testZmqHeadetTypeCount(name, det, num_mods, num_frames, fp): - Log(LogLevel.INFO, f"Testing Zmq Header type count for {name}") - Log(LogLevel.INFO, f"Testing Zmq Header type count for {name}", fp) + Log(LogLevel.INFO, f"Testing Zmq Header type count for {name}", fp, True) htype_counts = { "header": 0, "series_end": 0, @@ -89,7 +86,6 @@ def testZmqHeadetTypeCount(name, det, num_mods, num_frames, fp): htype_counts[htype] += 1 except json.JSONDecodeError: continue - # test if file contents matches expected counts num_ports_per_module = 1 if name == "gotthard2" else det.numinterfaces total_num_frame_parts = num_ports_per_module * num_mods * num_frames @@ -100,19 +96,17 @@ def testZmqHeadetTypeCount(name, det, num_mods, num_frames, fp): except Exception as e: raise RuntimeException(f'Failed to get zmq header count type. Error:{str(e)}') from e - Log(LogLevel.INFOGREEN, f"Zmq Header type count test passed for {name}") - Log(LogLevel.INFOGREEN, f"Zmq Header type count test passed for {name}", fp) + Log(LogLevel.INFOGREEN, f"Zmq Header type count test passed for {name}", fp, True) def startTestsForAll(args, fp): for server in args.servers: try: - Log(LogLevel.INFOBLUE, f'Synchronizer Tests for {server}') - Log(LogLevel.INFOBLUE, f'Synchronizer Tests for {server}', fp) + Log(LogLevel.INFOBLUE, f'Synchronizer Tests for {server}', fp, True) cleanup(fp) - startDetectorVirtualServer(server, args.num_mods, fp) - startFrameSynchronizerPullSocket(server, fp) - startFrameSynchronizer(args.num_mods, fp) + startDetectorVirtualServer(server, args.num_mods, fp, args.quiet) + startFrameSynchronizerPullSocket(server, fp, args.quiet) + startFrameSynchronizer(args.num_mods, f, args.quiet_modep) d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=args.num_mods, num_frames=args.num_frames) loadBasicSettings(name=server, d=d, fp=fp) acquire(fp, d) @@ -128,6 +122,9 @@ def startTestsForAll(args, fp): if __name__ == '__main__': args = ParseArguments(description='Automated tests to test frame synchronizer', default_num_mods=2) + if args.no_log_file: + raise RuntimeException("Cannot run frame synchronizer test without files") + Log(LogLevel.INFOBLUE, '\nLog File: ' + MAIN_LOG_FNAME + '\n') with open(MAIN_LOG_FNAME, 'w') as fp: diff --git a/tests/scripts/test_roi.py b/tests/scripts/test_roi.py deleted file mode 100644 index 17d35c56d..000000000 --- a/tests/scripts/test_roi.py +++ /dev/null @@ -1,82 +0,0 @@ -# SPDX-License-Identifier: LGPL-3.0-or-other -# Copyright (C) 2021 Contributors to the SLS Detector Package -''' -This file is used to start up simulators, receivers and test roi for every detector in many configurations. -''' - -import sys, time -import traceback - -from slsdet import Detector, burstMode -from slsdet.defines import DEFAULT_TCP_RX_PORTNO, DEFAULT_UDP_DST_PORTNO -from datetime import timedelta - - -from utils_for_test import ( - Log, - LogLevel, - RuntimeException, - cleanup, - startProcessInBackground, - startReceiver, - startDetectorVirtualServer, - connectToVirtualServers, - loadBasicSettings, - loadConfig, - runProcessWithLogFile -) - -LOG_PREFIX_FNAME = '/tmp/slsDetectorPackage_virtual_roi_test' -MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt' -ROI_TEST_FNAME = LOG_PREFIX_FNAME + '_results_' - -def startTestsForAll(fp): - servers = [ - 'eiger', - 'jungfrau', - 'mythen3', - 'gotthard2', - 'moench', - ] - nmods = 2 - for server in servers: - for ninterfaces in range(1, 2): - if ninterfaces == 2 and server != 'jungfrau' and server != 'moench': - continue - try: - msg = f'Starting Roi Tests for {server}' - if server == 'jungfrau' or server == 'moench': - msg += f' with {ninterfaces} interfaces' - Log(LogLevel.INFOBLUE, msg) - Log(LogLevel.INFOBLUE, msg, fp) - cleanup(fp) - startDetectorVirtualServer(server, nmods, fp) - startReceiver(nmods, fp) - d = loadConfig(name=server, log_file_fp = fp, num_mods=nmods, num_frames=5, num_interfaces=ninterfaces) - loadBasicSettings(name=server, d=d, fp=fp) - - fname = ROI_TEST_FNAME + server + '.txt' - cmd = ['tests', 'rx_roi', '--abort', '-s'] - runProcessWithLogFile('Roi Tests for ' + server, cmd, fp, fname) - Log(LogLevel.INFO, '\n') - except Exception as e: - raise RuntimeException(f'Roi Tests failed') from e - - Log(LogLevel.INFOGREEN, 'Passed all Roi tests for all detectors \n' + str(servers)) - - -if __name__ == '__main__': - Log(LogLevel.INFOBLUE, '\nLog File: ' + MAIN_LOG_FNAME + '\n') - - with open(MAIN_LOG_FNAME, 'w') as fp: - try: - startTestsForAll(fp) - #TODO: check master file as well for both json and hdf5 as well - cleanup(fp) - except Exception as e: - with open(MAIN_LOG_FNAME, 'a') as fp_error: - traceback.print_exc(file=fp_error) - cleanup(fp) - Log(LogLevel.ERROR, f'Tests Failed.') - - diff --git a/tests/scripts/test_simulators.py b/tests/scripts/test_simulators.py index 7aab1d958..a7f211d12 100644 --- a/tests/scripts/test_simulators.py +++ b/tests/scripts/test_simulators.py @@ -2,91 +2,98 @@ # Copyright (C) 2021 Contributors to the SLS Detector Package ''' This file is used to start up simulators, receivers and run all the tests on them and finally kill the simulators and receivers. + +It can be used to run all catch tests with tag [.detectorintegration]. + +Pass --tests to run specific tests only or --tests to run all tests with that specific tag. + +Pass --servers ... to run tests only for specific detector servers. ''' import argparse import sys, subprocess, time, traceback +from contextlib import contextmanager from slsdet import Detector from slsdet.defines import DEFAULT_TCP_RX_PORTNO + from utils_for_test import ( Log, LogLevel, RuntimeException, - checkIfProcessRunning, - killProcess, cleanup, - cleanSharedmemory, - startProcessInBackground, - runProcessWithLogFile, + runProcess, + startReceiver, + runProcess, startDetectorVirtualServer, loadConfig, loadBasicSettings, - ParseArguments + ParseArguments, + build_dir, + optional_file ) - LOG_PREFIX_FNAME = '/tmp/slsDetectorPackage_virtual_test' MAIN_LOG_FNAME = LOG_PREFIX_FNAME + '_log.txt' GENERAL_TESTS_LOG_FNAME = LOG_PREFIX_FNAME + '_results_general.txt' -CMD_TEST_LOG_PREFIX_FNAME = LOG_PREFIX_FNAME + '_results_cmd_' - - -def startReceiver(num_mods, fp): - if num_mods == 1: - cmd = ['slsReceiver'] - else: - cmd = ['slsMultiReceiver', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] - # in 10.0.0 - #cmd = ['slsMultiReceiver', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)] - startProcessInBackground(cmd, fp) - time.sleep(1) def startGeneralTests(fp): fname = GENERAL_TESTS_LOG_FNAME - cmd = ['tests', '--abort', '-s'] + cmd = [str(build_dir / 'tests'), '--abort', '-s'] try: cleanup(fp) - runProcessWithLogFile('General Tests', cmd, fp, fname) + runProcess('General Tests', cmd, fp, fname) except Exception as e: raise RuntimeException(f'General tests failed.') from e +def startTestsForAll(args, fp): + + fname_template = LOG_PREFIX_FNAME + "_{}_{}.txt" + + + test_filter = args.tests + cmd = [str(build_dir / 'tests'), '--abort', test_filter, '-s'] + + num_mods = args.num_mods -def startCmdTestsForAll(args, fp): for server in args.servers: - try: - num_mods = 2 if server == 'eiger' else 1 - fname = CMD_TEST_LOG_PREFIX_FNAME + server + '.txt' - cmd = ['tests', '--abort', args.markers, '-s'] + for curMods in range(1, num_mods + 1): + if curMods == 2 and server in ['ctb', 'xilinx_ctb']: + continue + for ninterfaces in [1,2]: # always test both + if ninterfaces == 2 and server != 'jungfrau' and server != 'moench': + continue - Log(LogLevel.INFOBLUE, f'Starting Cmd Tests for {server}') - cleanup(fp) - startDetectorVirtualServer(name=server, num_mods=num_mods, fp=fp) - startReceiver(num_mods, fp) - d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=num_mods) - loadBasicSettings(name=server, d=d, fp=fp) - runProcessWithLogFile('Cmd Tests (' + args.markers + ') for ' + server, cmd, fp, fname) - except Exception as e: - raise RuntimeException(f'Cmd Tests failed for {server}.') from e + if server == "eiger": + curMods *= 2 # top and bottom half module + try: + fname = fname_template.format(args.tests, server) if not args.no_log_file else None + + Log(LogLevel.INFOBLUE, f'Starting {args.tests} Tests for {server}, {ninterfaces} interfaces, {curMods} modules', fp, True) + cleanup(fp) + startDetectorVirtualServer(name=server, num_mods=curMods, fp=fp, no_log_file=args.no_log_file, quiet_mode=args.quiet) + startReceiver(curMods, fp, args.no_log_file, args.quiet) + d = loadConfig(name=server, rx_hostname=args.rx_hostname, settingsdir=args.settingspath, log_file_fp=fp, num_mods=curMods, num_interfaces=ninterfaces) + loadBasicSettings(name=server, d=d, fp=fp) + runProcess('Tests (' + args.tests + ') for ' + server, cmd, fp, fname, args.quiet) + except Exception as e: + raise RuntimeException(f'Tests (' + args.tests + ') failed for ' + server + '.') from e Log(LogLevel.INFOGREEN, 'Passed all tests for all detectors \n' + str(args.servers)) if __name__ == '__main__': - args = ParseArguments(description='Automated tests with the virtual detector servers', default_num_mods=1, markers=True, general_tests_option=True) - if args.num_mods > 1: - raise RuntimeException(f'Cannot support multiple modules at the moment (except Eiger).') + args = ParseArguments(description='Automated tests with the virtual detector servers', default_num_mods=2, specific_tests=True, general_tests_option=True) - Log(LogLevel.INFOBLUE, '\nLog File: ' + MAIN_LOG_FNAME + '\n') - - with open(MAIN_LOG_FNAME, 'w') as fp: + with optional_file(MAIN_LOG_FNAME if not args.no_log_file else None, 'w', args.quiet) as fp: try: if args.general_tests: startGeneralTests(fp) - startCmdTestsForAll(args, fp) + startTestsForAll(args, fp) cleanup(fp) except Exception as e: - with open(MAIN_LOG_FNAME, 'a') as fp_error: - traceback.print_exc(file=fp_error) + traceback.print_exc(file=fp) cleanup(fp) Log(LogLevel.ERROR, f'Tests Failed.') + raise e + diff --git a/tests/scripts/utils_for_test.py b/tests/scripts/utils_for_test.py index bff86f886..66c43fb38 100644 --- a/tests/scripts/utils_for_test.py +++ b/tests/scripts/utils_for_test.py @@ -3,19 +3,24 @@ ''' This file is used for common utils used for integration tests between simulators and receivers. ''' - +import os from pathlib import Path import sys, subprocess, time, argparse from enum import Enum from colorama import Fore, Style, init from datetime import timedelta +from contextlib import contextmanager from slsdet import Detector, Ctb, detectorSettings, burstMode from slsdet.defines import DEFAULT_TCP_RX_PORTNO, DEFAULT_UDP_DST_PORTNO SERVER_START_PORTNO=1900 +LOG_PREFIX_FNAME = "/tmp/slsDetectorPackage_" + init(autoreset=True) +build_dir = Path(__file__).resolve().parents[2] / "build" / "bin" + class LogLevel(Enum): INFO = 0 INFORED = 1 @@ -44,10 +49,13 @@ LOG_COLORS = { } -def Log(level: LogLevel, message: str, stream=sys.stdout): +def Log(level: LogLevel, message: str, stream=sys.stdout, both=False): color = LOG_COLORS.get(level, Fore.WHITE) label = LOG_LABELS.get(level, "") print(f"{color}{label}{message}{Style.RESET_ALL}", file=stream, flush=True) + if both and stream != sys.stdout: + print(f"{color}{label}{message}{Style.RESET_ALL}", file=sys.stdout, flush=True) + class RuntimeException (Exception): @@ -56,9 +64,27 @@ class RuntimeException (Exception): super().__init__(message) +@contextmanager +def optional_file(file_path=None, mode='w', quiet_mode=False): + if file_path: + f = open(file_path, mode) + try: + yield f + finally: + f.close() + else: + if quiet_mode: + f = open(os.devnull, mode) + try: + yield f + finally: + f.close() + else: + yield sys.stdout + + def checkIfProcessRunning(processName): - cmd = f"pgrep -f {processName}" - res = subprocess.getoutput(cmd) + res = subprocess.getoutput(f"pgrep -f {processName}") return res.strip().splitlines() @@ -80,18 +106,13 @@ def killProcess(name, fp): def cleanSharedmemory(fp): Log(LogLevel.INFO, 'Cleaning up shared memory', fp) try: - p = subprocess.run(['sls_detector_get', 'free'], stdout=fp, stderr=fp, check = False) - except FileNotFoundError: - # Binary not available (e.g. on CI) → ignore - Log(LogLevel.INFO, 'sls_detector_get not found, skipping shared memory cleanup', fp) + p = subprocess.run([build_dir / 'sls_detector_get', 'free'], stdout=fp, stderr=fp) except Exception as e: - # Any other cleanup failure should NEVER fail tests - Log(LogLevel.WARN, f'Ignoring shared memory cleanup error: {e}', fp) + raise RuntimeException(f'Could not free shared memory: {str(e)}') def cleanup(fp): - Log(LogLevel.INFO, 'Cleaning up') - Log(LogLevel.INFO, 'Cleaning up', fp) + Log(LogLevel.INFO, 'Cleaning up', fp, True) killProcess('DetectorServer_virtual', fp) killProcess('slsReceiver', fp) killProcess('slsMultiReceiver', fp) @@ -100,20 +121,15 @@ def cleanup(fp): cleanSharedmemory(fp) -def startProcessInBackground(cmd, fp): - Log(LogLevel.INFO, 'Starting up ' + ' '.join(cmd)) - Log(LogLevel.INFO, 'Starting up ' + ' '.join(cmd), fp) - try: - p = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, restore_signals=False) - except Exception as e: - raise RuntimeException(f'Failed to start {cmd}:{str(e)}') from e +def startProcessInBackground(cmd, fp, log_file_name: str, quiet_mode=False): + info_text = 'Starting up ' + ' '.join(cmd) + if log_file_name: + info_text += '. Log: ' + log_file_name + Log(LogLevel.INFO, f'{info_text}', fp, True) -def startProcessInBackgroundWithLogFile(cmd, fp, log_file_name: str): - Log(LogLevel.INFOBLUE, 'Starting up ' + ' '.join(cmd) + '. Log: ' + log_file_name) - Log(LogLevel.INFOBLUE, 'Starting up ' + ' '.join(cmd) + '. Log: ' + log_file_name, fp) try: - with open(log_file_name, 'w') as log_fp: + with optional_file(log_file_name, 'w', quiet_mode) as log_fp: subprocess.Popen(cmd, stdout=log_fp, stderr=log_fp, text=True) except Exception as e: raise RuntimeException(f'Failed to start {cmd}:{str(e)}') from e @@ -124,8 +140,7 @@ def checkLogForErrors(fp, log_file_path: str): with open(log_file_path, 'r') as log_file: for line in log_file: if 'Error' in line: - Log(LogLevel.ERROR, f"Error found in log: {line.strip()}") - Log(LogLevel.ERROR, f"Error found in log: {line.strip()}", fp) + Log(LogLevel.ERROR, f"Error found in log: {line.strip()}", fp, True) raise RuntimeException("Error found in log file") except FileNotFoundError: print(f"Log file not found: {log_file_path}") @@ -135,33 +150,92 @@ def checkLogForErrors(fp, log_file_path: str): raise -def runProcessWithLogFile(name, cmd, fp, log_file_name): - Log(LogLevel.INFOBLUE, 'Running ' + name + '. Log: ' + log_file_name) - Log(LogLevel.INFOBLUE, 'Running ' + name + '. Log: ' + log_file_name, fp) - Log(LogLevel.INFOBLUE, 'Cmd: ' + ' '.join(cmd), fp) +def checkLogForErrorsOrSummary(fp, lines, source_name=""): + failed = False # if it found "failed" or "FAILED" in file + failed_msg = "" + printing_error = False # print every line in file after failure + printing_summary = False # print summary if no failure + + + for line in lines: + line_stripped = line.rstrip() + + # Detect failure (case-insensitive) + if not failed and (": FAILED:" in line or " failed\nassertions" in line): + failed = True + failed_msg = line_stripped + printing_error = True + Log(LogLevel.ERROR, line_stripped, fp) + if source_name: + Log(LogLevel.ERROR, f"Error log from file: {source_name}") + Log(LogLevel.ERROR, "="*79) + + # After failure, log everything as ERROR + if printing_error: + print(f"{line_stripped}") + continue + + # Summary delimiter + if line_stripped.startswith("====="): + printing_summary = True + + # No failure - print summary lines + if printing_summary: + print(f"{line_stripped}") + + + if failed: + Log(LogLevel.ERROR, "="*79) + raise RuntimeException(f'Test failed: {failed_msg}') + else: + print("="*79) + + + +def runProcess(name, cmd, fp, log_file_name = None, quiet_mode=False): + + info_text = 'Running ' + name + '.' + if log_file_name: + info_text += ' Log: ' + log_file_name + Log(LogLevel.INFOBLUE, info_text, fp, True) + Log(LogLevel.INFOBLUE, 'Cmd: ' + ' '.join(cmd), fp, True) + + error_log = None + try: - with open(log_file_name, 'w') as log_fp: - subprocess.run(cmd, stdout=log_fp, stderr=log_fp, check=True, text=True) + if log_file_name: + with optional_file(log_file_name, 'w', quiet_mode) as log_fp: + subprocess.run(cmd, stdout=log_fp, stderr=log_fp, check=True, text=True) + else: + capture = subprocess.run(cmd, check=True, text=True, capture_output=True) + captured_log = capture.stdout.splitlines() + except subprocess.CalledProcessError as e: - pass + print("error: ", str(e)) + captured_log = e.stdout.splitlines() + pass except Exception as e: + print("something else failed") Log(LogLevel.ERROR, f'Failed to run {name}:{str(e)}', fp) raise RuntimeException(f'Failed to run {name}:{str(e)}') - with open (log_file_name, 'r') as f: - for line in f: - if "FAILED" in line: - raise RuntimeException(f'{line}') + if log_file_name: + with optional_file(log_file_name, 'r') as log_fp: + checkLogForErrorsOrSummary(fp, log_fp, log_file_name) + else: + checkLogForErrorsOrSummary(fp, captured_log) - Log(LogLevel.INFOGREEN, name + ' successful!\n') - Log(LogLevel.INFOGREEN, name + ' successful!\n', fp) + Log(LogLevel.INFOGREEN, name + ' successful!\n', fp, True) -def startDetectorVirtualServer(name :str, num_mods, fp): +def startDetectorVirtualServer(name :str, num_mods, fp, no_log_file = False, quiet_mode=False): for i in range(num_mods): port_no = SERVER_START_PORTNO + (i * 2) - cmd = [name + 'DetectorServer_virtual', '-p', str(port_no)] - startProcessInBackgroundWithLogFile(cmd, fp, "/tmp/virtual_det_" + name + "_" + str(i) + ".txt") + cmd = [str(build_dir / (name + 'DetectorServer_virtual')), '-p', str(port_no)] + fname = LOG_PREFIX_FNAME + "virtual_det_" + name + "_" + str(SERVER_START_PORTNO) + ".txt" + if no_log_file: + fname = None + startProcessInBackground(cmd, fp, fname, quiet_mode) match name: case 'jungfrau': time.sleep(7) @@ -196,20 +270,23 @@ def connectToVirtualServers(name, num_mods, ctb_object=False): return d -def startReceiver(num_mods, fp): +def startReceiver(num_mods, fp, no_log_file = False, quiet_mode=False): if num_mods == 1: - cmd = ['slsReceiver'] + cmd = [str(build_dir / 'slsReceiver')] + fname = LOG_PREFIX_FNAME + "slsReceiver.txt" else: - cmd = ['slsMultiReceiver', str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] + cmd = [str(build_dir / 'slsMultiReceiver'), str(DEFAULT_TCP_RX_PORTNO), str(num_mods)] + fname = LOG_PREFIX_FNAME + "slsMultiReceiver.txt" # in 10.0.0 #cmd = ['slsMultiReceiver', '-p', str(DEFAULT_TCP_RX_PORTNO), '-n', str(num_mods)] - startProcessInBackground(cmd, fp) + + if no_log_file: + fname = None + startProcessInBackground(cmd, fp, fname, quiet_mode) time.sleep(1) - def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp = None, num_mods = 1, num_frames = 1, num_interfaces = 1): - Log(LogLevel.INFO, 'Loading config') - Log(LogLevel.INFO, 'Loading config', log_file_fp) + Log(LogLevel.INFO, 'Loading config', log_file_fp, True) try: d = connectToVirtualServers(name, num_mods) @@ -217,17 +294,15 @@ def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp d.numinterfaces = num_interfaces d.udp_dstport = DEFAULT_UDP_DST_PORTNO - if name == 'eiger' or name == 'jungfrau' or name == 'moench': + if name == 'eiger' or num_interfaces == 2: d.udp_dstport2 = DEFAULT_UDP_DST_PORTNO + 1 d.rx_hostname = rx_hostname - d.udp_dstip = 'auto' - if name != "eiger": d.udp_srcip = 'auto' - if name == "jungfrau" or name == "moench": + if num_interfaces == 2: d.udp_dstip2 = 'auto' if name == "jungfrau" or name == "moench" or name == "xilinx_ctb": @@ -241,6 +316,7 @@ def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp d.trimen = [4500, 5400, 6400] if name == 'eiger' else [4000, 6000, 8000, 12000] d.setThresholdEnergy(4500, detectorSettings.STANDARD) + d.frames = num_frames except Exception as e: @@ -248,10 +324,11 @@ def loadConfig(name, rx_hostname = 'localhost', settingsdir = None, log_file_fp return d + + # for easy acquire def loadBasicSettings(name, d, fp): - Log(LogLevel.INFO, 'Loading basic settings for ' + name) - Log(LogLevel.INFO, 'Loading basic settings for ' + name, fp) + Log(LogLevel.INFO, 'Loading basic settings for ' + name, fp, True) try: # basic settings for easy acquire if name == "jungfrau": @@ -278,7 +355,7 @@ def loadBasicSettings(name, d, fp): except Exception as e: raise RuntimeException(f'Could not load config for {name}. Error: {str(e)}') from e -def ParseArguments(description, default_num_mods=1, markers=False, general_tests_option=False): +def ParseArguments(description, default_num_mods=2, specific_tests=False, general_tests_option=False): parser = argparse.ArgumentParser(description) default_settings_path = Path(__file__).resolve().parents[2] / "settingsdir" @@ -293,16 +370,21 @@ def ParseArguments(description, default_num_mods=1, markers=False, general_tests help='Number of frames to test with') parser.add_argument('-s', '--servers', nargs='*', help='Detector servers to run') - if markers: - parser.add_argument('-m', '--markers', nargs='?', default ='[.cmdcall]', - help = 'Markers to use for cmd tests, default: [.cmdcall]') - + parser.add_argument('-nlf', '--no-log-file', action='store_true', + help='Dont write output to log file') + parser.add_argument('-q', '--quiet', action='store_true', + help='Dont write to stdout when possible.') + if specific_tests: + parser.add_argument('-t', '--tests', nargs='?', default ='[.detectorintegration]', + help = 'Test markers or specific test name to use for tests, default: [.detectorintegration]') + if general_tests_option: - parser.add_argument('-g', '--general_tests', action='store_true', + parser.add_argument('-g', '--general-tests', action='store_true', help = 'Enable general tests (no value needed)') args = parser.parse_args() + # Set default server list if not provided if args.servers is None: args.servers = [ @@ -323,8 +405,19 @@ def ParseArguments(description, default_num_mods=1, markers=False, general_tests f"num_mods: '{args.num_mods}'\n" f"num_frames: '{args.num_frames}'" ) - if markers: - msg += f"\nmarkers: '{args.markers}'" + + if args.no_log_file: + msg += f"\nLog File: Disabled" + else: + msg += f"\nLog File: Enabled" + + if args.quiet: + msg += f"\nQuiet mode: Enabled" + else: + msg += f"\nQuiet mode: Disabled" + + if specific_tests: + msg += f"\ntests: '{args.tests}'" if general_tests_option: msg += f"\ngeneral_tests: '{args.general_tests}'"