[14631] External locators XML parsing tests by MiguelCompany · Pull Request #2902 · eProsima/Fast-DDS

MiguelCompany · 2022-08-03T12:16:56Z

Description

This PR adds tests related with the XML parsing of the external locators configuration.

Contributor Checklist

Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added.
N/A Any new/modified methods have been properly documented using Doxygen.
Fast DDS test suite has been run locally.
Changes are ABI compatible.
Changes are API compatible.
N/A Documentation builds and tests pass locally.
N/A New feature has been added to the versions.md file (if applicable).
N/A New feature has been documented/Current behavior is correctly described in the documentation.

Reviewer Checklist

Check contributor checklist is correct.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

…ests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

jsan-rt · 2022-08-04T10:01:43Z

test/unittest/xmlparser/XMLProfileParserTests.cpp

+            xmlparser::XMLP_ret::XML_ERROR
+        },
+        {
+            "participant_complete_wrong_loc_no_addr",


Similar to this test. What would happen if I set two <address> or <port> tags accidentally in my locator? Should it fail?

It should. I will add a test for it.

Done in fe7ce52

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

MiguelCompany · 2022-09-08T13:11:16Z

@jsantiago-eProsima This is ready for another review

jsan-rt · 2022-09-08T13:16:12Z

test/unittest/xmlparser/XMLProfileParserTests.cpp

Little typo: ignore

Fixed on d2141cc

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #14631. Use StrictMock for log_mock on XMLProfileParserTests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding basic structure for new test on XMLProfileParserTests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding participant positive cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding participant negative cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding data_writer positive cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding data_reader positive cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding external locators to XMLParserParticipant test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding external locators to XMLParserPublisher test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding external locators to XMLParserSubscriber test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631: apply review suggestion Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #14631. Added more negative cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Adding empty implementation for ExternalLocatorsProcessor (#2815) * Refs #15017. ExternalLocatorsProcessor declaration. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. ExternalLocatorsProcessor empty definitions. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Apply suggestions from code review. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Co-authored-by: Ricardo González <ricardo@richiware.dev> Co-authored-by: Ricardo González <ricardo@richiware.dev> * External locators XML parsing tests (#2902) * Refs #14631. Use StrictMock for log_mock on XMLProfileParserTests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding basic structure for new test on XMLProfileParserTests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding participant positive cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding participant negative cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding data_writer positive cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding data_reader positive cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding external locators to XMLParserParticipant test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding external locators to XMLParserPublisher test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding external locators to XMLParserSubscriber test. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631: apply review suggestion Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Refs #14631. Added more negative cases. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * Unit tests for ExternalLocatorsProcessor (#2974) * Refs #14631. Adding new empty test on unittest/rtps/network. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Add source files to CMakeLists.txt Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Add default_locators to mock of ParticipantProxyData. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Test for add_external_locators_participant. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Test for add_external_locators on reader and writer. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Additional participant tests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Additional endpoint tests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Add separation comments. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Fixed locators string format. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Fixed order of arguments in add_external_locators_participant. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Reduce number of loops. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Matching locators scenario. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Data structures representing the scenario. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Added test matching_locators_scenario. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Increased cases on matching_locators_scenario. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding test for filtering a LocatorSelectorEntry. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Adding test for IP mask matching behavior. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #14631. Uncrustify. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> * External locators implementation (#2822) * Refs #15017. Added mock for ExternalLocatorsProcessor. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Processing new fields on wire_protocol QoS. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Processing new fields on DataWriterQos. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Processing new fields on DataReaderQos. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Adding new elements to XSD. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Processing external locator list XML element. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. XML parsing update of BuiltinAttributes. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. XML parsing update of ParticipantAttributes. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. XML parsing update of PublisherAttributes and SubscriberAttributes. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Added participant interactions. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Added reader creation interactions. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Added writer creation interactions. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Filter locators of discovered participant. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Filter locators of discovered reader. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Filter locators of discovered writer. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Added implementation for ExternalLocatorsProcessor::add_external_locators. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Added implementation for ExternalLocatorsProcessor::set_listening_locators. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Implementations for ExternalLocatorsProcessor::filter_remote_locators delegate into internal function. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Add function to check if two addresses match. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Add function to check if two locators match. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Implement filtering algorithm by sorting and then discarding. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Setup external locators on builtin endpoints. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Avoid duplicated tags inside <rtps>. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Avoid duplicated tags inside <builtin>. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Avoid duplicated tags inside publisher profiles. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Avoid duplicated tags inside subscriber profiles. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15017. Avoid duplicated tags inside locator elements. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> * Refs #15745. Updated versions.md Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: Miguel Company <MiguelCompany@eprosima.com> Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com> Co-authored-by: Ricardo González <ricardo@richiware.dev> Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

MiguelCompany added 9 commits August 3, 2022 14:13

Refs #14631. Use StrictMock for log_mock on XMLProfileParserTests.

1cb7c7a

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Refs #14631. Adding basic structure for new test on XMLProfileParserT…

db20733

…ests. Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Refs #14631. Adding participant positive cases.

6c4e7c1

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Refs #14631. Adding participant negative cases.

9d8756b

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Refs #14631. Adding data_writer positive cases.

b5e5cfc

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Refs #14631. Adding data_reader positive cases.

bf68b53

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Refs #14631. Adding external locators to XMLParserParticipant test.

d8b6ac0

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Refs #14631. Adding external locators to XMLParserPublisher test.

48f7906

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

Refs #14631. Adding external locators to XMLParserSubscriber test.

b4071bb

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

MiguelCompany added no-test Skip CI tests if PR marked with this label no-aarch Skip build & test for aarch64 labels Aug 3, 2022

MiguelCompany added this to the v2.8.0 milestone Aug 3, 2022

MiguelCompany changed the title ~~External locators XML parsing tests~~ [14631] External locators XML parsing tests Aug 3, 2022

jsan-rt suggested changes Aug 4, 2022

View reviewed changes

Refs #14631: apply review suggestion

fe7ce52

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

jsan-rt suggested changes Sep 8, 2022

View reviewed changes

Refs #14631. Added more negative cases.

d2141cc

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

MiguelCompany force-pushed the feature/external-locators/tests/xml-parser branch from d3026b7 to d2141cc Compare September 8, 2022 13:27

jsan-rt approved these changes Sep 8, 2022

View reviewed changes

MiguelCompany merged this pull request into feature/external-locators/main Sep 8, 2022

MiguelCompany deleted the feature/external-locators/tests/xml-parser branch September 8, 2022 14:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[14631] External locators XML parsing tests#2902

[14631] External locators XML parsing tests#2902
MiguelCompany merged 11 commits intofeature/external-locators/mainfrom
feature/external-locators/tests/xml-parser

MiguelCompany commented Aug 3, 2022 •

edited

Loading

Uh oh!

jsan-rt Aug 4, 2022

Uh oh!

MiguelCompany Aug 4, 2022

Uh oh!

JLBuenoLopez Aug 17, 2022

Uh oh!

MiguelCompany commented Sep 8, 2022

Uh oh!

jsan-rt Sep 8, 2022

Uh oh!

MiguelCompany Sep 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

MiguelCompany commented Aug 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Contributor Checklist

Reviewer Checklist

Uh oh!

jsan-rt Aug 4, 2022

Choose a reason for hiding this comment

Uh oh!

MiguelCompany Aug 4, 2022

Choose a reason for hiding this comment

Uh oh!

JLBuenoLopez Aug 17, 2022

Choose a reason for hiding this comment

Uh oh!

MiguelCompany commented Sep 8, 2022

Uh oh!

jsan-rt Sep 8, 2022

Choose a reason for hiding this comment

Uh oh!

MiguelCompany Sep 8, 2022

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MiguelCompany commented Aug 3, 2022 •

edited

Loading