[test] Re-enable unit tests

Author: kostorr

CMakeLists.txt

@@ -274,44 +274,44 @@ endforeach()
 # Tests
 ####################################
 
-#enable_testing()
-#
-#set(TEST_SRCS
-#  #test/TestChannelFactoryUtils.cxx
-#  test/TestChannelPaths.cxx
-#  test/TestCruDataFormat.cxx
-#  test/TestEnums.cxx
-#  #test/TestInterprocessLock.cxx
-#  test/TestMemoryMappedFile.cxx
-#  #test/TestParameters.cxx
-#  test/TestPciAddress.cxx
-#  test/TestProgramOptions.cxx
-#  test/TestRorcException.cxx
-#  test/TestSuperpageQueue.cxx
-#)
-#
-#if(PDA_FOUND)
-#  list(APPEND TEST_SRCS test/TestCruBar.cxx)
-#endif()
-#
-#foreach (test ${TEST_SRCS})
-#  get_filename_component(test_name ${test} NAME)
-#  string(REGEX REPLACE ".cxx" "" test_name ${test_name})
-#
-#  add_executable(${test_name} ${test} src/CommandLineUtilities/Options.cxx)
-#   target_include_directories(${test_name}
-#    PRIVATE
-#      ${CMAKE_CURRENT_SOURCE_DIR}/src
-#  )
-#  target_link_libraries(${test_name}
-#    PRIVATE
-#      ReadoutCard
-#      Boost::unit_test_framework
-#      $<$<BOOL:${PDA_FOUND}>:pda::pda>
-#  )
-#  add_test(NAME ${test_name} COMMAND ${test_name})
-#  set_tests_properties(${test_name} PROPERTIES TIMEOUT 15)
-#endforeach()
+enable_testing()
+
+set(TEST_SRCS
+  test/TestChannelFactoryUtils.cxx
+  test/TestChannelPaths.cxx
+  test/TestCruDataFormat.cxx
+  test/TestEnums.cxx
+  test/TestInterprocessLock.cxx
+  test/TestMemoryMappedFile.cxx
+  test/TestParameters.cxx
+  test/TestPciAddress.cxx
+  test/TestProgramOptions.cxx
+  test/TestRorcException.cxx
+  test/TestSuperpageQueue.cxx
+)
+
+if(PDA_FOUND)
+  list(APPEND TEST_SRCS test/TestCruBar.cxx)
+endif()
+
+foreach (test ${TEST_SRCS})
+  get_filename_component(test_name ${test} NAME)
+  string(REGEX REPLACE ".cxx" "" test_name ${test_name})
+
+  add_executable(${test_name} ${test} src/CommandLineUtilities/Options.cxx)
+   target_include_directories(${test_name}
+    PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}/src
+  )
+  target_link_libraries(${test_name}
+    PRIVATE
+      ReadoutCard
+      Boost::unit_test_framework
+      $<$<BOOL:${PDA_FOUND}>:pda::pda>
+  )
+  add_test(NAME ${test_name} COMMAND ${test_name})
+  set_tests_properties(${test_name} PROPERTIES TIMEOUT 15)
+endforeach()
 
 
 ####################################

include/ReadoutCard/Exception.h

@@ -46,7 +46,7 @@ struct LockException : virtual Exception {
 };
 struct FileLockException : virtual LockException {
 };
-struct NamedMutexLockException : virtual LockException {
+struct SocketLockException : virtual LockException {
 };
 struct DeviceFinderException : virtual Exception {
 };

src/ExceptionInternal.h

@@ -68,7 +68,6 @@ DEFINE_ERRINFO(GeneratorEventLength, size_t);
 DEFINE_ERRINFO(Index, size_t);
 DEFINE_ERRINFO(LinkId, uint32_t);
 DEFINE_ERRINFO(DataSource, ::AliceO2::roc::DataSource::type);
-DEFINE_ERRINFO(NamedMutexName, std::string);
 DEFINE_ERRINFO(Offset, size_t);
 DEFINE_ERRINFO(PageIndex, int);
 DEFINE_ERRINFO(Pages, size_t);
@@ -98,6 +97,7 @@ DEFINE_ERRINFO(SharedLockFile, std::string);
 DEFINE_ERRINFO(SharedObjectName, std::string);
 DEFINE_ERRINFO(SharedStateFile, std::string);
 DEFINE_ERRINFO(SiuCommand, int);
+DEFINE_ERRINFO(SocketLockName, std::string);
 DEFINE_ERRINFO(String, std::string);
 DEFINE_ERRINFO(StwExpected, std::string);
 DEFINE_ERRINFO(StwReceived, std::string);

test/TestChannelFactoryUtils.cxx

@@ -3,10 +3,12 @@
 ///
 /// \author Pascal Boeschoten ([email protected])
 
-#include "ReadoutCard/CardType.h"
+#include "Dummy/DummyBar.h"
+#include "Dummy/DummyDmaChannel.h"
+#include "ReadoutCard/BarInterface.h"
 #include "ReadoutCard/ChannelFactory.h"
+#include "ReadoutCard/DmaChannelInterface.h"
 #include "Factory/ChannelFactoryUtils.h"
-#include <map>
 #include <memory>
 
 #define BOOST_TEST_MODULE RORC_TestChannelFactoryUtils
@@ -21,31 +23,27 @@ using namespace ::AliceO2::roc;
 namespace
 {
 
-struct TestInterface {
-  TestInterface() {}
-  virtual ~TestInterface() {}
-};
-
-struct DummyImpl : public TestInterface {
-};
-struct CrorcImpl : public TestInterface {
-};
-struct CruImpl : public TestInterface {
-};
+// Helper function for calling the DMA channel factory
+std::unique_ptr<DmaChannelInterface> produceDma()
+{
+  auto parameters = Parameters::makeParameters(ChannelFactory::getDummySerialId(), 0);
+  return ChannelFactoryUtils::dmaChannelFactoryHelper<DmaChannelInterface>(parameters);
+}
 
-// Helper function for calling the factory make function
-std::unique_ptr<TestInterface> callMake()
+// Helper function for calling the BAR factory
+std::unique_ptr<BarInterface> produceBar()
 {
   auto parameters = Parameters::makeParameters(ChannelFactory::getDummySerialId(), 0);
-  return ChannelFactoryUtils::channelFactoryHelper<TestInterface>(parameters, ChannelFactory::getDummySerialId(), { { CardType::Dummy, [] { return std::make_unique<DummyImpl>(); } }, { CardType::Crorc, [] { return std::make_unique<CrorcImpl>(); } }, { CardType::Cru, [] { return std::make_unique<CruImpl>(); } } });
+  return ChannelFactoryUtils::barFactoryHelper<BarInterface>(parameters);
 }
 
-// This tests if the FactoryHelper::make() function maps to the expected types.
+// This tests if the FactoryHelper functions for the DMA channel and the BAR maps to the expected types.
 // Unfortunately, we can't test the entire make function, since it depends on having actual PCI cards installed, so
 // we test only part of its implementation.
 BOOST_AUTO_TEST_CASE(ChannelFactoryHelperTest)
 {
-  BOOST_CHECK(nullptr != dynamic_cast<DummyImpl*>(callMake().get()));
+  BOOST_CHECK(nullptr != dynamic_cast<DummyDmaChannel*>(produceDma().get()));
+  BOOST_CHECK(nullptr != dynamic_cast<DummyBar*>(produceBar().get()));
 }
 
 } // Anonymous namespace

test/TestInterprocessLock.cxx

@@ -3,7 +3,6 @@
 ///
 /// \author Pascal Boeschoten ([email protected])
 
-//TODO: Update this for the socket lock
 #define BOOST_TEST_MODULE RORC_TestFileSharedObject
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
@@ -16,37 +15,26 @@
 #include <condition_variable>
 #include <iostream>
 #include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/exception/all.hpp>
-#include "InterprocessLock.h"
+#include "ReadoutCard/InterprocessLock.h"
 
 #include "ReadoutCard/Exception.h"
 
 namespace
 {
 
 using namespace ::AliceO2::roc;
-namespace b = boost;
-namespace bip = boost::interprocess;
-namespace bfs = boost::filesystem;
 
 struct TestObject {
   TestObject(const std::string& s, int i) : string(s), integer(i) {}
   std::string string;
   int integer;
 };
 
-const std::string namedMutexName("AliceO2_InterprocessMutex_Test");
-const bfs::path lockFilePath("/tmp/AliceO2_InterprocessMutex_Test.lock");
-
-void cleanupFiles()
-{
-  bip::named_mutex::remove(namedMutexName.c_str());
-  bfs::remove(lockFilePath);
-}
+const std::string lockName("AliceO2_InterprocessMutex_Test");
 
 #define CONSTRUCT_LOCK() \
-  Interprocess::Lock _test_lock { lockFilePath, namedMutexName }
+  Interprocess::Lock _test_lock { lockName }
 
 void doLock()
 {
@@ -56,8 +44,6 @@ void doLock()
 // Test the intraprocess locking
 BOOST_AUTO_TEST_CASE(InterprocessMutexTestIntraprocess)
 {
-  cleanupFiles();
-
   std::condition_variable conditionVariable;
   std::atomic<bool> childAcquired(false);
 
@@ -68,7 +54,7 @@ BOOST_AUTO_TEST_CASE(InterprocessMutexTestIntraprocess)
       childAcquired = true;
       conditionVariable.notify_all();
       std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    } catch (const LockException& e) {
+    } catch (const SocketLockException& e) {
       BOOST_FAIL("Child failed to acquire FileSharedObject");
     }
   });
@@ -80,7 +66,7 @@ BOOST_AUTO_TEST_CASE(InterprocessMutexTestIntraprocess)
   if (!status) {
     BOOST_FAIL("Timed out or child failed to acquire lock");
   }
-  BOOST_CHECK_THROW(doLock(), NamedMutexLockException);
+  BOOST_CHECK_THROW(doLock(), SocketLockException);
 
   // Wait on child thread
   future.get();
@@ -93,8 +79,6 @@ BOOST_AUTO_TEST_CASE(InterprocessMutexTestIntraprocess)
 // - The parent tries to acquire while the child has it -> it should fail
 BOOST_AUTO_TEST_CASE(InterprocessMutexTestInterprocess)
 {
-  cleanupFiles();
-
   pid_t pid = fork();
 
   if (pid == 0) {
@@ -103,7 +87,6 @@ BOOST_AUTO_TEST_CASE(InterprocessMutexTestInterprocess)
       CONSTRUCT_LOCK();
       std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
-    cleanupFiles();
     exit(0);
   } else if (pid > 0) {
     // Parent

test/TestParameters.cxx

@@ -26,22 +26,22 @@ BOOST_AUTO_TEST_CASE(ParametersConstructors)
   Parameters p;
   Parameters p2 = p;
   Parameters p3 = std::move(p2);
-  Parameters p4 = Parameters::makeParameters({ SERIAL_NUMBER, ENDPOINT_NUMBER }, CHANNEL_NUMBER); //TODO: Check makeParameters
+  Parameters p4 = Parameters::makeParameters(SerialId{ SERIAL_NUMBER, ENDPOINT_NUMBER }, CHANNEL_NUMBER); //TODO: Check makeParameters
 }
 
 BOOST_AUTO_TEST_CASE(ParametersPutGetTest)
 {
-  Parameters p = Parameters::makeParameters({ SERIAL_NUMBER, ENDPOINT_NUMBER }, CHANNEL_NUMBER)
+  Parameters p = Parameters::makeParameters(SerialId{ SERIAL_NUMBER, ENDPOINT_NUMBER }, CHANNEL_NUMBER)
                    .setDmaPageSize(DMA_PAGE_SIZE)
                    .setDataSource(DATA_SOURCE)
                    .setBufferParameters(buffer_parameters::File{ "/my/file.shm", 0 });
 
-  BOOST_REQUIRE(boost::get<int>(p.getCardId().get()) == SERIAL_NUMBER);
+  BOOST_REQUIRE(boost::get<SerialId>(p.getCardId().get()) == (SerialId{ SERIAL_NUMBER, ENDPOINT_NUMBER }));
   BOOST_REQUIRE(p.getChannelNumber().get_value_or(0) == CHANNEL_NUMBER);
   BOOST_REQUIRE(p.getDmaPageSize().get_value_or(0) == DMA_PAGE_SIZE);
   BOOST_REQUIRE(p.getDataSource().get_value_or(DataSource::Fee) == DATA_SOURCE);
 
-  BOOST_REQUIRE(boost::get<int>(p.getCardIdRequired()) == SERIAL_NUMBER);
+  BOOST_REQUIRE(boost::get<SerialId>(p.getCardIdRequired()) == (SerialId{ SERIAL_NUMBER, ENDPOINT_NUMBER }));
   BOOST_REQUIRE(p.getChannelNumberRequired() == CHANNEL_NUMBER);
   BOOST_REQUIRE(p.getDmaPageSizeRequired() == DMA_PAGE_SIZE);
   BOOST_REQUIRE(p.getDataSourceRequired() == DATA_SOURCE);
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(ParametersPutGetTest)
 
 BOOST_AUTO_TEST_CASE(ParametersThrowTest)
 {
-  auto p = Parameters::makeParameters({ SERIAL_NUMBER, ENDPOINT_NUMBER }, CHANNEL_NUMBER);
+  auto p = Parameters::makeParameters(SerialId{ SERIAL_NUMBER, ENDPOINT_NUMBER }, CHANNEL_NUMBER);
 }
 
 BOOST_AUTO_TEST_CASE(ParametersLinkMaskFromString)