Skip to content

Commit

Permalink
Fixes after rebase
Browse files Browse the repository at this point in the history 
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
  • Loading branch information
@JLBuenoLopez
JLBuenoLopez committed Feb 15, 2024
1 parent 40aa832 commit af01e15
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
14 changes: 7 additions & 7 deletions test/unittest/dds/participant/ParticipantTests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3788,7 +3788,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport)
};
EXPECT_TRUE(transport_check(attributes_));
EXPECT_FALSE(attributes_.useBuiltinTransports);
EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
EXPECT_EQ(RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
}

{
Expand Down Expand Up @@ -3816,7 +3816,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport)
};
EXPECT_TRUE(transport_check(attributes_));
EXPECT_FALSE(attributes_.useBuiltinTransports);
EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
EXPECT_EQ(RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
}

{
Expand Down Expand Up @@ -3844,7 +3844,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport)
};
EXPECT_TRUE(transport_check(attributes_));
EXPECT_FALSE(attributes_.useBuiltinTransports);
EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
EXPECT_EQ(RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
}

{
Expand Down Expand Up @@ -3872,7 +3872,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport)
};
EXPECT_TRUE(transport_check(attributes_));
EXPECT_FALSE(attributes_.useBuiltinTransports);
EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
EXPECT_EQ(RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
}

{
Expand Down Expand Up @@ -3900,7 +3900,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport)
};
EXPECT_TRUE(transport_check(attributes_));
EXPECT_FALSE(attributes_.useBuiltinTransports);
EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
EXPECT_EQ(RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
}

{
Expand Down Expand Up @@ -3942,7 +3942,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport)
};
EXPECT_TRUE(transport_check(attributes_));
EXPECT_FALSE(attributes_.useBuiltinTransports);
EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
EXPECT_EQ(RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
}

{
Expand Down Expand Up @@ -3984,7 +3984,7 @@ TEST(ParticipantTests, ParticipantCreationWithBuiltinTransport)
};
EXPECT_TRUE(transport_check(attributes_));
EXPECT_FALSE(attributes_.useBuiltinTransports);
EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
EXPECT_EQ(RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant_));
}
}

Expand Down
1 change: 1 addition & 0 deletions test/unittest/dynamic_types/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ set(DYNAMIC_TYPES_TEST_SOURCE
${DYNAMIC_TYPES_ADDITIONAL_SOURCE}
${PROJECT_SOURCE_DIR}/src/cpp/fastdds/publisher/qos/WriterQos.cpp
${PROJECT_SOURCE_DIR}/src/cpp/fastdds/subscriber/qos/ReaderQos.cpp
${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp
${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp
${PROJECT_SOURCE_DIR}/src/cpp/rtps/flowcontrol/FlowControllerConsts.cpp
${PROJECT_SOURCE_DIR}/src/cpp/rtps/flowcontrol/ThroughputControllerDescriptor.cpp
Expand Down
10 changes: 6 additions & 4 deletions test/unittest/transport/TCPv4Tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ TEST_F(TCPv4Tests, secure_non_blocking_send)
senderDescriptor.tls_config.add_option(TLSOptions::SINGLE_DH_USE);
senderDescriptor.tls_config.add_option(TLSOptions::NO_SSLV2);
senderDescriptor.tls_config.add_option(TLSOptions::NO_COMPRESSION);
MockTCPv4Transport senderTransportUnderTest(senderDescriptor);
eprosima::fastdds::rtps::MockTCPv4Transport senderTransportUnderTest(senderDescriptor);
eprosima::fastrtps::rtps::RTPSParticipantAttributes att;
att.properties.properties().emplace_back("fastdds.tcp_transport.non_blocking_send", "true");
senderTransportUnderTest.init(&att.properties);
Expand Down Expand Up @@ -1481,7 +1481,8 @@ TEST_F(TCPv4Tests, secure_non_blocking_send)
auto sender_unbound_channel_resources = senderTransportUnderTest.get_unbound_channel_resources();
ASSERT_TRUE(sender_unbound_channel_resources.size() == 1);
auto sender_channel_resource =
std::static_pointer_cast<TCPChannelResourceBasic>(sender_unbound_channel_resources[0]);
std::static_pointer_cast<eprosima::fastdds::rtps::TCPChannelResourceBasic>(
sender_unbound_channel_resources[0]);

// Prepare the message
asio::error_code ec;
Expand Down Expand Up @@ -1943,7 +1944,7 @@ TEST_F(TCPv4Tests, non_blocking_send)
TCPv4TransportDescriptor senderDescriptor;
senderDescriptor.add_listener_port(port);
senderDescriptor.sendBufferSize = msg_size;
MockTCPv4Transport senderTransportUnderTest(senderDescriptor);
eprosima::fastdds::rtps::MockTCPv4Transport senderTransportUnderTest(senderDescriptor);
eprosima::fastrtps::rtps::RTPSParticipantAttributes att;
att.properties.properties().emplace_back("fastdds.tcp_transport.non_blocking_send", "true");
senderTransportUnderTest.init(&att.properties);
Expand Down Expand Up @@ -1996,7 +1997,8 @@ TEST_F(TCPv4Tests, non_blocking_send)
auto sender_unbound_channel_resources = senderTransportUnderTest.get_unbound_channel_resources();
ASSERT_TRUE(sender_unbound_channel_resources.size() == 1);
auto sender_channel_resource =
std::static_pointer_cast<TCPChannelResourceBasic>(sender_unbound_channel_resources[0]);
std::static_pointer_cast<eprosima::fastdds::rtps::TCPChannelResourceBasic>(
sender_unbound_channel_resources[0]);

// Prepare the message
asio::error_code ec;
Expand Down

0 comments on commit af01e15

Please sign in to comment.