Skip to content

Commit

Permalink
iox-#415 Add test ids, update CHANGELOG
Browse files Browse the repository at this point in the history
Signed-off-by: Marika Lehmann <marika.lehmann@apex.ai>
  • Loading branch information
FerdinandSpitzschnueffler committed Feb 3, 2022
1 parent fa77f45 commit 2c50495
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- Add requirePublisherHistorySupport option at subscriber side (if set to true requires historyRequest <= historyCapacity to be eligible for connection) [#1029](https://github.com/eclipse-iceoryx/iceoryx/issues/1029)
- Add `/tools/scripts/ice_env.sh` shell script to provide simple access to docker containers for CI debugging [#1049](https://github.com/eclipse-iceoryx/iceoryx/issues/1049)
- Introduce `cxx::FunctionalInterface` to enrich nullable classes with `and_then`, `or_else`, `value_or`, `expect` [\#996](https://github.com/eclipse-iceoryx/iceoryx/issues/996)
- Add event parameter to `findService` method [#415](https://github.com/eclipse-iceoryx/iceoryx/issues/415)

**Bugfixes:**

Expand Down Expand Up @@ -226,8 +227,8 @@ capro::ServiceDescription::deserialize(serialisedObj)
});
```
The service-related methods have been moved from `PoshRuntime` to `ServiceDiscovery`. Additionally, the
`offerService` and `stopOfferService` methods have been removed:
The service-related methods have been moved from `PoshRuntime` to `ServiceDiscovery`. The `offerService`
and `stopOfferService` methods have been removed and `findService` has now an additional event paramter:
```cpp
// before
Expand All @@ -236,7 +237,7 @@ poshRuntime.stopOfferService(myServiceDescription);
poshRuntime.findService({"ServiceA", iox::capro::AnyInstanceString});
// after
serviceDiscovery.findService("ServiceA", Wildcard);
serviceDiscovery.findService("ServiceA", Wildcard, Wildcard);
```

The `iox::cxx::expected` has dropped the requirement for `INVALID_STATE`. With this, the
Expand Down
2 changes: 2 additions & 0 deletions iceoryx_posh/test/integrationtests/test_service_discovery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ TEST_F(ServiceDiscovery_test, DISABLED_FindServiceWithServiceWildcardReturnsCorr

TEST_F(ServiceDiscovery_test, FindServiceWithEventWildcardReturnsCorrectServices)
{
::testing::Test::RecordProperty("TEST_ID", "e78b35f4-b3c3-4c39-b10a-67712c72e28a");
const IdString_t SERVICE = "service";
const IdString_t INSTANCE = "instance";
const iox::capro::ServiceDescription SERVICE_DESCRIPTION1(SERVICE, INSTANCE, "event1");
Expand All @@ -288,6 +289,7 @@ TEST_F(ServiceDiscovery_test, FindServiceWithEventWildcardReturnsCorrectServices
/// @todo #415 enable once the prefix tree is integrated into the service registry
TEST_F(ServiceDiscovery_test, DISABLED_FindServiceWithInstanceWildcardReturnsCorrectServices)
{
::testing::Test::RecordProperty("TEST_ID", "2ec4b422-3ded-4af3-9e72-3b870c55031c");
const IdString_t SERVICE = "service";
const IdString_t EVENT = "event";
const iox::capro::ServiceDescription SERVICE_DESCRIPTION1(SERVICE, "instance1", EVENT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ TEST_F(ServiceRegistry_test, SingleServiceDescriptionCanBeFoundWithWildcardSearc
/// @todo #415 enable once the prefix tree is integrated into the service registry
TEST_F(ServiceRegistry_test, DISABLED_SingleServiceDescriptionCanBeFoundWithEventName)
{
::testing::Test::RecordProperty("TEST_ID", "0890013c-e14b-4ae2-89cb-757624c12b4e");
::testing::Test::RecordProperty("TEST_ID", "6df8fd7d-e4d1-4c51-8ad7-2fbe82e4ed09");
iox::capro::ServiceDescription service1("a", "b", "c");
ASSERT_FALSE(sut.add(service1).has_error());
sut.find(searchResults, iox::capro::Wildcard, iox::capro::Wildcard, iox::capro::IdString_t("c"));
Expand Down

0 comments on commit 2c50495

Please sign in to comment.