diff options
Diffstat (limited to 'test/offer_tests')
15 files changed, 110 insertions, 72 deletions
diff --git a/test/offer_tests/conf/offer_test_big_sd_msg_master.json.in b/test/offer_tests/conf/offer_test_big_sd_msg_master.json.in index 17158c1..06609f6 100644 --- a/test/offer_tests/conf/offer_test_big_sd_msg_master.json.in +++ b/test/offer_tests/conf/offer_test_big_sd_msg_master.json.in @@ -18,7 +18,7 @@ "id" : "0x6666" } ], - "routing":"vsomeipd", + "routing":"routingmanagerd", "service-discovery": { "enable":"true", diff --git a/test/offer_tests/conf/offer_test_big_sd_msg_master_starter.sh.in b/test/offer_tests/conf/offer_test_big_sd_msg_master_starter.sh.in index 2547673..07d4079 100755 --- a/test/offer_tests/conf/offer_test_big_sd_msg_master_starter.sh.in +++ b/test/offer_tests/conf/offer_test_big_sd_msg_master_starter.sh.in @@ -14,7 +14,7 @@ FAIL=0 export VSOMEIP_CONFIGURATION=offer_test_big_sd_msg_master.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! ./offer_test_big_sd_msg_client & @@ -27,10 +27,12 @@ if [ ! -z "$USE_LXC_TEST" ]; then echo "Waiting for 5s" sleep 5 echo "starting offer test on slave LXC offer_test_big_sd_msg_slave_starter.sh" - ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip/test; ./offer_test_big_sd_msg_slave_starter.sh\"" & + ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip_lib/test; ./offer_test_big_sd_msg_slave_starter.sh\"" & echo "remote ssh pid: $!" elif [ ! -z "$USE_DOCKER" ]; then - docker run --name otems --cap-add NET_ADMIN $DOCKER_IMAGE sh -c "route add -net 224.0.0.0/4 dev eth0 && cd $DOCKER_TESTS && sleep 10; ./offer_test_big_sd_msg_slave_starter.sh" & + echo "Waiting for 5s" + sleep 5 + docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && sleep 10; ./offer_test_big_sd_msg_slave_starter.sh" & else cat <<End-of-message ******************************************************************************* @@ -59,11 +61,6 @@ done kill $PID_VSOMEIPD sleep 1 -if [ ! -z "$USE_DOCKER" ]; then - docker stop otems - docker rm otems -fi - # wait for slave to finish for job in $(jobs -p) do diff --git a/test/offer_tests/conf/offer_test_big_sd_msg_slave.json.in b/test/offer_tests/conf/offer_test_big_sd_msg_slave.json.in index cd5056a..0c8427d 100644 --- a/test/offer_tests/conf/offer_test_big_sd_msg_slave.json.in +++ b/test/offer_tests/conf/offer_test_big_sd_msg_slave.json.in @@ -321,7 +321,7 @@ {"service":"0x12B","instance":"0x1","unreliable":"30299","reliable":{"port":"30299","enable-magic-cookies":"false"}}, {"service":"0x12C","instance":"0x1","unreliable":"30300","reliable":{"port":"30300","enable-magic-cookies":"false"}} ], - "routing":"vsomeipd", + "routing":"routingmanagerd", "service-discovery": { "enable":"true", diff --git a/test/offer_tests/conf/offer_test_external_master.json.in b/test/offer_tests/conf/offer_test_external_master.json.in index b16a258..c54d9ac 100644 --- a/test/offer_tests/conf/offer_test_external_master.json.in +++ b/test/offer_tests/conf/offer_test_external_master.json.in @@ -24,7 +24,7 @@ } } ], - "routing":"vsomeipd", + "routing":"routingmanagerd", "service-discovery": { "enable":"true", diff --git a/test/offer_tests/conf/offer_test_external_master_starter.sh.in b/test/offer_tests/conf/offer_test_external_master_starter.sh.in index 0f8f104..272689a 100755 --- a/test/offer_tests/conf/offer_test_external_master_starter.sh.in +++ b/test/offer_tests/conf/offer_test_external_master_starter.sh.in @@ -23,7 +23,7 @@ FAIL=0 CLIENT_PIDS=() export VSOMEIP_CONFIGURATION=offer_test_external_master.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! # Start the services ./offer_test_service 2 & @@ -40,10 +40,12 @@ if [ ! -z "$USE_LXC_TEST" ]; then echo "Waiting for 5s" sleep 5 echo "starting offer test on slave LXC offer_test_external_slave_starter.sh" - ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip/test; ./offer_test_external_slave_starter.sh\"" & + ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip_lib/test; ./offer_test_external_slave_starter.sh\"" & echo "remote ssh pid: $!" elif [ ! -z "$USE_DOCKER" ]; then - docker run --name otems --cap-add NET_ADMIN $DOCKER_IMAGE sh -c "route add -net 224.0.0.0/4 dev eth0 && cd $DOCKER_TESTS && sleep 10; ./offer_test_external_slave_starter.sh" & + echo "Waiting for 5s" + sleep 5 + docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && sleep 10; ./offer_test_external_slave_starter.sh" & else cat <<End-of-message ******************************************************************************* @@ -72,11 +74,6 @@ done kill $PID_VSOMEIPD sleep 1 -if [ ! -z "$USE_DOCKER" ]; then - docker stop otems - docker rm otems -fi - # wait for slave to finish for job in $(jobs -p) do @@ -95,7 +92,7 @@ done CLIENT_PIDS=() export VSOMEIP_CONFIGURATION=offer_test_external_master.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! # Start the services ./offer_test_service 2 & @@ -111,10 +108,12 @@ if [ ! -z "$USE_LXC_TEST" ]; then echo "Waiting for 5s" sleep 5 echo "starting offer test on slave LXC offer_test_external_sd_msg_sender" - ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip/test; ./offer_test_external_sd_msg_sender $LXC_TEST_MASTER_IP\"" & + ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip_lib/test; ./offer_test_external_sd_msg_sender $LXC_TEST_MASTER_IP\"" & echo "remote ssh job id: $!" elif [ ! -z "$USE_DOCKER" ]; then - docker run --name otesms --cap-add NET_ADMIN $DOCKER_IMAGE sh -c "route add -net 224.0.0.0/4 dev eth0 && cd $DOCKER_TESTS && sleep 10; ./offer_test_external_sd_msg_sender $DOCKER_IP" & + echo "Waiting for 5s" + sleep 5 + docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && sleep 10; ./offer_test_external_sd_msg_sender $DOCKER_IP" & else cat <<End-of-message ******************************************************************************* @@ -141,11 +140,6 @@ done kill $PID_VSOMEIPD sleep 1 -if [ ! -z "$USE_DOCKER" ]; then - docker stop otesms - docker rm otesms -fi - # wait for slave to finish for job in $(jobs -p) do diff --git a/test/offer_tests/conf/offer_test_external_slave.json.in b/test/offer_tests/conf/offer_test_external_slave.json.in index 47a3e9d..73a0e58 100644 --- a/test/offer_tests/conf/offer_test_external_slave.json.in +++ b/test/offer_tests/conf/offer_test_external_slave.json.in @@ -24,7 +24,7 @@ } } ], - "routing":"vsomeipd", + "routing":"routingmanagerd", "service-discovery": { "enable":"true", diff --git a/test/offer_tests/offer_test_big_sd_msg_client.cpp b/test/offer_tests/offer_test_big_sd_msg_client.cpp index cf00de7..3ef1f61 100644 --- a/test/offer_tests/offer_test_big_sd_msg_client.cpp +++ b/test/offer_tests/offer_test_big_sd_msg_client.cpp @@ -16,8 +16,7 @@ #include <gtest/gtest.h> #include <vsomeip/vsomeip.hpp> -#include "../../implementation/logging/include/logger.hpp" -#include "../../implementation/configuration/include/internal.hpp" +#include <vsomeip/internal/logger.hpp> #include "offer_test_globals.hpp" @@ -26,7 +25,6 @@ public: offer_test_big_sd_msg_client(struct offer_test::service_info _service_info) : service_info_(_service_info), app_(vsomeip::runtime::get()->create_application("offer_test_big_sd_msg_client")), - service_available_(false), wait_until_registered_(true), wait_until_service_available_(true), wait_until_subscribed_(true), @@ -55,13 +53,12 @@ public: std::set<vsomeip::eventgroup_t> its_eventgroups; its_eventgroups.insert(offer_test::big_msg_eventgroup_id); for (std::uint16_t s = 1; s <= offer_test::big_msg_number_services; s++) { - app_->request_service(s,0x1,0x1,0x1,false); + app_->request_service(s,0x1,0x1,0x1); app_->request_event(s,0x1, offer_test::big_msg_event_id, - its_eventgroups, false); + its_eventgroups, vsomeip::event_type_e::ET_EVENT); app_->subscribe(s, 0x1,offer_test::big_msg_eventgroup_id, 0x1, - vsomeip::subscription_type_e::SU_RELIABLE_AND_UNRELIABLE, offer_test::big_msg_event_id); - services_available_subribed_[s] = std::make_pair(false,false); + services_available_subribed_[s] = std::make_pair(false,0); app_->register_subscription_status_handler(s,0x1, offer_test::big_msg_eventgroup_id, offer_test::big_msg_event_id, @@ -132,11 +129,17 @@ public: std::lock_guard<std::mutex> its_lock(mutex_); auto found_service = services_available_subribed_.find(_service); if (found_service != services_available_subribed_.end()) { - found_service->second.second = true; + found_service->second.second++; + if (found_service->second.second > 1) { + ADD_FAILURE() << "Registered subscription status handler was " + "called " << std::dec << found_service->second.second + << " times for service: " << std::hex + << found_service->first; + } if (std::all_of(services_available_subribed_.cbegin(), services_available_subribed_.cend(), [](const services_available_subribed_t::value_type& v) { - return v.second.second; + return v.second.second == 1; } )) { VSOMEIP_WARNING << "************************************************************"; @@ -203,7 +206,6 @@ public: private: struct offer_test::service_info service_info_; std::shared_ptr<vsomeip::application> app_; - bool service_available_; bool wait_until_registered_; bool wait_until_service_available_; @@ -215,7 +217,7 @@ private: std::mutex stop_mutex_; std::condition_variable stop_condition_; - typedef std::map<vsomeip::service_t,std::pair<bool, bool>> services_available_subribed_t; + typedef std::map<vsomeip::service_t,std::pair<bool, std::uint32_t>> services_available_subribed_t; services_available_subribed_t services_available_subribed_; std::thread stop_thread_; std::thread send_thread_; diff --git a/test/offer_tests/offer_test_big_sd_msg_service.cpp b/test/offer_tests/offer_test_big_sd_msg_service.cpp index d5666c8..5424be3 100644 --- a/test/offer_tests/offer_test_big_sd_msg_service.cpp +++ b/test/offer_tests/offer_test_big_sd_msg_service.cpp @@ -12,11 +12,12 @@ #include <map> #include <algorithm> #include <atomic> +#include <algorithm> #include <gtest/gtest.h> #include <vsomeip/vsomeip.hpp> -#include "../../implementation/logging/include/logger.hpp" +#include <vsomeip/internal/logger.hpp> #include "offer_test_globals.hpp" @@ -24,12 +25,12 @@ class offer_test_big_sd_msg_service { public: offer_test_big_sd_msg_service(struct offer_test::service_info _service_info) : service_info_(_service_info), - // service with number 1 uses "vsomeipd" as application name + // service with number 1 uses "routingmanagerd" as application name // this way the same json file can be reused for all local tests - // including the ones with vsomeipd + // including the ones with routingmanagerd app_(vsomeip::runtime::get()->create_application("offer_test_big_sd_msg_service")), - counter_(0), wait_until_registered_(true), + wait_until_client_subscribed_to_all_services_(true), shutdown_method_called_(false), offer_thread_(std::bind(&offer_test_big_sd_msg_service::run, this)) { if (!app_->init()) { @@ -45,13 +46,22 @@ public: its_eventgroups.insert(offer_test::big_msg_eventgroup_id); for (std::uint16_t s = 1; s <= offer_test::big_msg_number_services; s++) { app_->offer_event(s, 0x1, - offer_test::big_msg_event_id, its_eventgroups, false); + offer_test::big_msg_event_id, its_eventgroups, + vsomeip::event_type_e::ET_EVENT, std::chrono::milliseconds::zero(), + false, true, nullptr, vsomeip::reliability_type_e::RT_UNKNOWN); + app_->register_subscription_handler(s, 0x1, offer_test::big_msg_eventgroup_id, + std::bind(&offer_test_big_sd_msg_service::on_subscription, + this, std::placeholders::_1, std::placeholders::_2, + std::placeholders::_3, std::placeholders::_4, s)); + subscriptions_[s] = 0; } app_->register_message_handler(vsomeip::ANY_SERVICE, vsomeip::ANY_INSTANCE, service_info_.shutdown_method_id, std::bind(&offer_test_big_sd_msg_service::on_shutdown_method_called, this, std::placeholders::_1)); + + app_->start(); } @@ -77,6 +87,31 @@ public: } } + bool on_subscription(vsomeip::client_t _client, + std::uint32_t _uid, std::uint32_t _gid, + bool _subscribed, + vsomeip::service_t _service) { + (void)_client; + (void)_uid; + (void)_gid; + if (_subscribed) { + subscriptions_[_service]++; + EXPECT_EQ(1u, subscriptions_[_service]); + if (std::all_of(subscriptions_.begin(), subscriptions_.end(), [&](const subscriptions_t::value_type& v){ + return v.second == 1; + })) { + std::lock_guard<std::mutex> its_lock(mutex_); + wait_until_client_subscribed_to_all_services_ = false; + VSOMEIP_WARNING << "************************************************************"; + VSOMEIP_WARNING << "Client subscribed to all services!"; + VSOMEIP_WARNING << "************************************************************"; + condition_.notify_one(); + } + } + + return true; + } + void on_shutdown_method_called(const std::shared_ptr<vsomeip::message> &_message) { app_->send(vsomeip::runtime::get()->create_response(_message)); std::this_thread::sleep_for(std::chrono::seconds(1)); @@ -102,17 +137,23 @@ public: VSOMEIP_DEBUG << "[" << std::setw(4) << std::setfill('0') << std::hex << service_info_.service_id << "] Offering"; offer(); + + while (wait_until_client_subscribed_to_all_services_) { + condition_.wait(its_lock); + } } private: struct offer_test::service_info service_info_; std::shared_ptr<vsomeip::application> app_; - std::uint32_t counter_; bool wait_until_registered_; + bool wait_until_client_subscribed_to_all_services_; std::mutex mutex_; std::condition_variable condition_; std::atomic<bool> shutdown_method_called_; + typedef std::map<vsomeip::service_t, std::uint32_t> subscriptions_t; + subscriptions_t subscriptions_; std::thread offer_thread_; }; diff --git a/test/offer_tests/offer_test_big_sd_msg_slave_starter.sh b/test/offer_tests/offer_test_big_sd_msg_slave_starter.sh index d83139f..32379ed 100755 --- a/test/offer_tests/offer_test_big_sd_msg_slave_starter.sh +++ b/test/offer_tests/offer_test_big_sd_msg_slave_starter.sh @@ -15,7 +15,7 @@ FAIL=0 export VSOMEIP_CONFIGURATION=offer_test_big_sd_msg_slave.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! sleep 1 # Start the services diff --git a/test/offer_tests/offer_test_client.cpp b/test/offer_tests/offer_test_client.cpp index b337199..11446fb 100644 --- a/test/offer_tests/offer_test_client.cpp +++ b/test/offer_tests/offer_test_client.cpp @@ -16,8 +16,13 @@ #include <gtest/gtest.h> #include <vsomeip/vsomeip.hpp> -#include "../../implementation/logging/include/logger.hpp" -#include "../../implementation/configuration/include/internal.hpp" +#include <vsomeip/internal/logger.hpp> + +#ifdef ANDROID +#include "../../configuration/include/internal_android.hpp" +#else +#include "../../configuration/include/internal.hpp" +#endif // ANDROID #include "offer_test_globals.hpp" @@ -32,7 +37,6 @@ public: service_info_(_service_info), operation_mode_(_mode), app_(vsomeip::runtime::get()->create_application("offer_test_client")), - service_available_(false), wait_until_registered_(true), wait_until_service_available_(true), wait_for_stop_(true), @@ -68,11 +72,10 @@ public: its_eventgroups.insert(service_info_.eventgroup_id); app_->request_event(service_info_.service_id, service_info_.instance_id, service_info_.event_id, - its_eventgroups, false); + its_eventgroups, vsomeip::event_type_e::ET_EVENT); app_->subscribe(service_info_.service_id, service_info_.instance_id, - service_info_.eventgroup_id, vsomeip::DEFAULT_MAJOR, - vsomeip::subscription_type_e::SU_RELIABLE_AND_UNRELIABLE); + service_info_.eventgroup_id, vsomeip::DEFAULT_MAJOR); } app_->start(); @@ -124,10 +127,10 @@ public: vsomeip::byte_t *d = its_payload->get_data(); static std::uint32_t number_received_notifications(0); std::uint32_t counter(0); - counter |= d[0] << 24; - counter |= d[1] << 16; - counter |= d[2] << 8; - counter |= d[3]; + counter |= static_cast<std::uint32_t>(d[0] << 24); + counter |= static_cast<std::uint32_t>(d[0] << 16); + counter = counter | static_cast<std::uint32_t>((d[2] << 8)); + counter = counter | static_cast<std::uint32_t>(d[3]); VSOMEIP_DEBUG << "Received a notification with Client/Session [" << std::setw(4) @@ -227,7 +230,6 @@ private: struct offer_test::service_info service_info_; operation_mode_e operation_mode_; std::shared_ptr<vsomeip::application> app_; - bool service_available_; bool wait_until_registered_; bool wait_until_service_available_; diff --git a/test/offer_tests/offer_test_external_slave_starter.sh b/test/offer_tests/offer_test_external_slave_starter.sh index d7f08fb..5c30e87 100755 --- a/test/offer_tests/offer_test_external_slave_starter.sh +++ b/test/offer_tests/offer_test_external_slave_starter.sh @@ -15,7 +15,7 @@ FAIL=0 export VSOMEIP_CONFIGURATION=offer_test_external_slave.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! sleep 1 # Start the services diff --git a/test/offer_tests/offer_test_local.json b/test/offer_tests/offer_test_local.json index a54049c..be8aa09 100644 --- a/test/offer_tests/offer_test_local.json +++ b/test/offer_tests/offer_test_local.json @@ -11,7 +11,7 @@ }, "dlt":"false" }, - "routing":"vsomeipd", + "routing":"routingmanagerd", "service-discovery": { "enable":"false" diff --git a/test/offer_tests/offer_test_local_starter.sh b/test/offer_tests/offer_test_local_starter.sh index 38efbb6..6e5af18 100755 --- a/test/offer_tests/offer_test_local_starter.sh +++ b/test/offer_tests/offer_test_local_starter.sh @@ -76,7 +76,7 @@ End-of-message CLIENT_PIDS=() export VSOMEIP_CONFIGURATION=offer_test_local.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! # Start the services @@ -128,7 +128,7 @@ End-of-message CLIENT_PIDS=() export VSOMEIP_CONFIGURATION=offer_test_local.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! # Start the service ./offer_test_service 2 & @@ -186,7 +186,7 @@ End-of-message CLIENT_PIDS=() export VSOMEIP_CONFIGURATION=offer_test_local.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! # Start the service ./offer_test_service 2 & @@ -247,7 +247,7 @@ End-of-message CLIENT_PIDS=() export VSOMEIP_CONFIGURATION=offer_test_local.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! # Start the service ./offer_test_service 2 & diff --git a/test/offer_tests/offer_test_service.cpp b/test/offer_tests/offer_test_service.cpp index 13c193f..c56d005 100644 --- a/test/offer_tests/offer_test_service.cpp +++ b/test/offer_tests/offer_test_service.cpp @@ -16,7 +16,7 @@ #include <gtest/gtest.h> #include <vsomeip/vsomeip.hpp> -#include "../../implementation/logging/include/logger.hpp" +#include <vsomeip/internal/logger.hpp> #include "offer_test_globals.hpp" @@ -26,11 +26,11 @@ class offer_test_service { public: offer_test_service(struct offer_test::service_info _service_info) : service_info_(_service_info), - // service with number 1 uses "vsomeipd" as application name + // service with number 1 uses "routingmanagerd" as application name // this way the same json file can be reused for all local tests - // including the ones with vsomeipd + // including the ones with routingmanagerd app_(vsomeip::runtime::get()->create_application( - (service_number == "1") ? "vsomeipd" : + (service_number == "1") ? "routingmanagerd" : "offer_test_service" + service_number)), counter_(0), wait_until_registered_(true), @@ -48,7 +48,9 @@ public: std::set<vsomeip::eventgroup_t> its_eventgroups; its_eventgroups.insert(service_info_.eventgroup_id); app_->offer_event(service_info_.service_id, service_info_.instance_id, - service_info_.event_id, its_eventgroups, false); + service_info_.event_id, its_eventgroups, + vsomeip::event_type_e::ET_EVENT, std::chrono::milliseconds::zero(), + false, true, nullptr, vsomeip::reliability_type_e::RT_UNKNOWN); inc_counter_and_notify(); diff --git a/test/offer_tests/offer_test_service_external.cpp b/test/offer_tests/offer_test_service_external.cpp index 694a678..5948f74 100644 --- a/test/offer_tests/offer_test_service_external.cpp +++ b/test/offer_tests/offer_test_service_external.cpp @@ -15,7 +15,7 @@ #include <gtest/gtest.h> #include <vsomeip/vsomeip.hpp> -#include "../../implementation/logging/include/logger.hpp" +#include <vsomeip/internal/logger.hpp> #include "offer_test_globals.hpp" @@ -25,11 +25,11 @@ class offer_test_service { public: offer_test_service(struct offer_test::service_info _service_info) : service_info_(_service_info), - // service with number 1 uses "vsomeipd" as application name + // service with number 1 uses "routingmanagerd" as application name // this way the same json file can be reused for all local tests - // including the ones with vsomeipd + // including the ones with routingmanagerd app_(vsomeip::runtime::get()->create_application( - (service_number == "1") ? "vsomeipd" : + (service_number == "1") ? "routingmanagerd" : "offer_test_service" + service_number)), wait_until_registered_(true), wait_until_service_available_(true), |