From 6f2bcb6f2916b3d0f2d78e64483db352b329eda0 Mon Sep 17 00:00:00 2001
From: Aleksandar Kanchev <kanchev@itestra.com>
Date: Mon, 25 Feb 2013 18:27:27 +0100
Subject: [PATCH] tests: correct bus name in DBusProxyTest

---
 src/test/DBusProxyTest.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/test/DBusProxyTest.cpp b/src/test/DBusProxyTest.cpp
index e583f38..4801e90 100644
--- a/src/test/DBusProxyTest.cpp
+++ b/src/test/DBusProxyTest.cpp
@@ -30,7 +30,7 @@
 
 
 static const std::string commonApiAddress = "local:CommonAPI.DBus.tests.DBusProxyTestInterface:CommonAPI.DBus.tests.DBusProxyTestService";
-static const std::string commonApiServiceName = "CommonAPI.DBus.tests.DBusProxyTest";
+static const std::string commonApiServiceName = "CommonAPI.DBus.tests.DBusProxyTestInterface";
 static const std::string interfaceName = "CommonAPI.DBus.tests.DBusProxyTestInterface";
 static const std::string busName = "CommonAPI.DBus.tests.DBusProxyTestService";
 static const std::string objectPath = "/CommonAPI/DBus/tests/DBusProxyTestService";
@@ -201,20 +201,10 @@ TEST_F(ProxyTest, ServiceStatus) {
 }
 
 TEST_F(ProxyTest, IsAvailableBlocking) {
-    std::shared_ptr<commonapi::tests::TestInterfaceStubDefault> stubDefault = std::make_shared<commonapi::tests::TestInterfaceStubDefault>();
-    std::shared_ptr<commonapi::tests::TestInterfaceDBusStubAdapter> stubAdapter =  std::make_shared<commonapi::tests::TestInterfaceDBusStubAdapter>(
-                    commonApiAddress,
-                    interfaceName,
-                    busName,
-                    objectPath,
-                    proxyDBusConnection_,
-                    stubDefault);
-
-    stubAdapter->init();
+    registerTestStub();
 
-    bool registered = proxyDBusConnection_->requestServiceNameAndBlock(busName);
-    bool isAvailable = proxy_->isAvailableBlocking();
-    EXPECT_EQ(registered, isAvailable);
+    const bool isAvailable = proxy_->isAvailableBlocking();
+    EXPECT_TRUE(isAvailable);
 }
 
 TEST_F(ProxyTest, HasNecessaryAttributesAndEvents) {
-- 
2.7.4