Skip to content

Commit

Permalink
Fix small review findings
Browse files Browse the repository at this point in the history
  • Loading branch information
elBoberido committed Jan 6, 2025
1 parent 03ad700 commit 820408d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ if(NOT iceoryx_platform_FOUND OR NOT iceoryx_hoofs_FOUND OR NOT iceoryx_posh_FOU
FetchContent_Declare(
iceoryx
GIT_REPOSITORY https://github.com/eclipse-iceoryx/iceoryx.git
# Recent commit used here to be able to use the CMake macros. Change this to v3.x once released.
GIT_TAG v2.95.3
)
FetchContent_GetProperties(iceoryx)
Expand Down
2 changes: 1 addition & 1 deletion source/iceoryx_dds/dds/fast_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ eprosima::fastdds::dds::Topic* iox::dds::FastContext::getTopic(const std::string
}
else
{
IOX_LOG(WARN, "[FastDataReader] Failed to find topic: " << topicName=;
IOX_LOG(WARN, "[FastDataReader] Failed to find topic: " << topicName);
}

topic = m_participant->create_topic(topicName, "Mempool::Chunk", eprosima::fastdds::dds::TOPIC_QOS_DEFAULT);
Expand Down
1 change: 0 additions & 1 deletion test/helpers/fixture_dds_gateway.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class DDSGatewayTestFixture : public Test
size_t m_mockIceoryxTerminalCursor = 0;
size_t m_mockDDSTerminalMarker = 0;

void SetUp() {};
void TearDown()
{
m_stagedMockIceoryxTerminal.clear();
Expand Down
22 changes: 16 additions & 6 deletions test/mocks/google_mocks.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ using ::testing::_;
class MockPublisher
{
public:
MockPublisher(const iox::capro::ServiceDescription&, const iox::popo::PublisherOptions&) {};
MockPublisher(const iox::capro::ServiceDescription&, const iox::popo::PublisherOptions&)
{
}
virtual ~MockPublisher() = default;
MOCK_CONST_METHOD0(getUid, iox::popo::uid_t());
MOCK_METHOD0(offer, void(void));
Expand All @@ -53,7 +55,9 @@ class MockPublisher
class MockSubscriber
{
public:
MockSubscriber(const iox::capro::ServiceDescription&, const iox::popo::SubscriberOptions&) {};
MockSubscriber(const iox::capro::ServiceDescription&, const iox::popo::SubscriberOptions&)
{
}
MOCK_CONST_METHOD0(getUid, iox::popo::uid_t());
MOCK_CONST_METHOD0(getServiceDescription, iox::capro::ServiceDescription());
MOCK_METHOD0(subscribe, void());
Expand All @@ -70,7 +74,9 @@ class MockSubscriber
class MockDataReader
{
public:
MockDataReader(const iox::capro::ServiceDescription&) {};
MockDataReader(const iox::capro::ServiceDescription&)
{
}
MOCK_METHOD0(connect, void(void));
MOCK_METHOD0(peekNextIoxChunkDatagramHeader, iox::optional<iox::dds::IoxChunkDatagramHeader>(void));
MOCK_METHOD3(takeNext,
Expand All @@ -85,7 +91,9 @@ class MockDataReader
class MockDataWriter
{
public:
MockDataWriter(const iox::capro::ServiceDescription&) {};
MockDataWriter(const iox::capro::ServiceDescription&)
{
}
MOCK_METHOD0(connect, void(void));
MOCK_METHOD3(write, bool(iox::dds::IoxChunkDatagramHeader, const uint8_t* const, const uint8_t* const));
MOCK_CONST_METHOD0(getServiceId, std::string(void));
Expand All @@ -97,8 +105,10 @@ template <typename channel_t, typename IceoryxPubSubOptions>
class MockGenericGateway
{
public:
MockGenericGateway() {};
MockGenericGateway(const iox::capro::Interfaces, iox::units::Duration, iox::units::Duration) {};
MockGenericGateway() = default;
MockGenericGateway(const iox::capro::Interfaces, iox::units::Duration, iox::units::Duration)
{
}
MOCK_METHOD2_T(addChannel,
iox::expected<channel_t, iox::gw::GatewayError>(const iox::capro::ServiceDescription&,
const IceoryxPubSubOptions&));
Expand Down

0 comments on commit 820408d

Please sign in to comment.