Skip to content

Commit 58b23b9

Browse files
committed
Uncrustify
Signed-off-by: Emilio Cuesta <emiliocuesta@eprosima.com>
1 parent 46d2976 commit 58b23b9

2 files changed

Lines changed: 26 additions & 23 deletions

File tree

ddsrouter_core/test/blackbox/ddsrouter_core/dds/local/DDSTestLocalInstances.cpp

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -96,22 +96,22 @@ DdsRouterConfiguration dds_test_dds_participants_config()
9696

9797
// Create XML string with default QoS profile
9898
std::string xml_config =
99-
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
100-
"<dds xmlns=\"http://www.eprosima.com/XMLSchemas/fastRTPS_Profiles\">"
101-
" <profiles>"
102-
" <participant profile_name=\"participant_domain_0\">"
103-
" <domainId>0</domainId>"
104-
" </participant>"
105-
" <participant profile_name=\"participant_domain_1\">"
106-
" <domainId>1</domainId>"
107-
" </participant>"
108-
" </profiles>"
109-
"</dds>";
99+
"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
100+
"<dds xmlns=\"http://www.eprosima.com/XMLSchemas/fastRTPS_Profiles\">"
101+
" <profiles>"
102+
" <participant profile_name=\"participant_domain_0\">"
103+
" <domainId>0</domainId>"
104+
" </participant>"
105+
" <participant profile_name=\"participant_domain_1\">"
106+
" <domainId>1</domainId>"
107+
" </participant>"
108+
" </profiles>"
109+
"</dds>";
110110

111111
// Load XML configuration into Fast DDS
112112
using namespace eprosima::fastdds::dds;
113113
if (RETCODE_OK != DomainParticipantFactory::get_instance()->load_XML_profiles_string(
114-
xml_config.c_str(), xml_config.length()))
114+
xml_config.c_str(), xml_config.length()))
115115
{
116116
throw std::runtime_error("Failed to load XML profiles");
117117
}
@@ -227,7 +227,6 @@ void test_local_communication_key_dispose(
227227
router.stop();
228228
}
229229

230-
231230
/**
232231
* Test communication between two DDS Participants hosted in the same device, but which are at different DDS domains.
233232
* This is accomplished by using a DDS Router instance with a Simple Participant deployed at each domain.
@@ -652,8 +651,10 @@ void test_local_communication_lease_duration_triggers_not_alive_no_writers(
652651

653652
eprosima::fastdds::dds::DomainParticipantQos pqos = eprosima::fastdds::dds::DomainParticipantQos();
654653
// Lowering lease duration to trigger not alive no writers faster in the subscriber
655-
pqos.wire_protocol().builtin.discovery_config.leaseDuration = Duration_t(pub_lease_duration_seconds, pub_lease_duration_nanoseconds);
656-
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(pub_lease_duration_seconds, pub_lease_duration_nanoseconds-1);
654+
pqos.wire_protocol().builtin.discovery_config.leaseDuration = Duration_t(pub_lease_duration_seconds,
655+
pub_lease_duration_nanoseconds);
656+
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod =
657+
Duration_t(pub_lease_duration_seconds, pub_lease_duration_nanoseconds - 1);
657658
eprosima::fastdds::dds::DataWriterQos wqos = eprosima::fastdds::dds::DataWriterQos();
658659
// Necessary to receive only an unregister and not a dispose, forcing transition to not_alive_no_writers
659660
wqos.writer_data_lifecycle().autodispose_unregistered_instances = false;
@@ -731,8 +732,10 @@ void test_local_communication_dead_writer_triggers_not_alive_no_writers(
731732

732733
eprosima::fastdds::dds::DomainParticipantQos pqos = eprosima::fastdds::dds::DomainParticipantQos();
733734
// Lowering lease duration to trigger not alive no writers faster in the subscriber
734-
pqos.wire_protocol().builtin.discovery_config.leaseDuration = Duration_t(pub_lease_duration_seconds, pub_lease_duration_nanoseconds);
735-
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod = Duration_t(pub_lease_duration_seconds, pub_lease_duration_nanoseconds-1);
735+
pqos.wire_protocol().builtin.discovery_config.leaseDuration = Duration_t(pub_lease_duration_seconds,
736+
pub_lease_duration_nanoseconds);
737+
pqos.wire_protocol().builtin.discovery_config.leaseDuration_announcementperiod =
738+
Duration_t(pub_lease_duration_seconds, pub_lease_duration_nanoseconds - 1);
736739
eprosima::fastdds::dds::DataWriterQos wqos = eprosima::fastdds::dds::DataWriterQos();
737740
// Necessary to receive only an unregister and not a dispose, forcing transition to not_alive_no_writers
738741
wqos.writer_data_lifecycle().autodispose_unregistered_instances = false;
@@ -816,7 +819,7 @@ TEST(DDSTestLocalInstances, end_to_end_local_communication_not_alive_no_writers_
816819
// Router lease duration is default
817820
int writer_lease_duration_ns = 500000000; // 0.5 seconds
818821
test::test_local_communication_dead_writer_triggers_not_alive_no_writers(
819-
test::dds_test_dds_participants_config(), writer_lease_duration_ns);
822+
test::dds_test_dds_participants_config(), writer_lease_duration_ns);
820823
}
821824

822825
int main(

ddsrouter_core/test/blackbox/ddsrouter_core/dds/types/test_participants.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class HelloWorldKeyedZeroSizePayloadPubSubType : public HelloWorldKeyedPubSubTyp
7676
* Class used to group into a single working unit a Publisher with a DataWriter and a TypeSupport member corresponding
7777
* to the HelloWorld datatype
7878
*/
79-
template <class MsgStruct>
79+
template<class MsgStruct>
8080
class TestPublisher
8181
{
8282
public:
@@ -340,7 +340,7 @@ class TestPublisher
340340
listener_;
341341
};
342342

343-
template <>
343+
template<>
344344
eprosima::fastdds::dds::ReturnCode_t TestPublisher<HelloWorldKeyed>::publish(
345345
HelloWorldKeyed msg)
346346
{
@@ -350,15 +350,15 @@ eprosima::fastdds::dds::ReturnCode_t TestPublisher<HelloWorldKeyed>::publish(
350350
return writer_->write(&hello_);
351351
}
352352

353-
template <>
353+
template<>
354354
eprosima::fastdds::dds::ReturnCode_t TestPublisher<HelloWorldKeyed>::dispose_key(
355355
HelloWorldKeyed msg)
356356
{
357357
hello_.id(msg.id());
358358
return writer_->dispose(&hello_, eprosima::fastdds::dds::HANDLE_NIL);
359359
}
360360

361-
template <>
361+
template<>
362362
eprosima::fastdds::dds::ReturnCode_t TestPublisher<HelloWorldKeyed>::unregister_key(
363363
HelloWorldKeyed msg)
364364
{
@@ -370,7 +370,7 @@ eprosima::fastdds::dds::ReturnCode_t TestPublisher<HelloWorldKeyed>::unregister_
370370
* Class used to group into a single working unit a Subscriber with a DataReader, its listener, and a TypeSupport member
371371
* corresponding to the HelloWorld datatype
372372
*/
373-
template <class MsgStruct>
373+
template<class MsgStruct>
374374
class TestSubscriber
375375
{
376376
public:

0 commit comments

Comments
 (0)