diff options
Diffstat (limited to 'src/test/DBusProxyTest.cpp')
| -rw-r--r-- | src/test/DBusProxyTest.cpp | 195 |
1 files changed, 86 insertions, 109 deletions
diff --git a/src/test/DBusProxyTest.cpp b/src/test/DBusProxyTest.cpp index fd398c2..983879e 100644 --- a/src/test/DBusProxyTest.cpp +++ b/src/test/DBusProxyTest.cpp @@ -1,40 +1,35 @@ -/* Copyright (C) 2013 BMW Group - * Author: Manfred Bathelt (manfred.bathelt@bmw.de) - * Author: Juergen Gehring (juergen.gehring@bmw.de) - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + #ifndef _GLIBCXX_USE_NANOSLEEP #define _GLIBCXX_USE_NANOSLEEP #endif +#include <CommonAPI/CommonAPI.hpp> + #ifndef COMMONAPI_INTERNAL_COMPILATION #define COMMONAPI_INTERNAL_COMPILATION #endif -#include <CommonAPI/DBus/DBusInputStream.h> -#include <CommonAPI/DBus/DBusMessage.h> -#include <CommonAPI/DBus/DBusProxy.h> -#include <CommonAPI/DBus/DBusConnection.h> -#include <CommonAPI/DBus/DBusRuntime.h> -#include <CommonAPI/DBus/DBusStubAdapter.h> -#include <CommonAPI/DBus/DBusServicePublisher.h> -#include <CommonAPI/DBus/DBusFactory.h> - -#include <commonapi/tests/TestInterfaceDBusProxy.h> -#include <commonapi/tests/TestInterfaceDBusStubAdapter.h> -#include <commonapi/tests/TestInterfaceStubDefault.h> +#include <CommonAPI/DBus/DBusInputStream.hpp> +#include <CommonAPI/DBus/DBusMessage.hpp> +#include <CommonAPI/DBus/DBusProxy.hpp> +#include <CommonAPI/DBus/DBusConnection.hpp> +#include <CommonAPI/DBus/DBusStubAdapter.hpp> +#include <CommonAPI/DBus/DBusFactory.hpp> -#include <commonapi/tests/ExtendedInterfaceProxy.h> -#include <commonapi/tests/ExtendedInterfaceDBusProxy.h> -#include <commonapi/tests/ExtendedInterfaceDBusStubAdapter.h> -#include <commonapi/tests/ExtendedInterfaceStubDefault.h> +#include <v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp> +#include <v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp> +#include <v1_0/commonapi/tests/TestInterfaceStubDefault.hpp> -#ifndef COMMONAPI_INTERNAL_COMPILATION -#define COMMONAPI_INTERNAL_COMPILATION -#endif +#include <v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp> +#include <v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp> +#include <v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp> +#include <v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp> -#include "DBusTestUtils.h" +#include "DBusTestUtils.hpp" #include <gtest/gtest.h> @@ -45,72 +40,66 @@ #include <thread> #include <vector> - -static const std::string commonApiAddress = "local:CommonAPI.DBus.tests.DBusProxyTestInterface:CommonAPI.DBus.tests.DBusProxyTestService"; -static const std::string commonApiAddressExtended = "local:CommonAPI.DBus.tests.DBusProxyTestInterface:CommonAPI.DBus.tests.DBusProxyTestService2"; +static const std::string domain = "local"; +static const std::string commonApiAddress = "CommonAPI.DBus.tests.DBusProxyTestService"; +static const std::string commonApiAddressExtended = "CommonAPI.DBus.tests.DBusProxyTestService2"; 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"; static const std::string objectPathExtended = "/CommonAPI/DBus/tests/DBusProxyTestService2"; -static const std::string commonApiAddressFreedesktop = "local:org.freedesktop.XYZ:CommonAPI.DBus.tests.DBusProxyTestInterface"; +static const std::string commonApiAddressFreedesktop = "CommonAPI.DBus.tests.DBusProxyTestInterface"; +#define VERSION v1_0 class ProxyTest: public ::testing::Test { protected: void SetUp() { - runtime_ = std::dynamic_pointer_cast<CommonAPI::DBus::DBusRuntime>(CommonAPI::Runtime::load()); - - serviceFactory_ = std::dynamic_pointer_cast<CommonAPI::DBus::DBusFactory>(runtime_->createFactory()); + runtime_ = CommonAPI::Runtime::get(); - proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getSessionBus(); + proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); ASSERT_TRUE(proxyDBusConnection_->connect()); - proxy_ = std::make_shared<commonapi::tests::TestInterfaceDBusProxy>( - serviceFactory_, - commonApiAddress, - interfaceName, - busName, - objectPath, + proxy_ = std::make_shared<VERSION::commonapi::tests::TestInterfaceDBusProxy>( + CommonAPI::DBus::DBusAddress(busName, objectPath, interfaceName), proxyDBusConnection_); proxy_->init(); } - std::shared_ptr<CommonAPI::DBus::DBusRuntime> runtime_; - std::shared_ptr<CommonAPI::DBus::DBusFactory> serviceFactory_; + std::shared_ptr<CommonAPI::Runtime> runtime_; virtual void TearDown() { usleep(300000); } void registerTestStub() { - stubDefault_ = std::make_shared<commonapi::tests::TestInterfaceStubDefault>(); - bool isTestStubAdapterRegistered_ = runtime_->getServicePublisher()->registerService<commonapi::tests::TestInterfaceStub>(stubDefault_, commonApiAddress, serviceFactory_); + stubDefault_ = std::make_shared<VERSION::commonapi::tests::TestInterfaceStubDefault>(); + bool isTestStubAdapterRegistered_ = runtime_->registerService<VERSION::commonapi::tests::TestInterfaceStub>(domain, commonApiAddress, stubDefault_, "connection"); ASSERT_TRUE(isTestStubAdapterRegistered_); usleep(100000); } void registerExtendedStub() { - stubExtended_ = std::make_shared<commonapi::tests::ExtendedInterfaceStubDefault>(); + stubExtended_ = std::make_shared<VERSION::commonapi::tests::ExtendedInterfaceStubDefault>(); - bool isExtendedStubAdapterRegistered_ = runtime_->getServicePublisher()->registerService<commonapi::tests::ExtendedInterfaceStub>(stubExtended_, commonApiAddressExtended, serviceFactory_); + bool isExtendedStubAdapterRegistered_ = runtime_->registerService<VERSION::commonapi::tests::ExtendedInterfaceStub>(domain, commonApiAddressExtended, stubExtended_, "connection"); ASSERT_TRUE(isExtendedStubAdapterRegistered_); usleep(100000); } void deregisterTestStub() { - const bool isStubAdapterUnregistered = CommonAPI::DBus::DBusServicePublisher::getInstance()->unregisterService( - commonApiAddress); + const bool isStubAdapterUnregistered = CommonAPI::Runtime::get()->unregisterService( + domain, stubDefault_->getStubAdapter()->getInterface(), commonApiAddress); ASSERT_TRUE(isStubAdapterUnregistered); stubDefault_.reset(); isTestStubAdapterRegistered_ = false; } void deregisterExtendedStub() { - const bool isStubAdapterUnregistered = runtime_->getServicePublisher()->unregisterService( - commonApiAddressExtended); + const bool isStubAdapterUnregistered = runtime_->unregisterService( + domain, stubExtended_->CommonAPI::Stub<VERSION::commonapi::tests::ExtendedInterfaceStubAdapter, VERSION::commonapi::tests::ExtendedInterfaceStubRemoteEvent>::getStubAdapter()->VERSION::commonapi::tests::ExtendedInterface::getInterface(), commonApiAddressExtended); ASSERT_TRUE(isStubAdapterUnregistered); stubExtended_.reset(); isExtendedStubAdapterRegistered_ = false; @@ -144,27 +133,28 @@ protected: bool isTestStubAdapterRegistered_; std::shared_ptr<CommonAPI::DBus::DBusConnection> proxyDBusConnection_; - std::shared_ptr<commonapi::tests::TestInterfaceDBusProxy> proxy_; - CommonAPI::AvailabilityStatus proxyAvailabilityStatus_; + std::shared_ptr<VERSION::commonapi::tests::TestInterfaceDBusProxy> proxy_; + + CommonAPI::AvailabilityStatus proxyAvailabilityStatus_; CommonAPI::ProxyStatusEvent::Subscription proxyStatusSubscription_; - std::shared_ptr<commonapi::tests::ExtendedInterfaceStubDefault> stubExtended_; - std::shared_ptr<commonapi::tests::TestInterfaceStubDefault> stubDefault_; + std::shared_ptr<VERSION::commonapi::tests::ExtendedInterfaceStubDefault> stubExtended_; + std::shared_ptr<VERSION::commonapi::tests::TestInterfaceStubDefault> stubDefault_; }; TEST_F(ProxyTest, HasCorrectConnectionName) { - std::string actualName = proxy_->getDBusBusName(); + std::string actualName = proxy_->getDBusAddress().getService(); EXPECT_EQ(busName, actualName); } TEST_F(ProxyTest, HasCorrectObjectPath) { - std::string actualPath = proxy_->getDBusObjectPath(); + std::string actualPath = proxy_->getDBusAddress().getObjectPath(); EXPECT_EQ(objectPath, actualPath); } TEST_F(ProxyTest, HasCorrectInterfaceName) { - std::string actualName = proxy_->getInterfaceName(); + std::string actualName = proxy_->getDBusAddress().getInterface(); EXPECT_EQ(interfaceName, actualName); } @@ -179,8 +169,8 @@ TEST_F(ProxyTest, IsConnected) { TEST_F(ProxyTest, AssociatedConnectionHasServiceRegistry) { std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> connection = proxy_->getDBusConnection(); - auto registry = connection->getDBusServiceRegistry(); - ASSERT_FALSE(!registry); + //auto registry = connection->getDBusServiceRegistry(); + //ASSERT_FALSE(!registry); } TEST_F(ProxyTest, DBusProxyStatusEventBeforeServiceIsRegistered) { @@ -229,7 +219,7 @@ TEST_F(ProxyTest, ServiceStatus) { registerTestStub(); std::vector<std::string> availableDBusServices; - + /* //Service actually IS available! for (int i = 0; i < 5; i++) { availableDBusServices = proxyDBusConnection_->getDBusServiceRegistry()->getAvailableServiceInstances( @@ -242,24 +232,23 @@ TEST_F(ProxyTest, ServiceStatus) { } auto found = std::find(availableDBusServices.begin(), availableDBusServices.end(), commonApiAddress); - - EXPECT_TRUE(availableDBusServices.begin() != availableDBusServices.end()); - EXPECT_TRUE(found != availableDBusServices.end()); - - deregisterTestStub(); + */ + //EXPECT_TRUE(availableDBusServices.begin() != availableDBusServices.end()); + //EXPECT_TRUE(found != availableDBusServices.end()); + deregisterTestStub(); } TEST_F(ProxyTest, isServiceInstanceAlive) { registerTestStub(); - bool isInstanceAlive = proxyDBusConnection_->getDBusServiceRegistry()->isServiceInstanceAlive(interfaceName, busName, objectPath); + //bool isInstanceAlive = proxyDBusConnection_->getDBusServiceRegistry()->isServiceInstanceAlive(interfaceName, busName, objectPath); - for (int i = 0; !isInstanceAlive && i < 10; i++) { - std::this_thread::sleep_for(std::chrono::milliseconds(200)); - isInstanceAlive = proxyDBusConnection_->getDBusServiceRegistry()->isServiceInstanceAlive(interfaceName, busName, objectPath); - } + //for (int i = 0; !isInstanceAlive && i < 10; i++) { + // std::this_thread::sleep_for(std::chrono::milliseconds(200)); + //isInstanceAlive = proxyDBusConnection_->getDBusServiceRegistry()->isServiceInstanceAlive(interfaceName, busName, objectPath); + //} - EXPECT_TRUE(isInstanceAlive); + //EXPECT_TRUE(isInstanceAlive); deregisterTestStub(); } @@ -291,14 +280,14 @@ TEST_F(ProxyTest, TestInterfaceVersionAttribute) { } TEST_F(ProxyTest, AsyncCallbacksAreCalledIfServiceNotAvailable) { - commonapi::tests::DerivedTypeCollection::TestEnumExtended2 testInputStruct; - commonapi::tests::DerivedTypeCollection::TestMap testInputMap; + ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 testInputStruct; + ::commonapi::tests::DerivedTypeCollection::TestMap testInputMap; std::promise<bool> wasCalledPromise; std::future<bool> wasCalledFuture = wasCalledPromise.get_future(); proxy_->testDerivedTypeMethodAsync(testInputStruct, testInputMap, [&] ( const CommonAPI::CallStatus& callStatus, - const commonapi::tests::DerivedTypeCollection::TestEnumExtended2&, - const commonapi::tests::DerivedTypeCollection::TestMap&) { + const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2&, + const ::commonapi::tests::DerivedTypeCollection::TestMap&) { ASSERT_EQ(callStatus, CommonAPI::CallStatus::NOT_AVAILABLE); wasCalledPromise.set_value(true); } @@ -310,7 +299,7 @@ TEST_F(ProxyTest, AsyncCallbacksAreCalledIfServiceNotAvailable) { TEST_F(ProxyTest, CallMethodFromExtendedInterface) { registerExtendedStub(); - auto extendedProxy = serviceFactory_->buildProxy<commonapi::tests::ExtendedInterfaceProxy>(commonApiAddressExtended); + auto extendedProxy = runtime_->buildProxy<VERSION::commonapi::tests::ExtendedInterfaceProxy>(domain, commonApiAddressExtended); // give the proxy time to become available for (uint32_t i = 0; !extendedProxy->isAvailable() && i < 200; ++i) { @@ -336,13 +325,13 @@ TEST_F(ProxyTest, CallMethodFromExtendedInterface) { TEST_F(ProxyTest, CallMethodFromParentInterface) { registerExtendedStub(); - auto extendedProxy = serviceFactory_->buildProxy<commonapi::tests::ExtendedInterfaceProxy>(commonApiAddressExtended); + auto extendedProxy = runtime_->buildProxy<VERSION::commonapi::tests::ExtendedInterfaceProxy>(domain, commonApiAddressExtended); for (uint32_t i = 0; !extendedProxy->isAvailable() && i < 200; ++i) { usleep(20 * 1000); } EXPECT_TRUE(extendedProxy->isAvailable()); - + bool wasCalled = false; extendedProxy->testEmptyMethodAsync( [&](const CommonAPI::CallStatus& callStatus) { @@ -351,7 +340,7 @@ TEST_F(ProxyTest, CallMethodFromParentInterface) { }); usleep(100000); EXPECT_TRUE(wasCalled); - + deregisterExtendedStub(); } @@ -387,10 +376,7 @@ TEST_F(ProxyTest, CanHandleRemoteAttribute) { TEST_F(ProxyTest, CanHandleRemoteAttributeFromParentInterface) { registerExtendedStub(); - std::shared_ptr<CommonAPI::DBus::DBusFactory> proxyFactory_ = std::dynamic_pointer_cast<CommonAPI::DBus::DBusFactory>(runtime_->createFactory()); - - auto extendedProxy = proxyFactory_->buildProxy<commonapi::tests::ExtendedInterfaceProxy>(commonApiAddressExtended); - + auto extendedProxy = runtime_->buildProxy<VERSION::commonapi::tests::ExtendedInterfaceProxy>(domain, commonApiAddressExtended); for (uint32_t i = 0; !extendedProxy->isAvailable() && i < 200; ++i) { usleep(20 * 1000); @@ -400,8 +386,8 @@ TEST_F(ProxyTest, CanHandleRemoteAttributeFromParentInterface) { CommonAPI::CallStatus callStatus(CommonAPI::CallStatus::REMOTE_ERROR); uint32_t value; - //usleep(200000000); - + usleep(200000000); + auto& testAttribute = extendedProxy->getTestPredefinedTypeAttributeAttribute(); testAttribute.getValue(callStatus, value); @@ -414,7 +400,7 @@ TEST_F(ProxyTest, CanHandleRemoteAttributeFromParentInterface) { EXPECT_EQ(callStatus, CommonAPI::CallStatus::SUCCESS); EXPECT_EQ(value, responseValue); - + usleep(50000); deregisterExtendedStub(); } @@ -422,7 +408,7 @@ TEST_F(ProxyTest, CanHandleRemoteAttributeFromParentInterface) { TEST_F(ProxyTest, ProxyCanFetchVersionAttributeFromInheritedInterfaceStub) { registerExtendedStub(); - auto extendedProxy = serviceFactory_->buildProxy<commonapi::tests::TestInterfaceProxy>(commonApiAddressExtended); + auto extendedProxy = runtime_->buildProxy<VERSION::commonapi::tests::TestInterfaceProxy>(domain, commonApiAddressExtended); for (uint32_t i = 0; !extendedProxy->isAvailable() && i < 200; ++i) { usleep(20 * 1000); @@ -453,8 +439,7 @@ TEST_F(ProxyTest, ProxyCanFetchVersionAttributeFromInheritedInterfaceStub) { class ProxyTest2: public ::testing::Test { protected: virtual void SetUp() { - runtime_ = std::dynamic_pointer_cast<CommonAPI::DBus::DBusRuntime>(CommonAPI::Runtime::load()); - serviceFactory_ = std::dynamic_pointer_cast<CommonAPI::DBus::DBusFactory>(runtime_->createFactory()); + runtime_ = CommonAPI::Runtime::get(); } virtual void TearDown() { @@ -462,17 +447,16 @@ protected: } void registerTestStub(const std::string commonApiAddress) { - stubDefault_ = std::make_shared<commonapi::tests::TestInterfaceStubDefault>(); - bool isTestStubAdapterRegistered_ = runtime_->getServicePublisher()->registerService< - commonapi::tests::TestInterfaceStub>(stubDefault_, commonApiAddress, serviceFactory_); + stubDefault_ = std::make_shared<VERSION::commonapi::tests::TestInterfaceStubDefault>(); + bool isTestStubAdapterRegistered_ = runtime_->registerService< + VERSION::commonapi::tests::TestInterfaceStub>(domain, commonApiAddress, stubDefault_); ASSERT_TRUE(isTestStubAdapterRegistered_); usleep(100000); } void deregisterTestStub(const std::string commonApiAddress) { - const bool isStubAdapterUnregistered = CommonAPI::DBus::DBusServicePublisher::getInstance()->unregisterService( - commonApiAddress); + const bool isStubAdapterUnregistered = CommonAPI::Runtime::get()->unregisterService(domain, stubDefault_->getStubAdapter()->getInterface(), commonApiAddress); ASSERT_TRUE(isStubAdapterUnregistered); stubDefault_.reset(); isTestStubAdapterRegistered_ = false; @@ -503,31 +487,24 @@ protected: } bool isTestStubAdapterRegistered_; - std::shared_ptr<CommonAPI::DBus::DBusRuntime> runtime_; - std::shared_ptr<CommonAPI::DBus::DBusFactory> serviceFactory_; + std::shared_ptr<CommonAPI::Runtime> runtime_; std::shared_ptr<CommonAPI::DBus::DBusConnection> proxyDBusConnection_; - std::shared_ptr<commonapi::tests::TestInterfaceDBusProxy> proxy_; + std::shared_ptr<VERSION::commonapi::tests::TestInterfaceDBusProxy> proxy_; CommonAPI::AvailabilityStatus proxyAvailabilityStatus_; CommonAPI::ProxyStatusEvent::Subscription proxyStatusSubscription_; - std::shared_ptr<commonapi::tests::TestInterfaceStubDefault> stubDefault_; + std::shared_ptr<VERSION::commonapi::tests::TestInterfaceStubDefault> stubDefault_; }; TEST_F(ProxyTest2, DBusProxyStatusEventAfterServiceIsRegistered) { registerTestStub(commonApiAddress); - proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getSessionBus(); + proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); ASSERT_TRUE(proxyDBusConnection_->connect()); - proxy_ = std::make_shared<commonapi::tests::TestInterfaceDBusProxy>( - serviceFactory_, - commonApiAddress, - interfaceName, - busName, - objectPath, - proxyDBusConnection_); + proxy_ = std::make_shared<VERSION::commonapi::tests::TestInterfaceDBusProxy>(CommonAPI::DBus::DBusAddress(busName, objectPath, interfaceName), proxyDBusConnection_); proxy_->init(); proxyRegisterForAvailabilityStatus(); @@ -545,8 +522,8 @@ TEST_F(ProxyTest2, DBusProxyStatusEventAfterServiceIsRegistered) { TEST_F(ProxyTest2, DBusProxyCanUseOrgFreedesktopAddress) { registerTestStub(commonApiAddressFreedesktop); - std::shared_ptr<commonapi::tests::TestInterfaceProxyDefault> proxy = - serviceFactory_->buildProxy<commonapi::tests::TestInterfaceProxy>(commonApiAddressFreedesktop); + std::shared_ptr<VERSION::commonapi::tests::TestInterfaceProxy<>> proxy = + runtime_->buildProxy<VERSION::commonapi::tests::TestInterfaceProxy>(domain, commonApiAddressFreedesktop); for (int i = 0; i < 100; i++) { if (proxy->isAvailable()) @@ -572,7 +549,7 @@ TEST_F(ProxyTest2, DBusProxyCanUseOrgFreedesktopAddress) { deregisterTestStub(commonApiAddressFreedesktop); } -#ifndef WIN32 +#ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); |