From 98d7de90dbff1c7d6f23187f2e4263a23faaff1b Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Wed, 26 Apr 2023 09:01:36 +0200 Subject: [PATCH] Refs #18273: Refactor enum EntityKind::DOMAIN with DOMAIN_ENTITY Signed-off-by: Mario Dominguez --- docs/rst/exports/alias.include | 2 +- .../types/types.hpp | 2 +- src/cpp/database/database.cpp | 32 ++++----- src/cpp/database/entities.hpp | 2 +- test/dds/communication/Monitor.cpp | 28 ++++---- test/unittest/Database/DatabaseClearTests.cpp | 4 +- test/unittest/Database/DatabaseEraseTests.cpp | 4 +- .../Database/DatabaseGetEntitiesTest.cpp | 42 ++++++------ test/unittest/Database/DatabaseTests.cpp | 8 +-- .../StatisticsBackend/BackendDumpTests.cpp | 10 +-- .../CallingUserListenersTests.cpp | 2 +- .../StatisticsBackend/ClearDataTests.cpp | 4 +- .../StatisticsBackendTests.cpp | 44 ++++++------- .../StatisticsParticipantListenerTests.cpp | 66 +++++++++---------- test/unittest/TestUtils/DatabaseUtils.hpp | 2 +- 15 files changed, 126 insertions(+), 126 deletions(-) diff --git a/docs/rst/exports/alias.include b/docs/rst/exports/alias.include index c17f8fd7d..c0f3733d8 100644 --- a/docs/rst/exports/alias.include +++ b/docs/rst/exports/alias.include @@ -75,7 +75,7 @@ .. |HOST-api| replace:: :cpp:enumerator:`HOST` .. |USER-api| replace:: :cpp:enumerator:`USER` .. |PROCESS-api| replace:: :cpp:enumerator:`PROCESS` -.. |DOMAIN-api| replace:: :cpp:enumerator:`DOMAIN` +.. |DOMAIN-api| replace:: :cpp:enumerator:`DOMAIN` .. |TOPIC-api| replace:: :cpp:enumerator:`TOPIC` .. |PARTICIPANT-api| replace:: :cpp:enumerator:`PARTICIPANT` .. |DATAWRITER-api| replace:: :cpp:enumerator:`DATAWRITER` diff --git a/include/fastdds_statistics_backend/types/types.hpp b/include/fastdds_statistics_backend/types/types.hpp index d835ae32a..4d198a982 100644 --- a/include/fastdds_statistics_backend/types/types.hpp +++ b/include/fastdds_statistics_backend/types/types.hpp @@ -121,7 +121,7 @@ enum class EntityKind PROCESS, /// Abstract DDS network by Domain or by Discovery Server - DOMAIN, + DOMAIN_ENTITY, /// DDS Topic TOPIC, diff --git a/src/cpp/database/database.cpp b/src/cpp/database/database.cpp index 74433ce01..8160f0ed3 100644 --- a/src/cpp/database/database.cpp +++ b/src/cpp/database/database.cpp @@ -285,7 +285,7 @@ void Database::insert_nts( process->user->processes[process->id] = process; break; } - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: { std::shared_ptr domain = std::static_pointer_cast(entity); @@ -1436,7 +1436,7 @@ std::vector> Database::get_entities_by_name( } break; } - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: { for (const auto& domain_it : domains_) { @@ -1528,7 +1528,7 @@ void Database::erase( // Check that the given domain_id corresponds to a known monitor. // Upper layer ensures that the monitor has been stopped. // Upper layer also ensures that the monitor_id is valid and corresponds to a known domain. - if (EntityKind::DOMAIN != get_entity_kind(domain_id)) + if (EntityKind::DOMAIN_ENTITY != get_entity_kind(domain_id)) { throw BadParameter("Incorrect EntityKind"); } @@ -2200,7 +2200,7 @@ const std::vector> Database::get_entities( case EntityKind::PROCESS: map_to_vector(processes_, entities); break; - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: map_to_vector(domains_, entities); break; case EntityKind::TOPIC: @@ -2241,7 +2241,7 @@ const std::vector> Database::get_entities( } break; case EntityKind::PROCESS: - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: case EntityKind::PARTICIPANT: case EntityKind::TOPIC: case EntityKind::DATAREADER: @@ -2275,7 +2275,7 @@ const std::vector> Database::get_entities( entities.push_back(process.second); } break; - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: case EntityKind::PARTICIPANT: case EntityKind::TOPIC: case EntityKind::DATAREADER: @@ -2315,7 +2315,7 @@ const std::vector> Database::get_entities( entities.push_back(participant.second); } break; - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: case EntityKind::TOPIC: case EntityKind::DATAREADER: case EntityKind::DATAWRITER: @@ -2331,12 +2331,12 @@ const std::vector> Database::get_entities( } break; } - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: { const std::shared_ptr& domain = std::dynamic_pointer_cast(origin); switch (entity_kind) { - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: entities.push_back(domain); break; case EntityKind::PARTICIPANT: @@ -2392,7 +2392,7 @@ const std::vector> Database::get_entities( entities.push_back(participant->process); } break; - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: entities.push_back(participant->domain); break; case EntityKind::PARTICIPANT: @@ -2433,7 +2433,7 @@ const std::vector> Database::get_entities( const std::shared_ptr& topic = std::dynamic_pointer_cast(origin); switch (entity_kind) { - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: entities.push_back(topic->domain); break; case EntityKind::TOPIC: @@ -2501,7 +2501,7 @@ const std::vector> Database::get_entities( case EntityKind::HOST: case EntityKind::USER: case EntityKind::PROCESS: - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: { auto sub_entities = get_entities(entity_kind, writer->participant); entities.insert(entities.end(), sub_entities.begin(), sub_entities.end()); @@ -2541,7 +2541,7 @@ const std::vector> Database::get_entities( case EntityKind::HOST: case EntityKind::USER: case EntityKind::PROCESS: - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: { auto sub_entities = get_entities(entity_kind, reader->participant); entities.insert(entities.end(), sub_entities.begin(), sub_entities.end()); @@ -2577,7 +2577,7 @@ const std::vector> Database::get_entities( case EntityKind::PROCESS: case EntityKind::PARTICIPANT: case EntityKind::TOPIC: - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: for (const auto& writer : locator->data_writers) { auto sub_entities = get_entities(entity_kind, writer.second); @@ -4731,7 +4731,7 @@ void Database::change_entity_status_of_kind( } break; } - case EntityKind::DOMAIN: + case EntityKind::DOMAIN_ENTITY: { std::shared_ptr domain; @@ -5004,7 +5004,7 @@ void Database::change_entity_status( // Check that the entity is a discovered/undiscovered dds_entity or a started/stopped monitor assert( entity_kind == EntityKind::PARTICIPANT || entity_kind == EntityKind::DATAWRITER || - entity_kind == EntityKind::DATAREADER || entity_kind == EntityKind::DOMAIN); + entity_kind == EntityKind::DATAREADER || entity_kind == EntityKind::DOMAIN_ENTITY); std::lock_guard guard(mutex_); change_entity_status_of_kind(entity_id, active, entity_kind); diff --git a/src/cpp/database/entities.hpp b/src/cpp/database/entities.hpp index 2c7ef7926..acd6296fe 100644 --- a/src/cpp/database/entities.hpp +++ b/src/cpp/database/entities.hpp @@ -192,7 +192,7 @@ struct Domain : Entity { Domain( std::string domain_name) noexcept - : Entity(EntityKind::DOMAIN, domain_name) + : Entity(EntityKind::DOMAIN_ENTITY, domain_name) { } diff --git a/test/dds/communication/Monitor.cpp b/test/dds/communication/Monitor.cpp index c2acf9d21..7ce30be92 100644 --- a/test/dds/communication/Monitor.cpp +++ b/test/dds/communication/Monitor.cpp @@ -188,7 +188,7 @@ int main( if (!StatisticsBackend::get_entities(EntityKind::HOST).empty() || !StatisticsBackend::get_entities(EntityKind::USER).empty() || !StatisticsBackend::get_entities(EntityKind::PROCESS).empty() || - !StatisticsBackend::get_entities(EntityKind::DOMAIN).empty() || + !StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty() || !StatisticsBackend::get_entities(EntityKind::TOPIC).empty() || !StatisticsBackend::get_entities(EntityKind::PARTICIPANT).empty() || !StatisticsBackend::get_entities(EntityKind::DATAWRITER).empty() || @@ -227,12 +227,12 @@ int main( !StatisticsBackend::get_entities(EntityKind::DATAWRITER).empty() || !StatisticsBackend::get_entities(EntityKind::DATAREADER).empty() || !StatisticsBackend::get_entities(EntityKind::LOCATOR).empty() || - (StatisticsBackend::get_entities(EntityKind::DOMAIN).size() != 1) || - (StatisticsBackend::get_entities(EntityKind::DOMAIN).begin()->value() != monitor_id)) + (StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).size() != 1) || + (StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).begin()->value() != monitor_id)) { throw Error("Error: database contains unexpected entities"); } - for (auto entity : StatisticsBackend::get_entities(EntityKind::DOMAIN, monitor_id)) + for (auto entity : StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY, monitor_id)) { if (!StatisticsBackend::is_active(entity)) { @@ -272,8 +272,8 @@ int main( { throw Error("Error: database contains unexpected entities"); } - else if (StatisticsBackend::get_entities(EntityKind::DOMAIN).size() != 1 || - StatisticsBackend::get_entities(EntityKind::DOMAIN).begin()->value() != monitor_id) + else if (StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).size() != 1 || + StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).begin()->value() != monitor_id) { throw Error("Error: database contains unexpected DOMAIN"); } @@ -303,7 +303,7 @@ int main( { throw Error("Error: database contains unexpected LOCATOR"); } - for (auto entity : StatisticsBackend::get_entities(EntityKind::DOMAIN, monitor_id)) + for (auto entity : StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY, monitor_id)) { if (!StatisticsBackend::is_active(entity)) { @@ -372,8 +372,8 @@ int main( { throw Error("Error: database contains unexpected entities"); } - else if (StatisticsBackend::get_entities(EntityKind::DOMAIN).size() != 1 || - StatisticsBackend::get_entities(EntityKind::DOMAIN).begin()->value() != monitor_id) + else if (StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).size() != 1 || + StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).begin()->value() != monitor_id) { throw Error("Error: database contains unexpected DOMAIN"); } @@ -403,7 +403,7 @@ int main( { throw Error("Error: database contains unexpected LOCATOR"); } - for (auto entity : StatisticsBackend::get_entities(EntityKind::DOMAIN, monitor_id)) + for (auto entity : StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY, monitor_id)) { if (!StatisticsBackend::is_active(entity)) { @@ -474,8 +474,8 @@ int main( { throw Error("Error: database contains unexpected entities"); } - else if (StatisticsBackend::get_entities(EntityKind::DOMAIN).size() != 1 || - StatisticsBackend::get_entities(EntityKind::DOMAIN).begin()->value() != monitor_id) + else if (StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).size() != 1 || + StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).begin()->value() != monitor_id) { throw Error("Error: database contains unexpected DOMAIN"); } @@ -505,7 +505,7 @@ int main( { throw Error("Error: database contains unexpected LOCATOR"); } - for (auto entity : StatisticsBackend::get_entities(EntityKind::DOMAIN, monitor_id)) + for (auto entity : StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY, monitor_id)) { if (StatisticsBackend::is_active(entity)) { @@ -564,7 +564,7 @@ int main( // if (!StatisticsBackend::get_entities(EntityKind::HOST).empty() || // !StatisticsBackend::get_entities(EntityKind::USER).empty() || // !StatisticsBackend::get_entities(EntityKind::PROCESS).empty() || - // !StatisticsBackend::get_entities(EntityKind::DOMAIN).empty() || + // !StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty() || // !StatisticsBackend::get_entities(EntityKind::TOPIC).empty() || // !StatisticsBackend::get_entities(EntityKind::PARTICIPANT).empty() || // !StatisticsBackend::get_entities(EntityKind::DATAWRITER).empty() || diff --git a/test/unittest/Database/DatabaseClearTests.cpp b/test/unittest/Database/DatabaseClearTests.cpp index c54bab558..f5d361d27 100644 --- a/test/unittest/Database/DatabaseClearTests.cpp +++ b/test/unittest/Database/DatabaseClearTests.cpp @@ -186,7 +186,7 @@ TEST(database, clear_inactive_entities_database_simple) EntityKind::HOST, EntityKind::USER, EntityKind::PROCESS, - EntityKind::DOMAIN, + EntityKind::DOMAIN_ENTITY, EntityKind::TOPIC }; for (const auto& kind : entities_kind_to_check) @@ -242,7 +242,7 @@ TEST(database, clear_inactive_entities_database_simple) } // 2 entities remain: Domain and 1 locator - ASSERT_EQ(db.get_entity_ids(EntityKind::DOMAIN, EntityId::all()).size(), 1u); + ASSERT_EQ(db.get_entity_ids(EntityKind::DOMAIN_ENTITY, EntityId::all()).size(), 1u); ASSERT_EQ(db.get_entity_ids(EntityKind::LOCATOR, EntityId::all()).size(), 1u); } } diff --git a/test/unittest/Database/DatabaseEraseTests.cpp b/test/unittest/Database/DatabaseEraseTests.cpp index e365b128b..da428657a 100644 --- a/test/unittest/Database/DatabaseEraseTests.cpp +++ b/test/unittest/Database/DatabaseEraseTests.cpp @@ -101,7 +101,7 @@ void erase_and_check( db.load_database(initial_dump); // Call erase monitor removing domain_1 - std::vector> domains = db.get_entities_by_name(EntityKind::DOMAIN, domain); + std::vector> domains = db.get_entities_by_name(EntityKind::DOMAIN_ENTITY, domain); EntityId domain_id = domains.begin()->first; // Save entities associated to the erased domain to check that the cross maps are correctly erased. std::vector> participants = db.get_entities(EntityKind::PARTICIPANT, domain_id); @@ -148,7 +148,7 @@ TEST(database_erase_tests, erase_domain_unlinked_participant_process) "120"); } -// This test checks that calling erase with an EntityId that does not correspond with EntityKind::DOMAIN, kills the +// This test checks that calling erase with an EntityId that does not correspond with EntityKind::DOMAIN_ENTITY, kills the // thread with an assertion TEST(database_erase_tests, erase_wrong_kind) { diff --git a/test/unittest/Database/DatabaseGetEntitiesTest.cpp b/test/unittest/Database/DatabaseGetEntitiesTest.cpp index 765cfd035..8936d0fd8 100644 --- a/test/unittest/Database/DatabaseGetEntitiesTest.cpp +++ b/test/unittest/Database/DatabaseGetEntitiesTest.cpp @@ -126,7 +126,7 @@ GTEST_INSTANTIATE_TEST_MACRO( // ALL - PROCESS std::make_tuple(EntityKind::PROCESS, 0, std::vector{5, 6}), // ALL - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 0, std::vector{7, 8}), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 0, std::vector{7, 8}), // ALL - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 0, std::vector{9, 10}), // ALL - TOPIC @@ -149,9 +149,9 @@ GTEST_INSTANTIATE_TEST_MACRO( // HOST - PROCESS: none std::make_tuple(EntityKind::PROCESS, 1, std::vector { }), // HOST - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 2, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 2, std::vector { 8 }), // HOST - DOMAIN: none - std::make_tuple(EntityKind::DOMAIN, 1, std::vector { }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 1, std::vector { }), // HOST - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 2, std::vector { 9, 10 }), // HOST - PARTICIPANT: none @@ -184,9 +184,9 @@ GTEST_INSTANTIATE_TEST_MACRO( // USER - PROCESS: none std::make_tuple(EntityKind::PROCESS, 3, std::vector { }), // USER - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 4, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 4, std::vector { 8 }), // USER - DOMAIN: none - std::make_tuple(EntityKind::DOMAIN, 3, std::vector { }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 3, std::vector { }), // USER - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 4, std::vector { 9, 10 }), // USER - PARTICIPANT: none @@ -218,9 +218,9 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 6, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 5, std::vector { 5 }), // PROCESS - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 6, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 6, std::vector { 8 }), // PROCESS - DOMAIN: none - std::make_tuple(EntityKind::DOMAIN, 5, std::vector { }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 5, std::vector { }), // PROCESS - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 6, std::vector { 9, 10 }), // PROCESS - PARTICIPANT: none @@ -255,8 +255,8 @@ GTEST_INSTANTIATE_TEST_MACRO( // DOMAIN - PROCESS: none std::make_tuple(EntityKind::PROCESS, 7, std::vector { }), // DOMAIN - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 8, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 7, std::vector { 7 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 8, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 7, std::vector { 7 }), // DOMAIN - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 8, std::vector { 9, 10 }), // DOMAIN - PARTICIPANT: none @@ -288,8 +288,8 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 10, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 9, std::vector { 6 }), // PARTICIPANT - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 10, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 9, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 10, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 9, std::vector { 8 }), // PARTICIPANT - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 10, std::vector { 10 }), std::make_tuple(EntityKind::PARTICIPANT, 9, std::vector { 9 }), @@ -323,8 +323,8 @@ GTEST_INSTANTIATE_TEST_MACRO( // TOPIC - PROCESS: none std::make_tuple(EntityKind::PROCESS, 11, std::vector { }), // TOPIC - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 12, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 11, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 12, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 11, std::vector { 8 }), // TOPIC - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 12, std::vector { 10 }), // TOPIC - PARTICIPANT: none @@ -355,8 +355,8 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 15, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 13, std::vector { 6 }), // DATAREADER - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 15, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 13, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 15, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 13, std::vector { 8 }), // DATAREADER - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 15, std::vector { 10 }), std::make_tuple(EntityKind::PARTICIPANT, 13, std::vector { 10 }), @@ -384,8 +384,8 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 19, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 17, std::vector { 6 }), // DATAWRITER - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 19, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 17, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 19, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 17, std::vector { 8 }), // DATAWRITER - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 19, std::vector { 10 }), std::make_tuple(EntityKind::PARTICIPANT, 17, std::vector { 10 }), @@ -419,10 +419,10 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 18, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 20, std::vector { 6 }), // LOCATOR - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 14, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 16, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 18, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 20, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 14, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 16, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 18, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 20, std::vector { 8 }), // LOCATOR - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 14, std::vector { 10 }), std::make_tuple(EntityKind::PARTICIPANT, 16, std::vector { 10 }), diff --git a/test/unittest/Database/DatabaseTests.cpp b/test/unittest/Database/DatabaseTests.cpp index 2114c52c0..535556ce7 100644 --- a/test/unittest/Database/DatabaseTests.cpp +++ b/test/unittest/Database/DatabaseTests.cpp @@ -2555,7 +2555,7 @@ TEST_F(database_tests, get_entities_by_name_process_wrong_name) TEST_F(database_tests, get_entities_by_name_domain) { /* Check that the inserted entity is retrieved correctly */ - auto domains = db.get_entities_by_name(EntityKind::DOMAIN, domain_name); + auto domains = db.get_entities_by_name(EntityKind::DOMAIN_ENTITY, domain_name); EXPECT_EQ(domains.size(), 1u); EXPECT_EQ(domains[0].first, domain_id); EXPECT_EQ(domains[0].second, domain_id); @@ -2563,7 +2563,7 @@ TEST_F(database_tests, get_entities_by_name_domain) TEST_F(database_tests, get_entities_by_name_domain_wrong_name) { - auto domains = db.get_entities_by_name(EntityKind::DOMAIN, "wrong_name"); + auto domains = db.get_entities_by_name(EntityKind::DOMAIN_ENTITY, "wrong_name"); EXPECT_EQ(domains.size(), 0u); } @@ -2713,7 +2713,7 @@ TEST_F(database_tests, get_entity_kind) EXPECT_EQ(EntityKind::HOST, db.get_entity_kind(host_id)); EXPECT_EQ(EntityKind::USER, db.get_entity_kind(user_id)); EXPECT_EQ(EntityKind::PROCESS, db.get_entity_kind(process_id)); - EXPECT_EQ(EntityKind::DOMAIN, db.get_entity_kind(domain_id)); + EXPECT_EQ(EntityKind::DOMAIN_ENTITY, db.get_entity_kind(domain_id)); EXPECT_EQ(EntityKind::PARTICIPANT, db.get_entity_kind(participant_id)); EXPECT_EQ(EntityKind::DATAWRITER, db.get_entity_kind(writer_id)); EXPECT_EQ(EntityKind::DATAREADER, db.get_entity_kind(reader_id)); @@ -4144,7 +4144,7 @@ TEST_F(database_tests, get_entity_by_guid_process) TEST_F(database_tests, get_entity_by_guid_domain) { - EXPECT_THROW(db.get_entity_by_guid(EntityKind::DOMAIN, "any_guid"), BadParameter); + EXPECT_THROW(db.get_entity_by_guid(EntityKind::DOMAIN_ENTITY, "any_guid"), BadParameter); } TEST_F(database_tests, get_entity_by_guid_participant) diff --git a/test/unittest/StatisticsBackend/BackendDumpTests.cpp b/test/unittest/StatisticsBackend/BackendDumpTests.cpp index 72e92e7e2..3c675737a 100644 --- a/test/unittest/StatisticsBackend/BackendDumpTests.cpp +++ b/test/unittest/StatisticsBackend/BackendDumpTests.cpp @@ -28,25 +28,25 @@ TEST(backend_dump_tests, reset) { // Load the dump to the database StatisticsBackend::load_database(SIMPLE_DUMP_FILE); - ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN).empty()); + ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty()); // Resetting at this point should work and clear the database StatisticsBackend::reset(); - ASSERT_TRUE(StatisticsBackend::get_entities(EntityKind::DOMAIN).empty()); + ASSERT_TRUE(StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty()); // Load the dump to the database again StatisticsBackend::load_database(SIMPLE_DUMP_FILE); - ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN).empty()); + ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty()); // Start a monitor and try resetting auto monitor = StatisticsBackend::init_monitor(100); EXPECT_THROW(StatisticsBackend::reset(), PreconditionNotMet); - ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN).empty()); + ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty()); // Stop the monitor and try again StatisticsBackend::stop_monitor(monitor); EXPECT_NO_THROW(StatisticsBackend::reset()); - ASSERT_TRUE(StatisticsBackend::get_entities(EntityKind::DOMAIN).empty()); + ASSERT_TRUE(StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty()); } TEST(backend_dump_tests, database_dump_load) diff --git a/test/unittest/StatisticsBackend/CallingUserListenersTests.cpp b/test/unittest/StatisticsBackend/CallingUserListenersTests.cpp index bed4a0a92..5097c8e41 100644 --- a/test/unittest/StatisticsBackend/CallingUserListenersTests.cpp +++ b/test/unittest/StatisticsBackend/CallingUserListenersTests.cpp @@ -1036,7 +1036,7 @@ TEST_F(calling_user_listeners_DeathTest, wrong_entity_kind) // Expectation: The call asserts ASSERT_DEATH(details::StatisticsBackendData::get_instance()->on_physical_entity_discovery( EntityId(1), - EntityKind::DOMAIN, + EntityKind::DOMAIN_ENTITY, details::StatisticsBackendData::DiscoveryStatus::DISCOVERY), ".*"); diff --git a/test/unittest/StatisticsBackend/ClearDataTests.cpp b/test/unittest/StatisticsBackend/ClearDataTests.cpp index f4fd3ee8e..c91aa306d 100644 --- a/test/unittest/StatisticsBackend/ClearDataTests.cpp +++ b/test/unittest/StatisticsBackend/ClearDataTests.cpp @@ -35,7 +35,7 @@ TEST(clear_statistics_data_tests, clear_statistics_data_simple) StatisticsBackend::load_database(SIMPLE_DUMP_FILE); // Check that there is at least a domain - ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN).empty()); + ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty()); // Check that there is data loaded // Get Reader id @@ -72,7 +72,7 @@ TEST(clear_statistics_data_tests, clear_statistics_data_time) StatisticsBackend::load_database(COMPLEX_DUMP_FILE); // Check that there is at least a domain - ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN).empty()); + ASSERT_FALSE(StatisticsBackend::get_entities(EntityKind::DOMAIN_ENTITY).empty()); // Check that there is data loaded // Get Reader id 17 diff --git a/test/unittest/StatisticsBackend/StatisticsBackendTests.cpp b/test/unittest/StatisticsBackend/StatisticsBackendTests.cpp index f46cc2054..137eb7cd7 100644 --- a/test/unittest/StatisticsBackend/StatisticsBackendTests.cpp +++ b/test/unittest/StatisticsBackend/StatisticsBackendTests.cpp @@ -424,7 +424,7 @@ TEST_F(statistics_backend_tests, internal_callbacks_negative_cases) // Check that there is a monitor with EntityId(7) // This will be used in all calls to on_domain_entity_discovery - auto result = StatisticsBackendTest::get_entities(EntityKind::DOMAIN, EntityId(7)); + auto result = StatisticsBackendTest::get_entities(EntityKind::DOMAIN_ENTITY, EntityId(7)); ASSERT_EQ(1u, result.size()); EntityId monitor_id = EntityId(7); @@ -654,7 +654,7 @@ GTEST_INSTANTIATE_TEST_MACRO( // ALL - PROCESS std::make_tuple(EntityKind::PROCESS, 0, std::vector{5, 6}), // ALL - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 0, std::vector{7, 8}), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 0, std::vector{7, 8}), // ALL - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 0, std::vector{9, 10}), // ALL - TOPIC @@ -677,9 +677,9 @@ GTEST_INSTANTIATE_TEST_MACRO( // HOST - PROCESS: none std::make_tuple(EntityKind::PROCESS, 1, std::vector { }), // HOST - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 2, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 2, std::vector { 8 }), // HOST - DOMAIN: none - std::make_tuple(EntityKind::DOMAIN, 1, std::vector { }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 1, std::vector { }), // HOST - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 2, std::vector { 9, 10 }), // HOST - PARTICIPANT: none @@ -712,9 +712,9 @@ GTEST_INSTANTIATE_TEST_MACRO( // USER - PROCESS: none std::make_tuple(EntityKind::PROCESS, 3, std::vector { }), // USER - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 4, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 4, std::vector { 8 }), // USER - DOMAIN: none - std::make_tuple(EntityKind::DOMAIN, 3, std::vector { }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 3, std::vector { }), // USER - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 4, std::vector { 9, 10 }), // USER - PARTICIPANT: none @@ -746,9 +746,9 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 6, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 5, std::vector { 5 }), // PROCESS - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 6, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 6, std::vector { 8 }), // PROCESS - DOMAIN: none - std::make_tuple(EntityKind::DOMAIN, 5, std::vector { }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 5, std::vector { }), // PROCESS - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 6, std::vector { 9, 10 }), // PROCESS - PARTICIPANT: none @@ -783,8 +783,8 @@ GTEST_INSTANTIATE_TEST_MACRO( // DOMAIN - PROCESS: none std::make_tuple(EntityKind::PROCESS, 7, std::vector { }), // DOMAIN - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 8, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 7, std::vector { 7 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 8, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 7, std::vector { 7 }), // DOMAIN - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 8, std::vector { 9, 10 }), // DOMAIN - PARTICIPANT: none @@ -816,8 +816,8 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 10, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 9, std::vector { 6 }), // PARTICIPANT - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 10, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 9, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 10, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 9, std::vector { 8 }), // PARTICIPANT - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 10, std::vector { 10 }), std::make_tuple(EntityKind::PARTICIPANT, 9, std::vector { 9 }), @@ -851,8 +851,8 @@ GTEST_INSTANTIATE_TEST_MACRO( // TOPIC - PROCESS: none std::make_tuple(EntityKind::PROCESS, 11, std::vector { }), // TOPIC - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 12, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 11, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 12, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 11, std::vector { 8 }), // TOPIC - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 12, std::vector { 10 }), // TOPIC - PARTICIPANT: none @@ -883,8 +883,8 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 15, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 13, std::vector { 6 }), // DATAREADER - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 15, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 13, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 15, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 13, std::vector { 8 }), // DATAREADER - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 15, std::vector { 10 }), std::make_tuple(EntityKind::PARTICIPANT, 13, std::vector { 10 }), @@ -912,8 +912,8 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 19, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 17, std::vector { 6 }), // DATAWRITER - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 19, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 17, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 19, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 17, std::vector { 8 }), // DATAWRITER - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 19, std::vector { 10 }), std::make_tuple(EntityKind::PARTICIPANT, 17, std::vector { 10 }), @@ -947,10 +947,10 @@ GTEST_INSTANTIATE_TEST_MACRO( std::make_tuple(EntityKind::PROCESS, 18, std::vector { 6 }), std::make_tuple(EntityKind::PROCESS, 20, std::vector { 6 }), // LOCATOR - DOMAIN - std::make_tuple(EntityKind::DOMAIN, 14, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 16, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 18, std::vector { 8 }), - std::make_tuple(EntityKind::DOMAIN, 20, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 14, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 16, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 18, std::vector { 8 }), + std::make_tuple(EntityKind::DOMAIN_ENTITY, 20, std::vector { 8 }), // LOCATOR - PARTICIPANT std::make_tuple(EntityKind::PARTICIPANT, 14, std::vector { 10 }), std::make_tuple(EntityKind::PARTICIPANT, 16, std::vector { 10 }), diff --git a/test/unittest/StatisticsParticipantListener/StatisticsParticipantListenerTests.cpp b/test/unittest/StatisticsParticipantListener/StatisticsParticipantListenerTests.cpp index 9c60fbd3f..919ce89b6 100644 --- a/test/unittest/StatisticsParticipantListener/StatisticsParticipantListenerTests.cpp +++ b/test/unittest/StatisticsParticipantListener/StatisticsParticipantListenerTests.cpp @@ -203,7 +203,7 @@ class statistics_participant_listener_tests : public ::testing::Test { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, @@ -238,7 +238,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times(AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -398,7 +398,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered_not_fir // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -544,7 +544,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_undiscovered) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -592,7 +592,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered_empty_n // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times(AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -704,7 +704,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered_empty_n // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, @@ -900,7 +900,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered_empty_n // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, @@ -1078,7 +1078,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered_empty_n // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, @@ -1237,7 +1237,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered_empty_n // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, @@ -1373,7 +1373,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered_empty_n // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, @@ -1557,7 +1557,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_no_domain) { // Precondition: The Domain 0 does not exist EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))) .Times(AnyNumber()) .WillRepeatedly(Return(std::vector>())); EXPECT_CALL(database, get_entity(EntityId(0))).Times(AnyNumber()) @@ -1597,7 +1597,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_discovered_partici { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -1703,7 +1703,7 @@ TEST_F(statistics_participant_listener_tests, new_participant_undiscovered_parti { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -1760,7 +1760,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_discovered) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -1870,7 +1870,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_undiscovered) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -1950,7 +1950,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_no_topic) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -2081,7 +2081,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_several_topics) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -2107,7 +2107,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_several_topics) std::string another_domain_name = "another_domain"; std::shared_ptr another_domain = std::make_shared(another_domain_name); EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, another_domain_name)).Times(AnyNumber()) + get_entities_by_name(EntityKind::DOMAIN_ENTITY, another_domain_name)).Times(AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(100), EntityId(100))))); EXPECT_CALL(database, get_entity(EntityId(100))).Times(AnyNumber()) @@ -2220,7 +2220,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_several_locators) // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -2432,7 +2432,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_several_locators_no_hos // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -2635,7 +2635,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_no_participant) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -2700,7 +2700,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_no_domain) { // Precondition: The Domain 0 does not exist EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>())); EXPECT_CALL(database, get_entity(EntityId(0))).Times(AnyNumber()) @@ -2761,7 +2761,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_discovered_reader_alrea { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -2853,7 +2853,7 @@ TEST_F(statistics_participant_listener_tests, new_reader_undiscovered_reader_alr { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -2947,7 +2947,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_discovered) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -3057,7 +3057,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_undiscovered) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -3137,7 +3137,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_no_topic) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -3272,7 +3272,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_several_locators // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -3484,7 +3484,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_several_locators_no_hos // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -3683,7 +3683,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_no_participant) { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -3749,7 +3749,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_no_domain) { // Precondition: The Domain 0 does not exist EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>())); EXPECT_CALL(database, get_entity(EntityId(0))).Times(AnyNumber()) @@ -3810,7 +3810,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_discovered_writer_alrea { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); @@ -3902,7 +3902,7 @@ TEST_F(statistics_participant_listener_tests, new_writer_undiscovered_writer_alr { // Precondition: The Domain 0 exists and has ID 0 EXPECT_CALL(database, - get_entities_by_name(EntityKind::DOMAIN, std::to_string(statistics_participant.domain_id_))).Times( + get_entities_by_name(EntityKind::DOMAIN_ENTITY, std::to_string(statistics_participant.domain_id_))).Times( AnyNumber()) .WillRepeatedly(Return(std::vector>(1, std::make_pair(EntityId(0), EntityId(0))))); diff --git a/test/unittest/TestUtils/DatabaseUtils.hpp b/test/unittest/TestUtils/DatabaseUtils.hpp index e3979fddc..618bb9d98 100644 --- a/test/unittest/TestUtils/DatabaseUtils.hpp +++ b/test/unittest/TestUtils/DatabaseUtils.hpp @@ -728,7 +728,7 @@ class StatisticsBackendTest : public StatisticsBackend // Need to reconstruct the monitors auto domains = details::StatisticsBackendData::get_instance()->database_->get_entities( - EntityKind::DOMAIN, EntityId::all()); + EntityKind::DOMAIN_ENTITY, EntityId::all()); for (auto domain : domains) { std::unique_ptr monitor = std::make_unique();