Merge pull request #57 from elfenpiff/iox-#56-fixing-CMqInterface-tests

iox-#56 removed move assignment and ctor

Author: elfenpiff

iceoryx_posh/include/iceoryx_posh/internal/runtime/message_queue_interface.hpp

@@ -188,13 +188,13 @@ class MqBase
     // TODO: unique identifier problem, multiple MqBase objects with the
     //        same InterfaceName are using the same message queue
     MqBase(const std::string& InterfaceName, const long maxMessages, const long messageSize) noexcept;
-
-    MqBase(const MqBase&) = delete;
-    MqBase(MqBase&&) = default;
     virtual ~MqBase() = default;
 
+    /// @brief delete copy and move ctor and assignment since they are not needed
+    MqBase(const MqBase&) = delete;
+    MqBase(MqBase&&) = delete;
     MqBase& operator=(const MqBase&) = delete;
-    MqBase& operator=(MqBase&&) = default;
+    MqBase& operator=(MqBase&&) = delete;
 
     /// @brief Set the content of answer from buffer.
     /// @param[in] buffer Raw message as char pointer
@@ -257,11 +257,9 @@ class MqInterfaceUser : public MqBase
     MqInterfaceUser(const MqInterfaceUser&) = delete;
     MqInterfaceUser& operator=(const MqInterfaceUser&) = delete;
 
-    /// @brief Since this object manages a system resource (message queue)
-    ///         only the move constructor and assignment operator is
-    ///         defined.
-    MqInterfaceUser(MqInterfaceUser&&) = default;
-    MqInterfaceUser& operator=(MqInterfaceUser&&) = default;
+    /// @brief Not needed therefore deleted
+    MqInterfaceUser(MqInterfaceUser&&) = delete;
+    MqInterfaceUser& operator=(MqInterfaceUser&&) = delete;
 };
 
 /// @brief Class for handling a message queue via mq_open and mq_unlink
@@ -291,11 +289,9 @@ class MqInterfaceCreator : public MqBase
     MqInterfaceCreator(const MqInterfaceCreator&) = delete;
     MqInterfaceCreator& operator=(const MqInterfaceCreator&) = delete;
 
-    /// @brief Since this object manages a system resource (message queue)
-    ///         only the move constructor and assignment operator is
-    ///         defined.
-    MqInterfaceCreator(MqInterfaceCreator&&) = default;
-    MqInterfaceCreator& operator=(MqInterfaceCreator&&) = default;
+    /// @brief Not needed therefore deleted
+    MqInterfaceCreator(MqInterfaceCreator&&) = delete;
+    MqInterfaceCreator& operator=(MqInterfaceCreator&&) = delete;
 
   private:
     friend class MqRuntimeInterface;
@@ -312,12 +308,13 @@ class MqRuntimeInterface
     MqRuntimeInterface(const std::string& roudiName,
                        const std::string& appName,
                        const units::Duration roudiWaitingTimeout) noexcept;
+    ~MqRuntimeInterface() = default;
 
+    /// @brief Not needed therefore deleted
     MqRuntimeInterface(const MqRuntimeInterface&) = delete;
     MqRuntimeInterface& operator=(const MqRuntimeInterface&) = delete;
-    MqRuntimeInterface(MqRuntimeInterface&&) = default;
-    MqRuntimeInterface& operator=(MqRuntimeInterface&&) = default;
-    ~MqRuntimeInterface() = default;
+    MqRuntimeInterface(MqRuntimeInterface&&) = delete;
+    MqRuntimeInterface& operator=(MqRuntimeInterface&&) = delete;
 
     /// @brief sends the keep alive trigger to the RouDi daemon
     /// @return true if sending was successful, false if not

iceoryx_posh/test/moduletests/test_mq_interface.cpp

@@ -115,7 +115,7 @@ void CMqInterface_TimedReceive(T& base)
     MqMessage result;
 
     char msg1[] = "msg1,msg2,";
-    char invalidMsg2[] = "msg1,msg2";   
+    char invalidMsg2[] = "msg1,msg2";
 
     // clock_gettime fails, return false
     EXPECT_CALL(*time_MOCK::mock, clock_gettime(_, _)).WillOnce(Return(-1)).WillOnce(Return(0));
@@ -203,7 +203,7 @@ void CMqInterface_GetInterfaceName(T& base)
 }
 
 template <typename T>
-void CMqInterface_IsInitialized(T& base[[gnu::unused]])
+void CMqInterface_IsInitialized(T& base [[gnu::unused]])
 {
     // TODO: add correct mock settings with return
     EXPECT_THAT(base.isInitialized(), Eq(true));
@@ -227,29 +227,6 @@ void CMqInterface_StringCTor()
     EXPECT_THAT(base.getInterfaceName(), Eq(ifName));
 }
 
-template <typename T>
-void CMqInterface_MoveCTor()
-{
-    T* base = new T(ifName, maxMessages, messageSize);
-    CMqInterface_Open(*base);
-    T destination(std::move(*base));
-    delete base;
-
-    CMqInterface_RunAllMqBaseTests(destination);
-}
-
-template <typename T>
-void CMqInterface_MoveOperator()
-{
-    T* base = new T(ifName, maxMessages, messageSize);
-    CMqInterface_Open(*base);
-    T destination("/crap", maxMessages, messageSize);
-    destination = std::move(*base);
-    delete base;
-
-    CMqInterface_RunAllMqBaseTests(destination);
-}
-
 ////////////////////////////////
 // UnitTests: MqBase
 ////////////////////////////////
@@ -259,16 +236,6 @@ TEST_F(CMqInterface_test, MqBase_StringCTor)
     CMqInterface_StringCTor<MqBase>();
 }
 
-TEST_F(CMqInterface_test, MqBase_MoveCTor)
-{
-    CMqInterface_MoveCTor<MqBase>();
-}
-
-TEST_F(CMqInterface_test, MqBase_MoveOperator)
-{
-    CMqInterface_MoveOperator<MqBase>();
-}
-
 TEST_F(CMqInterface_test, MqBase_Receive)
 {
     MqBase base(ifName, maxMessages, messageSize);
@@ -320,16 +287,6 @@ TEST_F(CMqInterface_test, MqInterfaceUser_StringCTor)
     CMqInterface_StringCTor<MqInterfaceUser>();
 }
 
-TEST_F(CMqInterface_test, MqInterfaceUser_MoveCTor)
-{
-    CMqInterface_MoveCTor<MqInterfaceUser>();
-}
-
-TEST_F(CMqInterface_test, MqInterfaceUser_MoveOperator)
-{
-    CMqInterface_MoveOperator<MqInterfaceUser>();
-}
-
 TEST_F(CMqInterface_test, MqInterfaceUser_Receive)
 {
     MqInterfaceUser base(ifName);
@@ -381,16 +338,6 @@ TEST_F(CMqInterface_test, MqInterfaceCreator_StringCTor)
     CMqInterface_StringCTor<MqInterfaceCreator>();
 }
 
-TEST_F(CMqInterface_test, MqInterfaceCreator_MoveCTor)
-{
-    CMqInterface_MoveCTor<MqInterfaceCreator>();
-}
-
-TEST_F(CMqInterface_test, MqInterfaceCreator_MoveOperator)
-{
-    CMqInterface_MoveOperator<MqInterfaceCreator>();
-}
-
 TEST_F(CMqInterface_test, MqInterfaceCreator_Receive)
 {
     MqInterfaceCreator base(ifName);
@@ -432,4 +379,4 @@ TEST_F(CMqInterface_test, MqInterfaceCreator_IsInitialized)
     CMqInterface_Open(base);
     CMqInterface_IsInitialized<MqInterfaceCreator>(base);
 }
-#endif
+#endif