1 files changed, 8 insertions, 6 deletions
diff --git a/test/routing_tests/local_routing_test_client.cpp b/test/routing_tests/local_routing_test_client.cpp
index f280eb2..a9acb44 100644
--- a/test/routing_tests/local_routing_test_client.cpp
+++ b/test/routing_tests/local_routing_test_client.cpp
@@ -18,11 +18,11 @@ local_routing_test_client::local_routing_test_client(bool _use_tcp) :
 {
 }
 
-void local_routing_test_client::init()
+bool local_routing_test_client::init()
 {
     if (!app_->init()) {
-        VSOMEIP_ERROR << "Couldn't initialize application";
-        EXPECT_TRUE(false);
+        ADD_FAILURE() << "Couldn't initialize application";
+        return false;
     }
 
     app_->register_state_handler(
@@ -39,6 +39,7 @@ void local_routing_test_client::init()
             std::bind(&local_routing_test_client::on_availability, this,
                     std::placeholders::_1, std::placeholders::_2,
                     std::placeholders::_3));
+    return true;
 }
 
 void local_routing_test_client::start()
@@ -152,9 +153,10 @@ TEST(someip_local_routing_test, send_ten_messages_to_service_and_receive_reply)
 {
     bool use_tcp = false;
     local_routing_test_client test_client_(use_tcp);
-    test_client_.init();
-    test_client_.start();
-    test_client_.join_sender_thread();
+    if (test_client_.init()) {
+        test_client_.start();
+        test_client_.join_sender_thread();
+    }
 }
 
 #ifndef WIN32