iox-eclipse-iceoryx#27-1: fixing C API tests

Signed-off-by: Poehnl Michael (CC-AD/ESW1) <[email protected]>

Author: Poehnl Michael (CC-AD/ESW1)

iceoryx_binding_c/test/integrationtests/test_publisher.cpp

@@ -69,7 +69,7 @@ class c_iox_pub_test : public Test
         PublisherPortUser userPort(ptr);
         PublisherPortRouDi roudiPort(ptr);
 
-        roudiPort.getCaProMessage();
+        roudiPort.tryGetCaProMessage();
         iox::capro::CaproMessage caproMessage(iox::capro::CaproMessageType::SUB,
                                               iox::capro::ServiceDescription("a", "b", "c"));
         caproMessage.m_chunkQueueData = &m_chunkQueueData;
@@ -106,7 +106,7 @@ class c_iox_pub_test : public Test
 
     // publisher port w/ history
     PublisherPortData m_publisherPortDataHistory{
-        capro::ServiceDescription("x", "y", "z"), "myApp", &m_memoryManager, MAX_HISTORY_CAPACITY_OF_CHUNK_DISTRIBUTOR};
+        capro::ServiceDescription("x", "y", "z"), "myApp", &m_memoryManager, IOX_MAX_PUBLISHER_HISTORY};
 };
 
 TEST_F(c_iox_pub_test, initialStateIsNotOffered)
@@ -222,7 +222,7 @@ TEST_F(c_iox_pub_test, sendDeliversChunk)
     iox_pub_send_chunk(&m_publisherPortData, chunk);
 
     iox::popo::ChunkQueuePopper<ChunkQueueData_t> m_chunkQueuePopper(&m_chunkQueueData);
-    auto maybeSharedChunk = m_chunkQueuePopper.pop();
+    auto maybeSharedChunk = m_chunkQueuePopper.tryPop();
 
     ASSERT_TRUE(maybeSharedChunk.has_value());
     EXPECT_TRUE(*maybeSharedChunk == chunk);

iceoryx_binding_c/test/integrationtests/test_subscriber.cpp

@@ -94,7 +94,7 @@ TEST_F(c_iox_sub_test, offerLeadsToSubscibeRequestedState)
     uint64_t queueCapacity = 1u;
     iox_sub_subscribe(&m_portPtr, queueCapacity);
 
-    SubscriberPortSingleProducer(&m_portPtr).getCaProMessage();
+    SubscriberPortSingleProducer(&m_portPtr).tryGetCaProMessage();
 
     EXPECT_EQ(iox_sub_get_subscription_state(&m_portPtr), SubscribeState_SUBSCRIBE_REQUESTED);
 }
@@ -104,7 +104,7 @@ TEST_F(c_iox_sub_test, NACKResponseLeadsToSubscribeWaitForOfferState)
     uint64_t queueCapacity = 1u;
     iox_sub_subscribe(&m_portPtr, queueCapacity);
 
-    SubscriberPortSingleProducer(&m_portPtr).getCaProMessage();
+    SubscriberPortSingleProducer(&m_portPtr).tryGetCaProMessage();
     iox::capro::CaproMessage caproMessage(iox::capro::CaproMessageType::NACK, TEST_SERVICE_DESCRIPTION);
     SubscriberPortSingleProducer(&m_portPtr).dispatchCaProMessage(caproMessage);
 
@@ -116,7 +116,7 @@ TEST_F(c_iox_sub_test, ACKResponseLeadsToSubscribedState)
     uint64_t queueCapacity = 1u;
     iox_sub_subscribe(&m_portPtr, queueCapacity);
 
-    SubscriberPortSingleProducer(&m_portPtr).getCaProMessage();
+    SubscriberPortSingleProducer(&m_portPtr).tryGetCaProMessage();
     iox::capro::CaproMessage caproMessage(iox::capro::CaproMessageType::ACK, TEST_SERVICE_DESCRIPTION);
     SubscriberPortSingleProducer(&m_portPtr).dispatchCaProMessage(caproMessage);
 
@@ -128,13 +128,13 @@ TEST_F(c_iox_sub_test, UnsubscribeLeadsToUnscribeRequestedState)
     uint64_t queueCapacity = 1u;
     iox_sub_subscribe(&m_portPtr, queueCapacity);
 
-    SubscriberPortSingleProducer(&m_portPtr).getCaProMessage();
+    SubscriberPortSingleProducer(&m_portPtr).tryGetCaProMessage();
     iox::capro::CaproMessage caproMessage(iox::capro::CaproMessageType::ACK, TEST_SERVICE_DESCRIPTION);
     SubscriberPortSingleProducer(&m_portPtr).dispatchCaProMessage(caproMessage);
 
     iox_sub_unsubscribe(&m_portPtr);
 
-    SubscriberPortSingleProducer(&m_portPtr).getCaProMessage();
+    SubscriberPortSingleProducer(&m_portPtr).tryGetCaProMessage();
 
     EXPECT_EQ(iox_sub_get_subscription_state(&m_portPtr), SubscribeState_UNSUBSCRIBE_REQUESTED);
 }
@@ -148,7 +148,7 @@ TEST_F(c_iox_sub_test, initialStateNoChunksAvailable)
 TEST_F(c_iox_sub_test, receiveChunkWhenThereIsOne)
 {
     this->Subscribe(&m_portPtr);
-    m_chunkPusher.push(m_memoryManager.getChunk(100));
+    m_chunkPusher.tryPush(m_memoryManager.getChunk(100));
 
     const void* chunk = nullptr;
     EXPECT_EQ(iox_sub_get_chunk(&m_portPtr, &chunk), ChunkReceiveResult_SUCCESS);
@@ -164,7 +164,7 @@ TEST_F(c_iox_sub_test, DISABLED_receiveChunkWithContent)
 
     auto sharedChunk = m_memoryManager.getChunk(100);
     static_cast<data_t*>(sharedChunk.getPayload())->value = 1234;
-    m_chunkPusher.push(m_memoryManager.getChunk(100));
+    m_chunkPusher.tryPush(m_memoryManager.getChunk(100));
 
     const void* chunk = nullptr;
 
@@ -176,20 +176,20 @@ TEST_F(c_iox_sub_test, receiveChunkWhenToManyChunksAreHold)
 {
     this->Subscribe(&m_portPtr);
     const void* chunk = nullptr;
-    for (uint64_t i = 0; i < MAX_CHUNKS_HELD_PER_RECEIVER + 1; ++i)
+    for (uint64_t i = 0; i < IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY + 1; ++i)
     {
-        m_chunkPusher.push(m_memoryManager.getChunk(100));
+        m_chunkPusher.tryPush(m_memoryManager.getChunk(100));
         iox_sub_get_chunk(&m_portPtr, &chunk);
     }
 
-    m_chunkPusher.push(m_memoryManager.getChunk(100));
+    m_chunkPusher.tryPush(m_memoryManager.getChunk(100));
     EXPECT_EQ(iox_sub_get_chunk(&m_portPtr, &chunk), ChunkReceiveResult_TOO_MANY_CHUNKS_HELD_IN_PARALLEL);
 }
 
 TEST_F(c_iox_sub_test, releaseChunkWorks)
 {
     this->Subscribe(&m_portPtr);
-    m_chunkPusher.push(m_memoryManager.getChunk(100));
+    m_chunkPusher.tryPush(m_memoryManager.getChunk(100));
 
     const void* chunk = nullptr;
     iox_sub_get_chunk(&m_portPtr, &chunk);
@@ -202,12 +202,12 @@ TEST_F(c_iox_sub_test, releaseChunkWorks)
 TEST_F(c_iox_sub_test, releaseChunkQueuedChunksWorks)
 {
     this->Subscribe(&m_portPtr);
-    for (uint64_t i = 0; i < MAX_CHUNKS_HELD_PER_RECEIVER; ++i)
+    for (uint64_t i = 0; i < IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY; ++i)
     {
-        m_chunkPusher.push(m_memoryManager.getChunk(100));
+        m_chunkPusher.tryPush(m_memoryManager.getChunk(100));
     }
 
-    EXPECT_THAT(m_memoryManager.getMemPoolInfo(0).m_usedChunks, Eq(MAX_CHUNKS_HELD_PER_RECEIVER));
+    EXPECT_THAT(m_memoryManager.getMemPoolInfo(0).m_usedChunks, Eq(IOX_MAX_CHUNKS_HELD_PER_SUBSCRIBER_SIMULTANEOUSLY));
     iox_sub_release_queued_chunks(&m_portPtr);
     EXPECT_THAT(m_memoryManager.getMemPoolInfo(0).m_usedChunks, Eq(0u));
 }
@@ -220,7 +220,7 @@ TEST_F(c_iox_sub_test, initialStateHasNewChunksFalse)
 TEST_F(c_iox_sub_test, receivingChunkLeadsToHasNewChunksTrue)
 {
     this->Subscribe(&m_portPtr);
-    m_chunkPusher.push(m_memoryManager.getChunk(100));
+    m_chunkPusher.tryPush(m_memoryManager.getChunk(100));
 
     EXPECT_TRUE(iox_sub_has_new_chunks(&m_portPtr));
 }
@@ -235,7 +235,7 @@ TEST_F(c_iox_sub_test, sendingTooMuchLeadsToLostChunks)
     this->Subscribe(&m_portPtr);
     for (uint64_t i = 0; i < DefaultChunkQueueConfig::MAX_QUEUE_CAPACITY + 1; ++i)
     {
-        m_chunkPusher.push(m_memoryManager.getChunk(100));
+        m_chunkPusher.tryPush(m_memoryManager.getChunk(100));
     }
 
     EXPECT_TRUE(iox_sub_has_lost_chunks(&m_portPtr));

iceoryx_posh/include/iceoryx_posh/internal/popo/ports/client_server_port_types.hpp

@@ -109,7 +109,7 @@ class RequestHeader
 class ResponseHeader
 {
   public:
-    ResponseHeader(cxx::not_null<ClientChunkQueueData_t* const> chunkQueueDataPtr, int64_t sequenceNumber) noexcept
+    ResponseHeader(cxx::not_null<ClientChunkQueueData_t* const> chunkQueueDataPtr, const int64_t sequenceNumber) noexcept
         : m_sequenceNumber(sequenceNumber)
         , m_destinationQueue(chunkQueueDataPtr)
     {