From 3348a422ffc756b63de5890356383858a898e8b1 Mon Sep 17 00:00:00 2001 From: Dirk Huss Date: Wed, 9 Dec 2015 14:41:26 +0100 Subject: CommonAPI-D-Bus 3.1.5 --- .gitignore | 2 +- CMakeLists.txt | 8 +- README | 2 +- include/CommonAPI/DBus/DBusConnection.hpp | 17 +- include/CommonAPI/DBus/DBusEvent.hpp | 4 + include/CommonAPI/DBus/DBusInputStream.hpp | 2 +- include/CommonAPI/DBus/DBusProxy.hpp | 3 + include/CommonAPI/DBus/DBusProxyConnection.hpp | 3 + include/CommonAPI/DBus/DBusProxyManager.hpp | 1 + include/CommonAPI/DBus/DBusSelectiveEvent.hpp | 4 + include/CommonAPI/DBus/DBusStubAdapterHelper.hpp | 1 - src/CommonAPI/DBus/DBusConnection.cpp | 36 +++- src/CommonAPI/DBus/DBusFactory.cpp | 4 +- src/CommonAPI/DBus/DBusMainLoop.cpp | 11 +- src/CommonAPI/DBus/DBusProxy.cpp | 31 +++- src/CommonAPI/DBus/DBusProxyManager.cpp | 4 +- src/CommonAPI/DBus/DBusServiceRegistry.cpp | 26 ++- src/test/CMakeLists.txt | 8 +- src/test/DBusAddressTranslatorTest.cpp | 76 +++++++-- src/test/DBusBroadcastTest.cpp | 18 +- src/test/DBusCommunicationTest.cpp | 18 +- src/test/DBusConnectionTest.cpp | 4 +- src/test/DBusDaemonProxyTest.cpp | 4 +- src/test/DBusFactoryTest.cpp | 14 -- src/test/DBusFreedesktopPropertiesTest.cpp | 14 -- src/test/DBusLoadTest.cpp | 14 -- src/test/DBusMainLoopIntegrationTest.cpp | 14 -- src/test/DBusManagedTest.cpp | 181 ++++++++++++++++----- src/test/DBusMultipleConnectionTest.cpp | 14 -- src/test/DBusPolymorphicTest.cpp | 18 +- src/test/DBusProxyTest.cpp | 24 +-- src/test/FakeGlueCode.cpp | 5 - src/test/fakeLegacyService.fdepl | 16 ++ src/test/fakeLegacyService.fidl | 4 + src/test/fakeLegacyService/fakeLegacyService.py | 35 ++-- .../fakeLegacyService/sendToFakeLegacyService.py | 12 +- .../core/commonapi/tests/DerivedTypeCollection.cpp | 26 +-- .../core/commonapi/tests/DerivedTypeCollection.hpp | 114 +++++++------ .../commonapi/tests/PredefinedTypeCollection.hpp | 2 +- .../core/v1/commonapi/tests/ExtendedInterface.hpp | 8 +- .../v1/commonapi/tests/ExtendedInterfaceProxy.hpp | 8 +- .../commonapi/tests/ExtendedInterfaceProxyBase.hpp | 8 +- .../v1/commonapi/tests/ExtendedInterfaceStub.hpp | 8 +- .../tests/ExtendedInterfaceStubDefault.cpp | 2 +- .../tests/ExtendedInterfaceStubDefault.hpp | 8 +- .../tests/TestFreedesktopDerivedInterface.hpp | 8 +- .../tests/TestFreedesktopDerivedInterfaceProxy.hpp | 8 +- .../TestFreedesktopDerivedInterfaceProxyBase.hpp | 8 +- .../tests/TestFreedesktopDerivedInterfaceStub.hpp | 8 +- .../TestFreedesktopDerivedInterfaceStubDefault.cpp | 2 +- .../TestFreedesktopDerivedInterfaceStubDefault.hpp | 8 +- .../commonapi/tests/TestFreedesktopInterface.hpp | 8 +- .../tests/TestFreedesktopInterfaceProxy.hpp | 8 +- .../tests/TestFreedesktopInterfaceProxyBase.hpp | 8 +- .../tests/TestFreedesktopInterfaceStub.hpp | 8 +- .../tests/TestFreedesktopInterfaceStubDefault.cpp | 2 +- .../tests/TestFreedesktopInterfaceStubDefault.hpp | 8 +- .../core/v1/commonapi/tests/TestInterface.hpp | 8 +- .../v1/commonapi/tests/TestInterfaceManager.hpp | 8 +- .../commonapi/tests/TestInterfaceManagerProxy.hpp | 8 +- .../tests/TestInterfaceManagerProxyBase.hpp | 8 +- .../commonapi/tests/TestInterfaceManagerStub.hpp | 8 +- .../tests/TestInterfaceManagerStubDefault.cpp | 2 +- .../tests/TestInterfaceManagerStubDefault.hpp | 8 +- .../core/v1/commonapi/tests/TestInterfaceProxy.hpp | 8 +- .../v1/commonapi/tests/TestInterfaceProxyBase.hpp | 8 +- .../core/v1/commonapi/tests/TestInterfaceStub.hpp | 8 +- .../commonapi/tests/TestInterfaceStubDefault.cpp | 2 +- .../commonapi/tests/TestInterfaceStubDefault.hpp | 8 +- .../v1/commonapi/tests/managed/BranchInterface.cpp | 22 --- .../v1/commonapi/tests/managed/BranchInterface.hpp | 20 +-- .../tests/managed/BranchInterfaceProxy.hpp | 8 +- .../tests/managed/BranchInterfaceProxyBase.hpp | 8 +- .../tests/managed/BranchInterfaceStub.hpp | 8 +- .../tests/managed/BranchInterfaceStubDefault.cpp | 2 +- .../tests/managed/BranchInterfaceStubDefault.hpp | 8 +- .../v1/commonapi/tests/managed/LeafInterface.cpp | 22 --- .../v1/commonapi/tests/managed/LeafInterface.hpp | 20 +-- .../commonapi/tests/managed/LeafInterfaceProxy.hpp | 8 +- .../tests/managed/LeafInterfaceProxyBase.hpp | 8 +- .../commonapi/tests/managed/LeafInterfaceStub.hpp | 8 +- .../tests/managed/LeafInterfaceStubDefault.cpp | 2 +- .../tests/managed/LeafInterfaceStubDefault.hpp | 8 +- .../v1/commonapi/tests/managed/RootInterface.cpp | 22 --- .../v1/commonapi/tests/managed/RootInterface.hpp | 20 +-- .../commonapi/tests/managed/RootInterfaceProxy.hpp | 8 +- .../tests/managed/RootInterfaceProxyBase.hpp | 8 +- .../commonapi/tests/managed/RootInterfaceStub.hpp | 8 +- .../tests/managed/RootInterfaceStubDefault.cpp | 2 +- .../tests/managed/RootInterfaceStubDefault.hpp | 8 +- .../core/v1/commonapi/tests/managed/SecondRoot.hpp | 8 +- .../v1/commonapi/tests/managed/SecondRootProxy.hpp | 8 +- .../tests/managed/SecondRootProxyBase.hpp | 8 +- .../v1/commonapi/tests/managed/SecondRootStub.hpp | 8 +- .../tests/managed/SecondRootStubDefault.cpp | 2 +- .../tests/managed/SecondRootStubDefault.hpp | 8 +- .../v1/fake/legacy/service/LegacyInterface.hpp | 8 +- .../service/LegacyInterfaceNoObjectManager.hpp | 60 +++++++ .../LegacyInterfaceNoObjectManagerProxy.hpp | 134 +++++++++++++++ .../LegacyInterfaceNoObjectManagerProxyBase.hpp | 50 ++++++ .../service/LegacyInterfaceNoObjectManagerStub.hpp | 110 +++++++++++++ .../LegacyInterfaceNoObjectManagerStubDefault.cpp | 46 ++++++ .../LegacyInterfaceNoObjectManagerStubDefault.hpp | 72 ++++++++ .../fake/legacy/service/LegacyInterfaceProxy.hpp | 8 +- .../legacy/service/LegacyInterfaceProxyBase.hpp | 8 +- .../v1/fake/legacy/service/LegacyInterfaceStub.hpp | 8 +- .../legacy/service/LegacyInterfaceStubDefault.cpp | 2 +- .../legacy/service/LegacyInterfaceStubDefault.hpp | 8 +- .../tests/DerivedTypeCollectionDBusDeployment.cpp | 2 +- .../tests/DerivedTypeCollectionDBusDeployment.hpp | 2 +- .../PredefinedTypeCollectionDBusDeployment.cpp | 2 +- .../PredefinedTypeCollectionDBusDeployment.hpp | 2 +- .../tests/ExtendedInterfaceDBusDeployment.cpp | 2 +- .../tests/ExtendedInterfaceDBusDeployment.hpp | 8 +- .../commonapi/tests/ExtendedInterfaceDBusProxy.cpp | 2 +- .../commonapi/tests/ExtendedInterfaceDBusProxy.hpp | 8 +- .../tests/ExtendedInterfaceDBusStubAdapter.cpp | 2 +- .../tests/ExtendedInterfaceDBusStubAdapter.hpp | 8 +- ...stFreedesktopDerivedInterfaceDBusDeployment.cpp | 2 +- ...stFreedesktopDerivedInterfaceDBusDeployment.hpp | 8 +- .../TestFreedesktopDerivedInterfaceDBusProxy.cpp | 2 +- .../TestFreedesktopDerivedInterfaceDBusProxy.hpp | 8 +- ...tFreedesktopDerivedInterfaceDBusStubAdapter.cpp | 2 +- ...tFreedesktopDerivedInterfaceDBusStubAdapter.hpp | 8 +- .../TestFreedesktopInterfaceDBusDeployment.cpp | 2 +- .../TestFreedesktopInterfaceDBusDeployment.hpp | 8 +- .../tests/TestFreedesktopInterfaceDBusProxy.cpp | 2 +- .../tests/TestFreedesktopInterfaceDBusProxy.hpp | 8 +- .../TestFreedesktopInterfaceDBusStubAdapter.cpp | 2 +- .../TestFreedesktopInterfaceDBusStubAdapter.hpp | 8 +- .../tests/TestInterfaceDBusDeployment.cpp | 2 +- .../tests/TestInterfaceDBusDeployment.hpp | 8 +- .../v1/commonapi/tests/TestInterfaceDBusProxy.cpp | 2 +- .../v1/commonapi/tests/TestInterfaceDBusProxy.hpp | 8 +- .../tests/TestInterfaceDBusStubAdapter.cpp | 2 +- .../tests/TestInterfaceDBusStubAdapter.hpp | 8 +- .../tests/TestInterfaceManagerDBusDeployment.cpp | 2 +- .../tests/TestInterfaceManagerDBusDeployment.hpp | 8 +- .../tests/TestInterfaceManagerDBusProxy.cpp | 2 +- .../tests/TestInterfaceManagerDBusProxy.hpp | 8 +- .../tests/TestInterfaceManagerDBusStubAdapter.cpp | 2 +- .../tests/TestInterfaceManagerDBusStubAdapter.hpp | 8 +- .../managed/BranchInterfaceDBusDeployment.cpp | 2 +- .../managed/BranchInterfaceDBusDeployment.hpp | 8 +- .../tests/managed/BranchInterfaceDBusProxy.cpp | 2 +- .../tests/managed/BranchInterfaceDBusProxy.hpp | 8 +- .../managed/BranchInterfaceDBusStubAdapter.cpp | 2 +- .../managed/BranchInterfaceDBusStubAdapter.hpp | 8 +- .../tests/managed/LeafInterfaceDBusDeployment.cpp | 2 +- .../tests/managed/LeafInterfaceDBusDeployment.hpp | 8 +- .../tests/managed/LeafInterfaceDBusProxy.cpp | 2 +- .../tests/managed/LeafInterfaceDBusProxy.hpp | 8 +- .../tests/managed/LeafInterfaceDBusStubAdapter.cpp | 2 +- .../tests/managed/LeafInterfaceDBusStubAdapter.hpp | 8 +- .../tests/managed/RootInterfaceDBusDeployment.cpp | 2 +- .../tests/managed/RootInterfaceDBusDeployment.hpp | 8 +- .../tests/managed/RootInterfaceDBusProxy.cpp | 2 +- .../tests/managed/RootInterfaceDBusProxy.hpp | 8 +- .../tests/managed/RootInterfaceDBusStubAdapter.cpp | 2 +- .../tests/managed/RootInterfaceDBusStubAdapter.hpp | 8 +- .../tests/managed/SecondRootDBusDeployment.cpp | 2 +- .../tests/managed/SecondRootDBusDeployment.hpp | 8 +- .../tests/managed/SecondRootDBusProxy.cpp | 2 +- .../tests/managed/SecondRootDBusProxy.hpp | 8 +- .../tests/managed/SecondRootDBusStubAdapter.cpp | 2 +- .../tests/managed/SecondRootDBusStubAdapter.hpp | 8 +- .../service/LegacyInterfaceDBusDeployment.cpp | 2 +- .../service/LegacyInterfaceDBusDeployment.hpp | 8 +- .../legacy/service/LegacyInterfaceDBusProxy.cpp | 2 +- .../legacy/service/LegacyInterfaceDBusProxy.hpp | 8 +- .../service/LegacyInterfaceDBusStubAdapter.cpp | 2 +- .../service/LegacyInterfaceDBusStubAdapter.hpp | 8 +- ...egacyInterfaceNoObjectManagerDBusDeployment.cpp | 30 ++++ ...egacyInterfaceNoObjectManagerDBusDeployment.hpp | 45 +++++ .../LegacyInterfaceNoObjectManagerDBusProxy.cpp | 55 +++++++ .../LegacyInterfaceNoObjectManagerDBusProxy.hpp | 63 +++++++ ...gacyInterfaceNoObjectManagerDBusStubAdapter.cpp | 157 ++++++++++++++++++ ...gacyInterfaceNoObjectManagerDBusStubAdapter.hpp | 159 ++++++++++++++++++ src/test/test-commonapi-dbus.ini | 5 + 179 files changed, 1821 insertions(+), 789 deletions(-) delete mode 100644 src/test/FakeGlueCode.cpp create mode 100644 src/test/fakeLegacyService.fdepl delete mode 100644 src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp delete mode 100644 src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp delete mode 100644 src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp create mode 100644 src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp create mode 100644 src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxy.hpp create mode 100644 src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp create mode 100644 src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp create mode 100644 src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.cpp create mode 100644 src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.hpp create mode 100644 src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.cpp create mode 100644 src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp create mode 100644 src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.cpp create mode 100644 src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.hpp create mode 100644 src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.cpp create mode 100644 src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.hpp diff --git a/.gitignore b/.gitignore index 42ca389..4720f25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /build/* -.settings/* \ No newline at end of file +.settings/* diff --git a/CMakeLists.txt b/CMakeLists.txt index e456efc..2750c4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ PROJECT(libcommonapi-dbus) # version of CommonAPI-DBus SET( LIBCOMMONAPI_DBUS_MAJOR_VERSION 3 ) SET( LIBCOMMONAPI_DBUS_MINOR_VERSION 1 ) -SET( LIBCOMMONAPI_DBUS_PATCH_VERSION 4 ) +SET( LIBCOMMONAPI_DBUS_PATCH_VERSION 5 ) message(STATUS "Project name: ${PROJECT_NAME}") @@ -100,9 +100,9 @@ message(STATUS "CMAKE_FIND_ROOT_PATH: ${CMAKE_FIND_ROOT_PATH}") FIND_PACKAGE(PkgConfig) FIND_PACKAGE(Threads REQUIRED) if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON") - FIND_PACKAGE(CommonAPI 3.1.4 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY) + FIND_PACKAGE(CommonAPI 3.1.5 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY) else() - FIND_PACKAGE(CommonAPI 3.1.4 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) + FIND_PACKAGE(CommonAPI 3.1.5 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) endif() message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}") @@ -296,7 +296,7 @@ endif() # create pkg-config file if(NOT WIN32 AND PKG_CONFIG_FOUND) configure_file(CommonAPI-DBus.pc.in ${PROJECT_BINARY_DIR}/CommonAPI-DBus.pc @ONLY) - install(FILES ${PROJECT_BINARY_DIR}/CommonAPI-DBus.pc DESTINATION lib/pkconfig) + install(FILES ${PROJECT_BINARY_DIR}/CommonAPI-DBus.pc DESTINATION lib/pkgconfig) endif() ############################################################################## diff --git a/README b/README index a1c8d9b..44c0097 100644 --- a/README +++ b/README @@ -1,3 +1,3 @@ -This is CommonAPI-DBus 3.1.4 +This is CommonAPI-DBus 3.1.5 Please refer to INSTALL for further information. \ No newline at end of file diff --git a/include/CommonAPI/DBus/DBusConnection.hpp b/include/CommonAPI/DBus/DBusConnection.hpp index e3608da..f2fd516 100644 --- a/include/CommonAPI/DBus/DBusConnection.hpp +++ b/include/CommonAPI/DBus/DBusConnection.hpp @@ -57,12 +57,16 @@ class DBusConnection : public DBusProxyConnection, public std::enable_shared_from_this { public: - COMMONAPI_EXPORT static std::shared_ptr getBus(const DBusType_t &_type); - COMMONAPI_EXPORT static std::shared_ptr wrap(::DBusConnection *_connection); + COMMONAPI_EXPORT static std::shared_ptr getBus( + const DBusType_t &_type, const ConnectionId_t& _connectionId); + COMMONAPI_EXPORT static std::shared_ptr wrap( + ::DBusConnection *_connection, const ConnectionId_t& _connectionId); - COMMONAPI_EXPORT DBusConnection(DBusType_t _type); + COMMONAPI_EXPORT DBusConnection(DBusType_t _type, + const ConnectionId_t& _connectionId); COMMONAPI_EXPORT DBusConnection(const DBusConnection&) = delete; - COMMONAPI_EXPORT DBusConnection(::DBusConnection* libDbusConnection); + COMMONAPI_EXPORT DBusConnection(::DBusConnection* libDbusConnection, + const ConnectionId_t& _connectionId); COMMONAPI_EXPORT virtual ~DBusConnection(); COMMONAPI_EXPORT DBusConnection& operator=(const DBusConnection&) = delete; @@ -135,6 +139,8 @@ public: COMMONAPI_EXPORT virtual bool hasDispatchThread(); + COMMONAPI_EXPORT virtual const ConnectionId_t& getConnectionId() const; + #ifdef COMMONAPI_DBUS_TEST inline std::weak_ptr getLoop() { return loop_; } #endif @@ -199,6 +205,8 @@ public: COMMONAPI_EXPORT void enforceAsynchronousTimeouts() const; COMMONAPI_EXPORT static const DBusObjectPathVTable* getDBusObjectPathVTable(); + COMMONAPI_EXPORT bool sendPendingSelectiveSubscription(DBusProxy* proxy, std::string methodName); + ::DBusConnection* connection_; mutable std::mutex connectionGuard_; @@ -268,6 +276,7 @@ public: mutable std::shared_ptr enforcerThread_; mutable std::mutex enforcerThreadMutex_; bool enforcerThreadCancelled_; + ConnectionId_t connectionId_; std::shared_ptr loop_; diff --git a/include/CommonAPI/DBus/DBusEvent.hpp b/include/CommonAPI/DBus/DBusEvent.hpp index 550f4da..2637acf 100644 --- a/include/CommonAPI/DBus/DBusEvent.hpp +++ b/include/CommonAPI/DBus/DBusEvent.hpp @@ -77,6 +77,10 @@ public: handleSignalDBusMessage(tag, _message, typename make_sequence::type()); } + virtual void onError(const CommonAPI::CallStatus status) { + (void) status; + } + protected: virtual void onFirstListenerAdded(const Listener &_listener) { (void)_listener; diff --git a/include/CommonAPI/DBus/DBusInputStream.hpp b/include/CommonAPI/DBus/DBusInputStream.hpp index b4c81d1..9a3f74d 100644 --- a/include/CommonAPI/DBus/DBusInputStream.hpp +++ b/include/CommonAPI/DBus/DBusInputStream.hpp @@ -174,7 +174,7 @@ public: Types_... >::visit(visitor, _value, _depl, _value.valueType_); if (!success) { - _value.valueType_ = _value.maxSize + 1; + _value.valueType_ = 0; // Invalid index setError(); return (*this); } diff --git a/include/CommonAPI/DBus/DBusProxy.hpp b/include/CommonAPI/DBus/DBusProxy.hpp index ad5439e..04f2ca9 100644 --- a/include/CommonAPI/DBus/DBusProxy.hpp +++ b/include/CommonAPI/DBus/DBusProxy.hpp @@ -134,6 +134,9 @@ private: std::list signalMemberHandlerQueue_; CallInfo signalMemberHandlerInfo_; mutable std::mutex signalMemberHandlerQueueMutex_; + + std::map selectiveBroadcastHandlers; + mutable std::mutex selectiveBroadcastHandlersMutex_; }; diff --git a/include/CommonAPI/DBus/DBusProxyConnection.hpp b/include/CommonAPI/DBus/DBusProxyConnection.hpp index 0dc7cf2..bec052b 100644 --- a/include/CommonAPI/DBus/DBusProxyConnection.hpp +++ b/include/CommonAPI/DBus/DBusProxyConnection.hpp @@ -62,6 +62,7 @@ class DBusProxyConnection { virtual ~DBusSignalHandler() {} virtual void onSignalDBusMessage(const DBusMessage&) = 0; virtual void onInitialValueSignalDBusMessage(const DBusMessage&, const uint32_t) {}; + virtual void onError(const CommonAPI::CallStatus status) { (void) status; }; }; // objectPath, interfaceName, interfaceMemberName, interfaceMemberSignature @@ -132,6 +133,8 @@ class DBusProxyConnection { virtual bool isObjectPathMessageHandlerSet() = 0; virtual bool hasDispatchThread() = 0; + + virtual bool sendPendingSelectiveSubscription(DBusProxy* proxy, std::string methodName) = 0; }; } // namespace DBus diff --git a/include/CommonAPI/DBus/DBusProxyManager.hpp b/include/CommonAPI/DBus/DBusProxyManager.hpp index 15ed474..9540ead 100644 --- a/include/CommonAPI/DBus/DBusProxyManager.hpp +++ b/include/CommonAPI/DBus/DBusProxyManager.hpp @@ -21,6 +21,7 @@ #include #include #include +#include namespace CommonAPI { namespace DBus { diff --git a/include/CommonAPI/DBus/DBusSelectiveEvent.hpp b/include/CommonAPI/DBus/DBusSelectiveEvent.hpp index 05f2f5f..961063a 100644 --- a/include/CommonAPI/DBus/DBusSelectiveEvent.hpp +++ b/include/CommonAPI/DBus/DBusSelectiveEvent.hpp @@ -36,6 +36,10 @@ public: virtual ~DBusSelectiveEvent() {} + virtual void onError(const CommonAPI::CallStatus status) { + this->notifyError(status); + } + protected: void onFirstListenerAdded(const Listener &) { bool success; diff --git a/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp b/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp index b533a2e..0084360 100644 --- a/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp +++ b/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp @@ -327,7 +327,6 @@ class DBusMethodStubDispatcher, DeplIn_) { (void)dbusStubAdapterHelper; - std::tuple argTuple; if (sizeof...(InArgs_) > 0) { DBusInputStream dbusInputStream(dbusMessage); diff --git a/src/CommonAPI/DBus/DBusConnection.cpp b/src/CommonAPI/DBus/DBusConnection.cpp index c5ab406..47751cc 100644 --- a/src/CommonAPI/DBus/DBusConnection.cpp +++ b/src/CommonAPI/DBus/DBusConnection.cpp @@ -53,7 +53,8 @@ void DBusConnection::dispatch() { loop_->run(); } -DBusConnection::DBusConnection(DBusType_t busType) : +DBusConnection::DBusConnection(DBusType_t busType, + const ConnectionId_t& _connectionId) : dispatchThread_(NULL), stopDispatching_(false), dispatchSource_(), @@ -66,12 +67,14 @@ DBusConnection::DBusConnection(DBusType_t busType) : dbusObjectMessageHandler_(), connectionNameCount_(), enforcerThread_(NULL), - enforcerThreadCancelled_(false) { + enforcerThreadCancelled_(false), + connectionId_(_connectionId) { dbus_threads_init_default(); } -DBusConnection::DBusConnection(::DBusConnection *_connection) : +DBusConnection::DBusConnection(::DBusConnection *_connection, + const ConnectionId_t& _connectionId) : dispatchThread_(NULL), stopDispatching_(false), dispatchSource_(), @@ -84,7 +87,8 @@ DBusConnection::DBusConnection(::DBusConnection *_connection) : dbusObjectMessageHandler_(), connectionNameCount_(), enforcerThread_(NULL), - enforcerThreadCancelled_(false) { + enforcerThreadCancelled_(false), + connectionId_(_connectionId) { dbus_threads_init_default(); } @@ -805,6 +809,20 @@ bool DBusConnection::hasDispatchThread() { return (dispatchThread_ != NULL); } +const ConnectionId_t& DBusConnection::getConnectionId() const { + return connectionId_; +} + +bool DBusConnection::sendPendingSelectiveSubscription(DBusProxy* proxy, std::string methodName) { + bool subscriptionAccepted; + CommonAPI::CallStatus callStatus; + DBusProxyHelper, + CommonAPI::DBus::DBusSerializableArguments>::callMethodWithReply( + *proxy, methodName.c_str(), "", &CommonAPI::DBus::defaultCallInfo, callStatus, subscriptionAccepted); + + return subscriptionAccepted; +} + DBusProxyConnection::DBusSignalHandlerToken DBusConnection::subscribeForSelectiveBroadcast( bool& subscriptionAccepted, const std::string& objectPath, @@ -824,7 +842,7 @@ DBusProxyConnection::DBusSignalHandlerToken DBusConnection::subscribeForSelectiv *callingProxy, methodName.c_str(), "", &CommonAPI::DBus::defaultCallInfo, callStatus, subscriptionAccepted); DBusProxyConnection::DBusSignalHandlerToken subscriptionToken; - if (callStatus == CommonAPI::CallStatus::SUCCESS && subscriptionAccepted) { + if ((callStatus == CommonAPI::CallStatus::SUCCESS && subscriptionAccepted) || !callingProxy->isAvailable()) { subscriptionToken = addSignalMemberHandler( objectPath, interfaceName, @@ -1386,12 +1404,12 @@ void notifyDBusOMSignalHandlers(DBusSignalHandlersTable& dbusSignalHandlerstable return dbusConnection->onLibdbusObjectPathMessage(libdbusMessage); } -std::shared_ptr DBusConnection::getBus(const DBusType_t &_type) { - return std::make_shared(_type); +std::shared_ptr DBusConnection::getBus(const DBusType_t &_type, const ConnectionId_t& _connectionId) { + return std::make_shared(_type, _connectionId); } -std::shared_ptr DBusConnection::wrap(::DBusConnection *_connection) { - return std::make_shared(_connection); +std::shared_ptr DBusConnection::wrap(::DBusConnection *_connection, const ConnectionId_t& _connectionId) { + return std::make_shared(_connection, _connectionId); } } // namespace DBus diff --git a/src/CommonAPI/DBus/DBusFactory.cpp b/src/CommonAPI/DBus/DBusFactory.cpp index 6371da9..40da41f 100644 --- a/src/CommonAPI/DBus/DBusFactory.cpp +++ b/src/CommonAPI/DBus/DBusFactory.cpp @@ -230,7 +230,7 @@ Factory::getConnection(const ConnectionId_t &_connectionId) { // No connection found, lets create and initialize one DBusType_t dbusType = DBusAddressTranslator::get()->getDBusBusType(_connectionId); std::shared_ptr itsConnection - = std::make_shared(dbusType); + = std::make_shared(dbusType, _connectionId); connections_.insert({ _connectionId, itsConnection }); itsConnection->connect(true); @@ -249,7 +249,7 @@ Factory::getConnection(std::shared_ptr _context) { // No connection found, lets create and initialize one std::shared_ptr itsConnection - = std::make_shared(DBusType_t::SESSION); + = std::make_shared(DBusType_t::SESSION, _context->getName()); contextConnections_.insert({ _context.get(), itsConnection } ); itsConnection->connect(false); diff --git a/src/CommonAPI/DBus/DBusMainLoop.cpp b/src/CommonAPI/DBus/DBusMainLoop.cpp index f674387..a46072f 100755 --- a/src/CommonAPI/DBus/DBusMainLoop.cpp +++ b/src/CommonAPI/DBus/DBusMainLoop.cpp @@ -6,6 +6,7 @@ #ifdef WIN32 #include #include +#include #define DEFAULT_BUFLEN 512 #else #include @@ -558,7 +559,11 @@ void DBusMainLoop::wakeup() { int iResult = send(sendFd_.fd, sendbuf, (int)strlen(sendbuf), 0); if (iResult == SOCKET_ERROR) { - printf("send failed with error: %d\n", WSAGetLastError()); + int error = WSAGetLastError(); + + if (error != WSANOTINITIALISED) { + printf("send failed with error: %d\n", error); + } } #else int64_t wake = 1; @@ -644,7 +649,9 @@ void DBusMainLoop::registerWatch(Watch* watch, registerFileDescriptor(fdToRegister); std::mutex* mtx = new std::mutex; -#ifndef WIN32 +#ifdef WIN32 + std::atomic_signal_fence(std::memory_order_acq_rel); +#else asm volatile ("":::"memory"); #endif WatchToDispatchStruct* watchStruct = new WatchToDispatchStruct(fdToRegister.fd, watch, mtx, false, false); diff --git a/src/CommonAPI/DBus/DBusProxy.cpp b/src/CommonAPI/DBus/DBusProxy.cpp index 19f2eb0..e92d90c 100644 --- a/src/CommonAPI/DBus/DBusProxy.cpp +++ b/src/CommonAPI/DBus/DBusProxy.cpp @@ -131,6 +131,16 @@ void DBusProxy::onDBusServiceInstanceStatus(const AvailabilityStatus& availabili &signalMemberHandlerInfo_); } } + { + std::lock_guard < std::mutex > queueLock(selectiveBroadcastHandlersMutex_); + for (auto selectiveBroadcasts : selectiveBroadcastHandlers) { + std::string methodName = "subscribeFor" + selectiveBroadcasts.first + "Selective"; + bool subscriptionAccepted = connection_->sendPendingSelectiveSubscription(this, methodName); + if (!subscriptionAccepted) { + selectiveBroadcasts.second->onError(CommonAPI::CallStatus::SUBSCRIPTION_REFUSED); + } + } + } } else { std::lock_guard < std::mutex > queueLock(signalMemberHandlerQueueMutex_); @@ -163,7 +173,8 @@ DBusProxyConnection::DBusSignalHandlerToken DBusProxy::subscribeForSelectiveBroa const std::string& interfaceMemberSignature, DBusProxyConnection::DBusSignalHandler* dbusSignalHandler) { - return getDBusConnection()->subscribeForSelectiveBroadcast( + DBusProxyConnection::DBusSignalHandlerToken token = + getDBusConnection()->subscribeForSelectiveBroadcast( subscriptionAccepted, objectPath, interfaceName, @@ -171,12 +182,30 @@ DBusProxyConnection::DBusSignalHandlerToken DBusProxy::subscribeForSelectiveBroa interfaceMemberSignature, dbusSignalHandler, this); + + if (!isAvailable()) { + subscriptionAccepted = true; + } + if (subscriptionAccepted) { + std::lock_guard < std::mutex > queueLock(selectiveBroadcastHandlersMutex_); + selectiveBroadcastHandlers[interfaceMemberName] = dbusSignalHandler; + } + + return token; } void DBusProxy::unsubscribeFromSelectiveBroadcast(const std::string& eventName, DBusProxyConnection::DBusSignalHandlerToken subscription, const DBusProxyConnection::DBusSignalHandler* dbusSignalHandler) { + getDBusConnection()->unsubscribeFromSelectiveBroadcast(eventName, subscription, this, dbusSignalHandler); + + std::lock_guard < std::mutex > queueLock(selectiveBroadcastHandlersMutex_); + std::string interfaceMemberName = std::get<2>(subscription); + auto its_handler = selectiveBroadcastHandlers.find(interfaceMemberName); + if (its_handler != selectiveBroadcastHandlers.end()) { + selectiveBroadcastHandlers.erase(its_handler); + } } DBusProxyConnection::DBusSignalHandlerToken DBusProxy::addSignalMemberHandler( diff --git a/src/CommonAPI/DBus/DBusProxyManager.cpp b/src/CommonAPI/DBus/DBusProxyManager.cpp index 6a48994..8ea30e3 100644 --- a/src/CommonAPI/DBus/DBusProxyManager.cpp +++ b/src/CommonAPI/DBus/DBusProxyManager.cpp @@ -33,7 +33,9 @@ DBusProxyManager::getInterface() const { const ConnectionId_t & DBusProxyManager::getConnectionId() const { - return connectionId_; + // Every DBusProxyConnection is created as DBusConnection + // in Factory::getConnection and is only stored as DBusProxyConnection + return std::static_pointer_cast(proxy_.getDBusConnection())->getConnectionId(); } void diff --git a/src/CommonAPI/DBus/DBusServiceRegistry.cpp b/src/CommonAPI/DBus/DBusServiceRegistry.cpp index 55e0239..0ee7705 100644 --- a/src/CommonAPI/DBus/DBusServiceRegistry.cpp +++ b/src/CommonAPI/DBus/DBusServiceRegistry.cpp @@ -126,7 +126,21 @@ DBusServiceRegistry::subscribeAvailabilityListener( availabilityStatus = AvailabilityStatus::NOT_AVAILABLE; } else if (dbusServiceListenersRecord.uniqueBusNameState != DBusRecordState::RESOLVING && dbusInterfaceNameListenersRecord.state == DBusRecordState::UNKNOWN) { - dbusInterfaceNameListenersRecord.state = resolveDBusInterfaceNameState(dbusAddress, dbusServiceListenersRecord); + if(dbusPredefinedServices_.find(dbusAddress.getService()) != dbusPredefinedServices_.end()) { + //service is predefined -> notify service listeners about availability + auto dbusServiceNameMapIterator = dbusServiceNameMap_.find(dbusAddress.getService()); + if(dbusServiceNameMapIterator != dbusServiceNameMap_.end()) { + std::unordered_set dbusInterfaceNames; + for(auto dbusInterfaceNameListenerRecordIterator = dbusInterfaceNameListenersMap.begin(); + dbusInterfaceNameListenerRecordIterator != dbusInterfaceNameListenersMap.end(); + ++dbusInterfaceNameListenerRecordIterator) { + dbusInterfaceNames.insert(dbusInterfaceNameListenerRecordIterator->first); + } + notifyDBusServiceListeners(*dbusServiceNameMapIterator->second, dbusAddress.getObjectPath(), dbusInterfaceNames, DBusRecordState::AVAILABLE); + } + } else { + dbusInterfaceNameListenersRecord.state = resolveDBusInterfaceNameState(dbusAddress, dbusServiceListenersRecord); + } } if(availabilityStatus == AvailabilityStatus::UNKNOWN) { @@ -1142,17 +1156,13 @@ void DBusServiceRegistry::onDBusServiceAvailable(const std::string& dbusServiceN } } else { //service is predefined -> notify service listeners about availability + std::unordered_set dbusInterfaceNames; for(auto dbusInterfaceNameListenerRecordIterator = dbusInterfaceNameListenersMap.begin(); dbusInterfaceNameListenerRecordIterator != dbusInterfaceNameListenersMap.end(); ++dbusInterfaceNameListenerRecordIterator) { - auto& dbusInterfaceNameListenerRecord = dbusInterfaceNameListenerRecordIterator->second; - dbusInterfaceNameListenerRecord.state = DBusRecordState::RESOLVED; - for(auto dbusServiceListenerIterator = dbusInterfaceNameListenerRecord.listenerList.begin(); - dbusServiceListenerIterator != dbusInterfaceNameListenerRecord.listenerList.end(); - ++dbusServiceListenerIterator) { - (*dbusServiceListenerIterator)(AvailabilityStatus::AVAILABLE); - } + dbusInterfaceNames.insert(dbusInterfaceNameListenerRecordIterator->first); } + notifyDBusServiceListeners(*dbusUniqueNameRecord, listenersDBusObjectPath, dbusInterfaceNames, DBusRecordState::AVAILABLE); } if (dbusInterfaceNameListenersMap.empty()) { diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 84e9ac4..55289b3 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -31,7 +31,8 @@ set(TestInterfaceSources src-gen/core/commonapi/tests/DerivedTypeCollection.cpp set(TestInterfaceDBusSources ${TestInterfaceSources} src-gen/dbus/${VERSION}/commonapi/tests/TestInterfaceDBusProxy.cpp src-gen/dbus/${VERSION}/commonapi/tests/TestInterfaceDBusStubAdapter.cpp - src-gen/dbus/${VERSION}/fake/legacy/service/LegacyInterfaceDBusProxy.cpp) + src-gen/dbus/${VERSION}/fake/legacy/service/LegacyInterfaceDBusProxy.cpp + src-gen/dbus/${VERSION}/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.cpp) set(TestInterfaceManagerSources src-gen/core/${VERSION}/commonapi/tests/TestInterfaceManagerStubDefault.cpp) @@ -74,10 +75,6 @@ set(TEST_LINK_LIBRARIES -Wl,--no-as-needed CommonAPI-DBus -Wl,--as-needed Common set(TEST_LINK_LIBRARIES_WITHOUT_COMMONAPI_DBUS CommonAPI gtest ${PTHREAD_LIBRARY}) -add_library(fakeGlueCode-dbus SHARED FakeGlueCode.cpp) -set_target_properties(fakeGlueCode-dbus PROPERTIES VERSION 3.0.0 SOVERSION 3 LINKER_LANGUAGE C) -target_link_libraries(fakeGlueCode-dbus) - ############################################################################## # DBusManagedTest ############################################################################## @@ -281,7 +278,6 @@ add_dependencies(DBusLoadTest gtest) # Add tests to the target build_tests ############################################################################## -add_dependencies(build_tests fakeGlueCode-dbus) add_dependencies(build_tests DBusManagedTest) add_dependencies(build_tests DBusMainLoopIntegrationTest) add_dependencies(build_tests DBusAddressTranslatorTest) diff --git a/src/test/DBusAddressTranslatorTest.cpp b/src/test/DBusAddressTranslatorTest.cpp index 4423130..d7fc3ee 100644 --- a/src/test/DBusAddressTranslatorTest.cpp +++ b/src/test/DBusAddressTranslatorTest.cpp @@ -30,6 +30,7 @@ #include "v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp" #include +#include static const std::string domain = "local"; @@ -107,7 +108,8 @@ static const std::vector commonApiAddresses = { "local:only.interface.service:only.interface.instance", "local:only.connection.service:only.connection.instance", "local:only.object.service:only.object.instance", - "local:fake.legacy.service.LegacyInterface:fake.legacy.service" + "local:fake.legacy.service.LegacyInterface:fake.legacy.service", + "local:fake.legacy.service.LegacyInterfaceNoObjectManager:fake.legacy.service" }; typedef std::vector::value_type vt; @@ -120,20 +122,8 @@ static const std::vector dbusAddresses = { vt("only.interface.service_only.interface.instance", "/only/interface/instance", "only.interface.service"), vt("only.connection.service_only.connection.instance", "/only/connection/instance", "only.connection.service"), vt("only.object.service_only.object.instance", "/only/object/instance", "only.object.service"), - vt("fake.legacy.service.connection", "/some/legacy/path/6259504", "fake.legacy.service.LegacyInterface") -}; - -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } + vt("fake.legacy.service.connection", "/some/legacy/path/6259504", "fake.legacy.service.LegacyInterface"), + vt("fake.legacy.service.connection", "/some/legacy/path/6259504", "fake.legacy.service.LegacyInterfaceNoObjectManager") }; class AddressTranslatorTest: public ::testing::Test { @@ -464,6 +454,10 @@ const std::string domainOfFakeLegacyService = "local"; const std::string interfaceOfFakeLegacyService = "fake.legacy.service.LegacyInterface"; const std::string instanceOfFakeLegacyService = "fake.legacy.service"; +const std::string domainOfFakeLegacyServiceNoObjectManager = "local"; +const std::string interfaceOfFakeLegacyServiceNoObjectManager = "fake.legacy.service.LegacyInterfaceNoObjectManager"; +const std::string instanceOfFakeLegacyServiceNoObjectManager = "fake.legacy.service"; + TEST_F(AddressTranslatorTest, CreatedProxyHasCorrectCommonApiAddress) { std::shared_ptr runtime = CommonAPI::Runtime::get(); ASSERT_TRUE((bool)runtime); @@ -493,7 +487,11 @@ void callPythonService(std::string _pythonFileNameAndCommand) { } void fakeLegacyServiceThread() { - callPythonService("fakeLegacyService.py"); + callPythonService("fakeLegacyService.py withObjectManager"); +} + +void fakeLegacyServiceThreadNoObjectMananger() { + callPythonService("fakeLegacyService.py noObjectManager"); } TEST_F(AddressTranslatorTest, FakeLegacyServiceCanBeAddressed) { @@ -534,16 +532,58 @@ TEST_F(AddressTranslatorTest, FakeLegacyServiceCanBeAddressed) { } //end the fake legacy service via dbus - callPythonService("sendToFakeLegacyService.py finish"); + callPythonService("sendToFakeLegacyService.py finish " + interfaceOfFakeLegacyService); fakeServiceThread.join(); } + +TEST_F(AddressTranslatorTest, FakeLegacyServiceCanBeAddressedNoObjectManager) { + std::thread fakeServiceThreadNoObjectManager = std::thread(fakeLegacyServiceThreadNoObjectMananger); + usleep(500000); + + std::shared_ptr runtime = CommonAPI::Runtime::get(); + ASSERT_TRUE((bool)runtime); + + auto proxyForFakeLegacyServiceNoObjectManager = runtime->buildProxy(domainOfFakeLegacyServiceNoObjectManager, instanceOfFakeLegacyServiceNoObjectManager); + ASSERT_TRUE((bool)proxyForFakeLegacyServiceNoObjectManager); + + const CommonAPI::Address & address = proxyForFakeLegacyServiceNoObjectManager->getAddress(); + ASSERT_EQ(domainOfFakeLegacyServiceNoObjectManager, address.getDomain()); + ASSERT_EQ(interfaceOfFakeLegacyServiceNoObjectManager, address.getInterface()); + ASSERT_EQ(instanceOfFakeLegacyServiceNoObjectManager, address.getInstance()); + + proxyForFakeLegacyServiceNoObjectManager->isAvailableBlocking(); + + CommonAPI::CallStatus status; + + const int32_t input = 42; + int32_t output1, output2; + proxyForFakeLegacyServiceNoObjectManager->TestMethod(input, status, output1, output2); + EXPECT_EQ(CommonAPI::CallStatus::SUCCESS, status); + if(CommonAPI::CallStatus::SUCCESS == status) { + EXPECT_EQ(input -5, output1); + EXPECT_EQ(input +5, output2); + } + + std::string greeting; + int32_t identifier; + proxyForFakeLegacyServiceNoObjectManager->OtherTestMethod(status, greeting, identifier); + EXPECT_EQ(CommonAPI::CallStatus::SUCCESS, status); + if(CommonAPI::CallStatus::SUCCESS == status) { + EXPECT_EQ(std::string("Hello"), greeting); + EXPECT_EQ(42, identifier); + } + + //end the fake legacy service via dbus + callPythonService("sendToFakeLegacyService.py finish " + interfaceOfFakeLegacyServiceNoObjectManager); + + fakeServiceThreadNoObjectManager.join(); +} #endif // !WIN32 #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusBroadcastTest.cpp b/src/test/DBusBroadcastTest.cpp index 36f8121..b34ffd0 100644 --- a/src/test/DBusBroadcastTest.cpp +++ b/src/test/DBusBroadcastTest.cpp @@ -102,19 +102,6 @@ private: std::shared_ptr lastSubscribedClient; }; -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class DBusBroadcastTest: public ::testing::Test { protected: virtual void SetUp() { @@ -141,6 +128,7 @@ protected: static const CommonAPI::ConnectionId_t connectionIdService_; static const CommonAPI::ConnectionId_t connectionIdClient1_; static const CommonAPI::ConnectionId_t connectionIdClient2_; + static const CommonAPI::ConnectionId_t connectionIdClient3; int selectiveBroadcastArrivedAtProxyFromSameConnection1; int selectiveBroadcastArrivedAtProxyFromSameConnection2; @@ -165,6 +153,7 @@ const std::string DBusBroadcastTest::managerServiceAddress_ = "local:CommonAPI.D const CommonAPI::ConnectionId_t DBusBroadcastTest::connectionIdService_ = "service"; const CommonAPI::ConnectionId_t DBusBroadcastTest::connectionIdClient1_ = "client1"; const CommonAPI::ConnectionId_t DBusBroadcastTest::connectionIdClient2_ = "client2"; +const CommonAPI::ConnectionId_t DBusBroadcastTest::connectionIdClient3 = "client3"; TEST_F(DBusBroadcastTest, ProxysCanHandleBroadcast) { auto stub = std::make_shared(); @@ -595,7 +584,7 @@ TEST_F(DBusBroadcastTest, ProxyCanBeDeletedAndBuildFromNewInManagedContext) { if(availabilityStatus == CommonAPI::AvailabilityStatus::AVAILABLE) { //Create proxy for managed test interface - proxyTestInterface = testInterfaceProxyManager.buildProxy(serviceAddressObject_.getInstance()); + proxyTestInterface = testInterfaceProxyManager.buildProxy(serviceAddressObject_.getInstance(), connectionIdClient3); ASSERT_TRUE((bool)proxyTestInterface); for (unsigned int i = 0; !proxyTestInterface->isAvailable() && i < 200; ++i) { @@ -659,7 +648,6 @@ TEST_F(DBusBroadcastTest, ProxyCanBeDeletedAndBuildFromNewInManagedContext) { #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusCommunicationTest.cpp b/src/test/DBusCommunicationTest.cpp index 1642a36..2cbe440 100644 --- a/src/test/DBusCommunicationTest.cpp +++ b/src/test/DBusCommunicationTest.cpp @@ -38,19 +38,6 @@ #define VERSION v1_0 -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class DBusCommunicationTest: public ::testing::Test { protected: virtual void SetUp() { @@ -521,7 +508,7 @@ TEST_F(DBusLowLevelCommunicationTest, AgressiveNameClaimingOfServicesIsHandledCo }).detach(); //Test first connect - std::shared_ptr dbusConnection1 = std::make_shared(libdbusConnection1); + std::shared_ptr dbusConnection1 = std::make_shared(libdbusConnection1, "connection1"); ASSERT_TRUE(dbusConnection1->isConnected()); std::shared_ptr adapter1 = createDBusStubAdapter(dbusConnection1, lowLevelAddress_); @@ -543,7 +530,7 @@ TEST_F(DBusLowLevelCommunicationTest, AgressiveNameClaimingOfServicesIsHandledCo EXPECT_EQ(CommonAPI::AvailabilityStatus::AVAILABLE, status); //Test second connect - std::shared_ptr dbusConnection2 = std::make_shared(libdbusConnection2); + std::shared_ptr dbusConnection2 = std::make_shared(libdbusConnection2, "connection2"); ASSERT_TRUE(dbusConnection2->isConnected()); std::shared_ptr adapter2 = createDBusStubAdapter(dbusConnection2, lowLevelAddress_); @@ -574,7 +561,6 @@ TEST_F(DBusLowLevelCommunicationTest, AgressiveNameClaimingOfServicesIsHandledCo #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusConnectionTest.cpp b/src/test/DBusConnectionTest.cpp index bb2e60b..8651535 100644 --- a/src/test/DBusConnectionTest.cpp +++ b/src/test/DBusConnectionTest.cpp @@ -30,7 +30,7 @@ class DBusConnectionTest: public ::testing::Test { protected: virtual void SetUp() { - dbusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + dbusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "connection1"); } virtual void TearDown() { @@ -98,7 +98,7 @@ TEST_F(DBusConnectionTest, SendingAsyncDBusMessagesWorks) { const char interfaceName[] = "commonapi.dbus.test.TestInterface"; const char methodName[] = "TestMethod"; - auto interfaceHandlerDBusConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + auto interfaceHandlerDBusConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "connection2"); ASSERT_TRUE(interfaceHandlerDBusConnection->connect()); ASSERT_TRUE(interfaceHandlerDBusConnection->requestServiceNameAndBlock(service)); diff --git a/src/test/DBusDaemonProxyTest.cpp b/src/test/DBusDaemonProxyTest.cpp index cf28b74..f05a022 100644 --- a/src/test/DBusDaemonProxyTest.cpp +++ b/src/test/DBusDaemonProxyTest.cpp @@ -21,7 +21,7 @@ namespace { class DBusDaemonProxyTest: public ::testing::Test { protected: virtual void SetUp() { - dbusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + dbusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "connection1"); ASSERT_TRUE(dbusConnection_->connect()); dbusDaemonProxy_ = std::make_shared(dbusConnection_); } @@ -126,7 +126,7 @@ TEST_F(DBusDaemonProxyTest, NameOwnerChangedEvent) { }); // Trigger NameOwnerChanged using a new DBusConnection - ASSERT_TRUE(CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION)->connect()); + ASSERT_TRUE(CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "connection2")->connect()); ASSERT_TRUE(future.get()); diff --git a/src/test/DBusFactoryTest.cpp b/src/test/DBusFactoryTest.cpp index 866130a..cd6a718 100644 --- a/src/test/DBusFactoryTest.cpp +++ b/src/test/DBusFactoryTest.cpp @@ -47,19 +47,6 @@ static const std::string fileString = "dbus_bustype=system\n" ""; -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class DBusProxyFactoryTest: public ::testing::Test { protected: virtual void SetUp() { @@ -152,7 +139,6 @@ TEST_F(DBusProxyFactoryTest, CreateNamedFactory) { #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusFreedesktopPropertiesTest.cpp b/src/test/DBusFreedesktopPropertiesTest.cpp index 19cfb6e..be6706e 100644 --- a/src/test/DBusFreedesktopPropertiesTest.cpp +++ b/src/test/DBusFreedesktopPropertiesTest.cpp @@ -24,19 +24,6 @@ static const std::string domain = "local"; static const std::string commonApiAddress = "commonapi.tests.TestFreedesktopInterface"; static const std::string commonApiDerivedAddress = "commonapi.tests.TestFreedesktopDerivedInterface"; -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class FreedesktopPropertiesTest: public ::testing::Test { protected: void SetUp() { @@ -235,7 +222,6 @@ TEST_F(FreedesktopPropertiesOnInheritedInterfacesTest, CanGetAndSetRemoteAttribu #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusLoadTest.cpp b/src/test/DBusLoadTest.cpp index 3eed056..9f23376 100644 --- a/src/test/DBusLoadTest.cpp +++ b/src/test/DBusLoadTest.cpp @@ -50,19 +50,6 @@ public: } }; -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class DBusLoadTest: public ::testing::Test { protected: virtual void SetUp() { @@ -306,7 +293,6 @@ TEST_F(DBusLoadTest, MultipleClientsMultipleServersCallsSucceed) { #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusMainLoopIntegrationTest.cpp b/src/test/DBusMainLoopIntegrationTest.cpp index 341870c..d5b8103 100644 --- a/src/test/DBusMainLoopIntegrationTest.cpp +++ b/src/test/DBusMainLoopIntegrationTest.cpp @@ -53,19 +53,6 @@ const std::string testAddress8 = "commonapi.address.eight"; //#################################################################################################################### -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class DBusBasicMainLoopTest: public ::testing::Test { protected: virtual void SetUp() { @@ -544,7 +531,6 @@ TEST_F(DBusInGLibMainLoopTest, ProxyAndServiceInSameGlibMainloopCanCommunicate) #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusManagedTest.cpp b/src/test/DBusManagedTest.cpp index e50d78e..dd964b5 100644 --- a/src/test/DBusManagedTest.cpp +++ b/src/test/DBusManagedTest.cpp @@ -37,7 +37,9 @@ #define VERSION v1_0 -static const std::string connectionId = "managed-test"; +static const std::string serviceConnectionId = "managed-test-service"; +static const std::string clientConnectionId = "managed-test-client"; +static const std::string clientConnectionId2 = "managed-test-client2";; static const std::string domain = "local"; @@ -115,26 +117,13 @@ bool isManaged(const std::string& _objectPath, const std::string& _interfaceName return false; } -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class DBusManagedTest: public ::testing::Test { protected: virtual void SetUp() { leafStatus_ = CommonAPI::AvailabilityStatus::UNKNOWN; runtime_ = CommonAPI::Runtime::get(); - manualDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + manualDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "manualConnection"); ASSERT_TRUE(manualDBusConnection_->connect(false)); } @@ -158,7 +147,7 @@ public: TEST_F(DBusManagedTest, RegisterRoot) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName, "/", manualDBusConnection_); @@ -175,7 +164,7 @@ TEST_F(DBusManagedTest, RegisterRoot) { TEST_F(DBusManagedTest, RegisterLeafUnmanaged) { auto leafStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, leafInstanceNameRoot, leafStub)); + ASSERT_TRUE(runtime_->registerService(domain, leafInstanceNameRoot, leafStub, serviceConnectionId)); //check that leaf is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(leafDbusServiceNameRoot,"/", manualDBusConnection_); @@ -192,7 +181,7 @@ TEST_F(DBusManagedTest, RegisterLeafUnmanaged) { TEST_F(DBusManagedTest, RegisterLeafManaged) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName, "/", manualDBusConnection_); @@ -203,7 +192,7 @@ TEST_F(DBusManagedTest, RegisterLeafManaged) { CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, clientConnectionId); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -265,7 +254,7 @@ TEST_F(DBusManagedTest, RegisterLeafManaged) { TEST_F(DBusManagedTest, RegisterLeafManagedAndCreateProxyForLeaf) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName , rootStub, connectionId)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName , rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName, "/", manualDBusConnection_); @@ -276,7 +265,7 @@ TEST_F(DBusManagedTest, RegisterLeafManagedAndCreateProxyForLeaf) { CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "test"); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -348,9 +337,114 @@ TEST_F(DBusManagedTest, RegisterLeafManagedAndCreateProxyForLeaf) { proxyConnection->disconnect(); } +TEST_F(DBusManagedTest, RegisterLeafManagedAndCreateProxyForLeafInCallback) { + auto rootStub = std::make_shared(); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName , rootStub, serviceConnectionId)); + + //check that root is registered + auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName, "/", manualDBusConnection_); + ASSERT_FALSE(dbusObjectPathAndInterfacesDict.empty()); + ASSERT_TRUE(isManaged(rootDbusObjectPath, rootInterfaceName, dbusObjectPathAndInterfacesDict)); + + CommonAPI::DBus::DBusAddress rootDBusAddress; + CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); + CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); + + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "test"); + proxyConnection->connect(); + + std::shared_ptr rootProxy = std::make_shared< + VERSION::commonapi::tests::managed::RootInterfaceDBusProxy>( + rootDBusAddress, + proxyConnection + ); + + rootProxy->init(); + + for (uint32_t i = 0; !rootProxy->isAvailable() && i < 200; ++i) { + usleep(10 * 1000); + } + ASSERT_TRUE(rootProxy->isAvailable()); + + std::condition_variable proxyCondVar; + bool proxyCallsSuccessful = false; + + CommonAPI::ProxyManager& proxyManagerLeafInterface = rootProxy->getProxyManagerLeafInterface(); + proxyManagerLeafInterface.getInstanceAvailabilityStatusChangedEvent().subscribe( + [&](const std::string instanceName, CommonAPI::AvailabilityStatus availabilityStatus) { + (void)instanceName; + + if(availabilityStatus == CommonAPI::AvailabilityStatus::AVAILABLE) { + leafStatus_ = CommonAPI::AvailabilityStatus::AVAILABLE; + + auto leafProxy = proxyManagerLeafInterface.buildProxy(leafInstanceNameRoot, clientConnectionId2); + for (uint32_t i = 0; !leafProxy->isAvailable() && i < 200; ++i) { + usleep(10 * 1000); + } + + ASSERT_TRUE(leafProxy->isAvailable()); + + CommonAPI::CallStatus callStatus; + VERSION::commonapi::tests::managed::LeafInterface::testLeafMethodError error; + int outInt; + std::string outString; + leafProxy->testLeafMethod(42, "Test", callStatus, error, outInt, outString); + + ASSERT_TRUE(callStatus == CommonAPI::CallStatus::SUCCESS); + + proxyCallsSuccessful = true; + proxyCondVar.notify_one(); + + } else if(availabilityStatus == CommonAPI::AvailabilityStatus::NOT_AVAILABLE) { + leafStatus_ = CommonAPI::AvailabilityStatus::NOT_AVAILABLE; + } + }); + + auto leafStub = std::make_shared(); + ASSERT_TRUE(rootStub->registerManagedStubLeafInterface(leafStub, leafInstanceNameRoot)); + + for (uint32_t i = 0; leafStatus_ != CommonAPI::AvailabilityStatus::AVAILABLE && i < 200; ++i) { + usleep(10 * 1000); + } + ASSERT_TRUE(leafStatus_ == CommonAPI::AvailabilityStatus::AVAILABLE); + + //check that root manages leaf + dbusObjectPathAndInterfacesDict.clear(); + dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName, rootDbusObjectPath, manualDBusConnection_); + ASSERT_FALSE(dbusObjectPathAndInterfacesDict.empty()); + ASSERT_TRUE(isManaged(leafDbusObjectPathRoot, leafInterfaceName, dbusObjectPathAndInterfacesDict)); + + std::mutex m; + std::unique_lock lock(m); + std::chrono::milliseconds timeout(2000); + + proxyCondVar.wait_for(lock, timeout); + ASSERT_TRUE(proxyCallsSuccessful); + + ASSERT_TRUE(rootStub->deregisterManagedStubLeafInterface(leafInstanceNameRoot)); + + for (uint32_t i = 0; leafStatus_ != CommonAPI::AvailabilityStatus::NOT_AVAILABLE && i < 200; ++i) { + usleep(10 * 1000); + } + ASSERT_TRUE(leafStatus_ == CommonAPI::AvailabilityStatus::NOT_AVAILABLE); + + //check that root no longer manages leaf + dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName, rootDbusObjectPath, manualDBusConnection_); + ASSERT_TRUE(dbusObjectPathAndInterfacesDict.empty()); + + ASSERT_TRUE(runtime_->unregisterService(domain, rootInterfaceName, rootInstanceName)); + + //check that root is unregistered + dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName, "/", manualDBusConnection_); + ASSERT_TRUE(dbusObjectPathAndInterfacesDict.empty()); + + proxyConnection->disconnect(); + +} + TEST_F(DBusManagedTest, PropagateTeardown) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, connectionId)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName, "/", manualDBusConnection_); @@ -361,7 +455,7 @@ TEST_F(DBusManagedTest, PropagateTeardown) { CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, clientConnectionId); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -449,7 +543,7 @@ protected: leafInstanceAvailability = CommonAPI::AvailabilityStatus::UNKNOWN; branchInstanceAvailability = CommonAPI::AvailabilityStatus::UNKNOWN; - manualDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + manualDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "manualConnection"); ASSERT_TRUE(manualDBusConnection_->connect(false)); } @@ -465,7 +559,7 @@ protected: inline bool registerRootStubForSuffix(const std::string& suffix) { auto rootStub = std::make_shared(); const std::string instanceName = getSuffixedRootInstanceName(suffix); - bool registered = runtime_->registerService(domain, instanceName, rootStub); + bool registered = runtime_->registerService(domain, instanceName, rootStub, serviceConnectionId); if(registered) rootStubs_.insert( { instanceName, rootStub }); @@ -492,7 +586,7 @@ protected: CommonAPI::Address rootCommonAPIAddress(domain, getSuffixedRootInstanceName(suffix), rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, clientConnectionId); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -857,7 +951,7 @@ TEST_F(DBusManagedTestExtended, DISABLED_RegisterSeveralRootsAndSeveralLeafsForE TEST_F(DBusManagedTestExtended, RegisterTwoRootsForSameLeafInterface) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -920,7 +1014,7 @@ TEST_F(DBusManagedTestExtended, RegisterTwoRootsForSameLeafInterface) { TEST_F(DBusManagedTestExtended, RegisterLeafsWithDistinctInterfacesOnSameRootManaged) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -931,7 +1025,7 @@ TEST_F(DBusManagedTestExtended, RegisterLeafsWithDistinctInterfacesOnSameRootMan CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, clientConnectionId); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -1012,7 +1106,7 @@ TEST_F(DBusManagedTestExtended, RegisterLeafsWithDistinctInterfacesOnSameRootMan TEST_F(DBusManagedTestExtended, RegisterLeafsWithDistinctInterfacesOnSameRootUnmanaged) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -1023,7 +1117,7 @@ TEST_F(DBusManagedTestExtended, RegisterLeafsWithDistinctInterfacesOnSameRootUnm CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, clientConnectionId); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -1056,10 +1150,10 @@ TEST_F(DBusManagedTestExtended, RegisterLeafsWithDistinctInterfacesOnSameRootUnm std::placeholders::_2)); auto leafStub = std::make_shared(); - runtime_->registerService(domain, leafInstanceNameRoot, leafStub); + runtime_->registerService(domain, leafInstanceNameRoot, leafStub, serviceConnectionId); auto branchStub = std::make_shared(); - runtime_->registerService(domain, branchInstanceNameRoot, branchStub); + runtime_->registerService(domain, branchInstanceNameRoot, branchStub, serviceConnectionId); usleep(50000); @@ -1109,7 +1203,7 @@ TEST_F(DBusManagedTestExtended, RegisterLeafsWithDistinctInterfacesOnSameRootUnm TEST_F(DBusManagedTestExtended, RegisterInvalidChildInstance) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -1144,7 +1238,7 @@ TEST_F(DBusManagedTestExtended, RegisterInvalidChildInstance) TEST_F(DBusManagedTestExtended, RegsiterInvalidChildInstanceAndValidChildInstances) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -1155,7 +1249,7 @@ TEST_F(DBusManagedTestExtended, RegsiterInvalidChildInstanceAndValidChildInstanc CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, clientConnectionId); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -1252,7 +1346,7 @@ TEST_F(DBusManagedTestExtended, RegsiterInvalidChildInstanceAndValidChildInstanc TEST_F(DBusManagedTestExtended, ReegisterLeafsWithAutoGeneratedInstanceIds) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -1290,7 +1384,7 @@ TEST_F(DBusManagedTestExtended, ReegisterLeafsWithAutoGeneratedInstanceIds) TEST_F(DBusManagedTestExtended, RegisterLeafsWithAutoGeneratedInstanceIdsAndCommunicate) { auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, connectionId)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -1301,7 +1395,7 @@ TEST_F(DBusManagedTestExtended, RegisterLeafsWithAutoGeneratedInstanceIdsAndComm CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, clientConnectionId); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -1374,7 +1468,7 @@ TEST_F(DBusManagedTestExtended, ConfigurationFileAffectsInterfaceUnmanaged) { ASSERT_TRUE(defaultConfigSet); auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -1388,7 +1482,7 @@ TEST_F(DBusManagedTestExtended, ConfigurationFileAffectsInterfaceUnmanaged) { const std::string leafDbusServiceName = "commonapi.tests.managed.config.affects.interface.unmanaged"; const std::string leafDbusObjectPath = "/commonapi/tests/managed/RootInterface/LeafInterface/Unmanaged"; - ASSERT_TRUE(runtime_->registerService(domain, leafInstanceName, leafStub)); + ASSERT_TRUE(runtime_->registerService(domain, leafInstanceName, leafStub, serviceConnectionId)); //check that leaf is registered dbusObjectPathAndInterfacesDict.clear(); @@ -1417,7 +1511,7 @@ TEST_F(DBusManagedTestExtended, ConfigurationFileAffectsInterfaceManaged) { ASSERT_TRUE(defaultConfigSet); auto rootStub = std::make_shared(); - ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub)); + ASSERT_TRUE(runtime_->registerService(domain, rootInstanceName, rootStub, serviceConnectionId)); //check that root is registered auto dbusObjectPathAndInterfacesDict = getManagedObjects(rootDbusServiceName,"/", manualDBusConnection_); @@ -1428,7 +1522,7 @@ TEST_F(DBusManagedTestExtended, ConfigurationFileAffectsInterfaceManaged) { CommonAPI::Address rootCommonAPIAddress(domain, rootInstanceName, rootInterfaceName); CommonAPI::DBus::DBusAddressTranslator::get()->translate(rootCommonAPIAddress, rootDBusAddress); - std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + std::shared_ptr proxyConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, clientConnectionId); proxyConnection->connect(); std::shared_ptr rootProxy = std::make_shared< @@ -1496,7 +1590,6 @@ TEST_F(DBusManagedTestExtended, ConfigurationFileAffectsInterfaceManaged) { #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusMultipleConnectionTest.cpp b/src/test/DBusMultipleConnectionTest.cpp index c27f1fc..dc417f5 100644 --- a/src/test/DBusMultipleConnectionTest.cpp +++ b/src/test/DBusMultipleConnectionTest.cpp @@ -30,19 +30,6 @@ const std::string domain = "local"; const std::string serviceAddress = "commonapi.tests.TestInterface"; -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class DBusMultipleConnectionTest: public ::testing::Test { protected: virtual void SetUp() { @@ -157,7 +144,6 @@ TEST_F(DBusMultipleConnectionTest, GetAttribute) { #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusPolymorphicTest.cpp b/src/test/DBusPolymorphicTest.cpp index 9c8fcfc..eb14176 100644 --- a/src/test/DBusPolymorphicTest.cpp +++ b/src/test/DBusPolymorphicTest.cpp @@ -24,19 +24,6 @@ static const std::string interfaceName = "commonapi.tests.TestInterface"; static const std::string busName = "commonapi.tests.TestInterface_CommonAPI.DBus.tests.DBusProxyTestService"; static const std::string objectPath = "/CommonAPI/DBus/tests/DBusProxyTestService"; -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class PolymorphicTestStub : public VERSION::commonapi::tests::TestInterfaceStubDefault { public: @@ -124,7 +111,7 @@ protected: void SetUp() { auto runtime = CommonAPI::Runtime::get(); - proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "clientConnection"); ASSERT_TRUE(proxyDBusConnection_->connect()); proxy_ = std::make_shared(CommonAPI::DBus::DBusAddress(busName, objectPath, interfaceName), proxyDBusConnection_); @@ -150,7 +137,7 @@ protected: } void registerTestStub() { - stubDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + stubDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "serviceConnection"); ASSERT_TRUE(stubDBusConnection_->connect()); testStub = std::make_shared(); @@ -262,7 +249,6 @@ TEST_F(PolymorphicTest, SendStructWithMapWithEnumKeyMember) { #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/DBusProxyTest.cpp b/src/test/DBusProxyTest.cpp index b124e45..a70a84a 100644 --- a/src/test/DBusProxyTest.cpp +++ b/src/test/DBusProxyTest.cpp @@ -52,25 +52,12 @@ static const std::string commonApiAddressFreedesktop = "CommonAPI.DBus.tests.DBu #define VERSION v1_0 -class Environment: public ::testing::Environment { -public: - virtual ~Environment() { - } - - virtual void SetUp() { - CommonAPI::Runtime::setProperty("LibraryBase", "fakeGlueCode"); - } - - virtual void TearDown() { - } -}; - class ProxyTest: public ::testing::Test { protected: void SetUp() { runtime_ = CommonAPI::Runtime::get(); - proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "clientConnection"); ASSERT_TRUE(proxyDBusConnection_->connect()); proxy_ = std::make_shared( @@ -87,7 +74,7 @@ protected: void registerTestStub() { stubDefault_ = std::make_shared(); - bool isTestStubAdapterRegistered_ = runtime_->registerService(domain, commonApiAddress, stubDefault_, "connection"); + bool isTestStubAdapterRegistered_ = runtime_->registerService(domain, commonApiAddress, stubDefault_, "serviceConnection"); ASSERT_TRUE(isTestStubAdapterRegistered_); usleep(100000); @@ -96,7 +83,7 @@ protected: void registerExtendedStub() { stubExtended_ = std::make_shared(); - bool isExtendedStubAdapterRegistered_ = runtime_->registerService(domain, commonApiAddressExtended, stubExtended_, "connection"); + bool isExtendedStubAdapterRegistered_ = runtime_->registerService(domain, commonApiAddressExtended, stubExtended_, "serviceConnection"); ASSERT_TRUE(isExtendedStubAdapterRegistered_); usleep(100000); @@ -420,7 +407,7 @@ protected: void registerTestStub(const std::string commonApiAddress) { stubDefault_ = std::make_shared(); bool isTestStubAdapterRegistered_ = runtime_->registerService< - VERSION::commonapi::tests::TestInterfaceStub>(domain, commonApiAddress, stubDefault_); + VERSION::commonapi::tests::TestInterfaceStub>(domain, commonApiAddress, stubDefault_, "serviceConnection"); ASSERT_TRUE(isTestStubAdapterRegistered_); usleep(100000); @@ -472,7 +459,7 @@ protected: TEST_F(ProxyTest2, DBusProxyStatusEventAfterServiceIsRegistered) { registerTestStub(commonApiAddress); - proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION); + proxyDBusConnection_ = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION, "clientConnection"); ASSERT_TRUE(proxyDBusConnection_->connect()); proxy_ = std::make_shared(CommonAPI::DBus::DBusAddress(busName, objectPath, interfaceName), proxyDBusConnection_); @@ -523,7 +510,6 @@ TEST_F(ProxyTest2, DBusProxyCanUseOrgFreedesktopAddress) { #ifndef __NO_MAIN__ int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - ::testing::AddGlobalTestEnvironment(new Environment()); return RUN_ALL_TESTS(); } #endif diff --git a/src/test/FakeGlueCode.cpp b/src/test/FakeGlueCode.cpp deleted file mode 100644 index 8911bdd..0000000 --- a/src/test/FakeGlueCode.cpp +++ /dev/null @@ -1,5 +0,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/. - diff --git a/src/test/fakeLegacyService.fdepl b/src/test/fakeLegacyService.fdepl new file mode 100644 index 0000000..971d7e4 --- /dev/null +++ b/src/test/fakeLegacyService.fdepl @@ -0,0 +1,16 @@ +/* Copyright (C) 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/. */ + +import "platform:/plugin/org.genivi.commonapi.dbus/deployment/CommonAPI-DBus_deployment_spec.fdepl" +import "fakeLegacyService.fidl" + +define org.genivi.commonapi.dbus.deployment for provider Service { + instance fake.legacy.service.LegacyInterfaceNoObjectManager { + InstanceId = "fake.legacy.service.LegacyInterfaceNoObjectManager" + + DBusPredefined = true + } +} + diff --git a/src/test/fakeLegacyService.fidl b/src/test/fakeLegacyService.fidl index cd0a603..87809e7 100644 --- a/src/test/fakeLegacyService.fidl +++ b/src/test/fakeLegacyService.fidl @@ -27,3 +27,7 @@ interface LegacyInterface { method finish {} } + +interface LegacyInterfaceNoObjectManager extends LegacyInterface { + version { major 1 minor 0 } +} diff --git a/src/test/fakeLegacyService/fakeLegacyService.py b/src/test/fakeLegacyService/fakeLegacyService.py index 54d6b24..0eb3a6d 100644 --- a/src/test/fakeLegacyService/fakeLegacyService.py +++ b/src/test/fakeLegacyService/fakeLegacyService.py @@ -13,44 +13,53 @@ import dbus import dbus.service import dbus.mainloop.glib +BASE_PATH = 'fake.legacy.service' +OBJECT_PATH = '/some/legacy/path/6259504' + +command=sys.argv[1] +if command=='withObjectManager': + INTERFACE = BASE_PATH + '.LegacyInterface' +elif command=='noObjectManager': + INTERFACE = BASE_PATH + '.LegacyInterfaceNoObjectManager' + loop = gobject.MainLoop() dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) class FakeLegacyService(dbus.service.Object): def __init__(self, loop): - busName = dbus.service.BusName('fake.legacy.service.connection', bus = dbus.SessionBus()) - dbus.service.Object.__init__(self, busName, '/some/legacy/path/6259504') + busName = dbus.service.BusName(BASE_PATH + '.connection', bus = dbus.SessionBus()) + dbus.service.Object.__init__(self, busName, OBJECT_PATH) #self.properties = {'RestartReason': 1, 'ShutdownReason': 2, 'WakeUpReason' :3, 'BootMode' :4} self.ABus="" self.APath="" self.loop=loop - @dbus.service.method(dbus_interface='fake.legacy.service.Introspectable', out_signature = 's') + @dbus.service.method(dbus_interface=BASE_PATH + '.Introspectable', out_signature = 's') def Introspect(self): f = open('fake.legacy.service.xml', "r") text = f.read() return text - @dbus.service.method(dbus_interface='fake.legacy.service.LegacyInterface', in_signature = 'i', out_signature = 'ii') + @dbus.service.method(dbus_interface=INTERFACE, in_signature = 'i', out_signature = 'ii') def TestMethod(self, input): val1=input - 5 val2=input + 5 return val1, val2 - @dbus.service.method(dbus_interface='fake.legacy.service.LegacyInterface', out_signature = 'si') + @dbus.service.method(dbus_interface=INTERFACE, out_signature = 'si') def OtherTestMethod(self): greeting='Hello' identifier=42 return greeting, identifier - @dbus.service.method(dbus_interface='fake.legacy.service.LegacyInterface') + @dbus.service.method(dbus_interface=INTERFACE) def finish(self): self.loop.quit() return 0 class ObjectManager(dbus.service.Object): def __init__(self, loop): - busName = dbus.service.BusName('fake.legacy.service.connection', bus = dbus.SessionBus()) + busName = dbus.service.BusName(BASE_PATH + '.connection', bus = dbus.SessionBus()) dbus.service.Object.__init__(self, busName, '/') self.ABus="" self.APath="" @@ -60,11 +69,15 @@ class ObjectManager(dbus.service.Object): def GetManagedObjects(self): response = {} idict = {} - idict['fake.legacy.service.LegacyInterface'] = {} - idict['fake.legacy.service.Introspectable'] = {} - response['/some/legacy/path/6259504'] = idict + idict[INTERFACE] = {} + idict[BASE_PATH + '.Introspectable'] = {} + response[OBJECT_PATH] = idict return response nsm = FakeLegacyService(loop) -ObjectManager(loop) +if command=='withObjectManager': + ObjectManager(loop) + loop.run() + + diff --git a/src/test/fakeLegacyService/sendToFakeLegacyService.py b/src/test/fakeLegacyService/sendToFakeLegacyService.py index f2a09d5..cfe2e6d 100644 --- a/src/test/fakeLegacyService/sendToFakeLegacyService.py +++ b/src/test/fakeLegacyService/sendToFakeLegacyService.py @@ -11,12 +11,15 @@ import gobject import math import dbus import dbus.service + +BASE_PATH = 'fake.legacy.service' +OBJECT_PATH = '/some/legacy/path/6259504' -def finish(): +def finish(interface): try: bus = dbus.SessionBus() - remote_object = bus.get_object('fake.legacy.service.connection','/some/legacy/path/6259504') - iface = dbus.Interface(remote_object, 'fake.legacy.service.LegacyInterface') + remote_object = bus.get_object(BASE_PATH + '.connection', OBJECT_PATH) + iface = dbus.Interface(remote_object, interface) iface.finish() return 0 except: @@ -25,8 +28,9 @@ def finish(): def main(): command=sys.argv[1] + interface=sys.argv[2] if command=="finish": - return finish() + return finish(interface) return 0 diff --git a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp index 5d19435..9f4fc7e 100644 --- a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp +++ b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -14,14 +14,6 @@ namespace commonapi { namespace tests { -bool DerivedTypeCollection::TestStructExtended::operator==(const DerivedTypeCollection::TestStructExtended& _other) const { - return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getTestEnumExtended2() == _other.getTestEnumExtended2()); -} - - -bool DerivedTypeCollection::TestStruct::operator==(const DerivedTypeCollection::TestStruct& _other) const { - return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue()); -} std::shared_ptr DerivedTypeCollection::TestPolymorphicStruct::create(CommonAPI::Serial _serial) { switch (_serial) { @@ -35,24 +27,8 @@ std::shared_ptr DerivedTypeCollect return std::shared_ptr(); } -bool DerivedTypeCollection::TestPolymorphicStruct::operator==(const DerivedTypeCollection::TestPolymorphicStruct& _other) const { - return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue()); -} - - -bool DerivedTypeCollection::TestExtendedPolymorphicStruct::operator==(const DerivedTypeCollection::TestExtendedPolymorphicStruct& _other) const { - return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getAdditionalValue() == _other.getAdditionalValue()); -} - - -bool DerivedTypeCollection::StructWithPolymorphicMember::operator==(const DerivedTypeCollection::StructWithPolymorphicMember& _other) const { - return (getNumberValue() == _other.getNumberValue() && getPolymorphicMember() == _other.getPolymorphicMember()); -} -bool DerivedTypeCollection::StructWithEnumKeyMap::operator==(const DerivedTypeCollection::StructWithEnumKeyMap& _other) const { - return (getTestMap() == _other.getTestMap()); -} } // namespace tests diff --git a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp index 201d486..3a8ade3 100644 --- a/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp +++ b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -52,7 +52,9 @@ struct DerivedTypeCollection { */ inline const uint16_t &getUintValue() const { return std::get<1>(values_); } inline void setUintValue(const uint16_t &_value) { std::get<1>(values_) = _value; } - bool operator==(const TestStruct &_other) const; + inline bool operator==(const TestStruct& _other) const { + return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue()); + } inline bool operator!=(const TestStruct &_other) const { return !((*this) == _other); } @@ -69,19 +71,17 @@ struct DerivedTypeCollection { E_NOT_USED = 3 }; - TestEnum() + TestEnum() : CommonAPI::Enumeration(static_cast(Literal::E_UNKNOWN)) {} - TestEnum(const Literal &_value) - : CommonAPI::Enumeration(static_cast(_value)) {} - TestEnum(const int32_t &_value) - : CommonAPI::Enumeration(_value) {} + TestEnum(Literal _literal) + : CommonAPI::Enumeration(static_cast(_literal)) {} inline bool validate() const { switch (value_) { - case static_cast(Literal::E_UNKNOWN): - case static_cast(Literal::E_OK): - case static_cast(Literal::E_OUT_OF_RANGE): - case static_cast(Literal::E_NOT_USED): + case static_cast(Literal::E_UNKNOWN): + case static_cast(Literal::E_OK): + case static_cast(Literal::E_OUT_OF_RANGE): + case static_cast(Literal::E_NOT_USED): return true; default: return false; @@ -103,19 +103,19 @@ struct DerivedTypeCollection { inline bool operator>(const Literal &_value) const { return (value_ > static_cast(_value)); } }; - struct TestEnumExtended : TestEnum { + struct TestEnumExtended : CommonAPI::Enumeration { enum Literal : int32_t { + E_UNKNOWN = 0, + E_OK = 1, + E_OUT_OF_RANGE = 2, + E_NOT_USED = 3, E_NEW = 4 }; - TestEnumExtended() - : TestEnum(static_cast(Literal::E_NEW)) {} - TestEnumExtended(const Literal &_value) - : TestEnum(static_cast(_value)) {} - TestEnumExtended(const int32_t &_value) - : TestEnum(_value) {} - TestEnumExtended(const TestEnum::Literal &_value) - : TestEnum(_value) {} + TestEnumExtended() + : CommonAPI::Enumeration(static_cast(Literal::E_UNKNOWN)) {} + TestEnumExtended(Literal _literal) + : CommonAPI::Enumeration(static_cast(_literal)) {} TestEnumExtended &operator=(const TestEnum::Literal &_value) { value_ = static_cast(_value); return (*this); @@ -123,10 +123,14 @@ struct DerivedTypeCollection { inline bool validate() const { switch (value_) { - case static_cast(Literal::E_NEW): + case static_cast(Literal::E_UNKNOWN): + case static_cast(Literal::E_OK): + case static_cast(Literal::E_OUT_OF_RANGE): + case static_cast(Literal::E_NOT_USED): + case static_cast(Literal::E_NEW): return true; default: - return TestEnum::validate(); + return false; } } @@ -145,36 +149,40 @@ struct DerivedTypeCollection { inline bool operator>(const Literal &_value) const { return (value_ > static_cast(_value)); } }; - struct TestEnumExtended2 : TestEnumExtended { + struct TestEnumExtended2 : CommonAPI::Enumeration { enum Literal : int32_t { + E_UNKNOWN = 0, + E_OK = 1, + E_OUT_OF_RANGE = 2, + E_NOT_USED = 3, + E_NEW = 4, E_NEW2 = 5 }; - TestEnumExtended2() - : TestEnumExtended(static_cast(Literal::E_NEW2)) {} - TestEnumExtended2(const Literal &_value) - : TestEnumExtended(static_cast(_value)) {} - TestEnumExtended2(const int32_t &_value) - : TestEnumExtended(_value) {} - TestEnumExtended2(const TestEnum::Literal &_value) - : TestEnumExtended(_value) {} - TestEnumExtended2(const TestEnumExtended::Literal &_value) - : TestEnumExtended(_value) {} + TestEnumExtended2() + : CommonAPI::Enumeration(static_cast(Literal::E_UNKNOWN)) {} + TestEnumExtended2(Literal _literal) + : CommonAPI::Enumeration(static_cast(_literal)) {} TestEnumExtended2 &operator=(const TestEnumExtended::Literal &_value) { value_ = static_cast(_value); return (*this); } - TestEnumExtended &operator=(const TestEnum::Literal &_value) { + TestEnumExtended2 &operator=(const TestEnum::Literal &_value) { value_ = static_cast(_value); return (*this); } inline bool validate() const { switch (value_) { - case static_cast(Literal::E_NEW2): + case static_cast(Literal::E_UNKNOWN): + case static_cast(Literal::E_OK): + case static_cast(Literal::E_OUT_OF_RANGE): + case static_cast(Literal::E_NOT_USED): + case static_cast(Literal::E_NEW): + case static_cast(Literal::E_NEW2): return true; default: - return TestEnumExtended::validate(); + return false; } } @@ -214,7 +222,9 @@ struct DerivedTypeCollection { inline void setUintValue(const uint16_t &_value) { std::get<1>(values_) = _value; } inline const TestEnumExtended2 &getTestEnumExtended2() const { return std::get<2>(values_); } inline void setTestEnumExtended2(const TestEnumExtended2 &_value) { std::get<2>(values_) = _value; } - bool operator==(const TestStructExtended &_other) const; + inline bool operator==(const TestStructExtended& _other) const { + return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getTestEnumExtended2() == _other.getTestEnumExtended2()); + } inline bool operator!=(const TestStructExtended &_other) const { return !((*this) == _other); } @@ -229,18 +239,16 @@ struct DerivedTypeCollection { E3 = 2 }; - TestEnumMissingValue() + TestEnumMissingValue() : CommonAPI::Enumeration(static_cast(Literal::E1)) {} - TestEnumMissingValue(const Literal &_value) - : CommonAPI::Enumeration(static_cast(_value)) {} - TestEnumMissingValue(const int32_t &_value) - : CommonAPI::Enumeration(_value) {} + TestEnumMissingValue(Literal _literal) + : CommonAPI::Enumeration(static_cast(_literal)) {} inline bool validate() const { switch (value_) { - case static_cast(Literal::E1): - case static_cast(Literal::E2): - case static_cast(Literal::E3): + case static_cast(Literal::E1): + case static_cast(Literal::E2): + case static_cast(Literal::E3): return true; default: return false; @@ -363,7 +371,9 @@ struct DerivedTypeCollection { inline void setUintValue(const uint16_t &_value) { std::get<1>(values_) = _value; } std::tuple<::commonapi::tests::PredefinedTypeCollection::TestString, uint16_t> values_; - bool operator==(const TestPolymorphicStruct &_other) const; + inline bool operator==(const TestPolymorphicStruct& _other) const { + return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue()); + } inline bool operator!=(const TestPolymorphicStruct &_other) const { return !((*this) == _other); } @@ -412,7 +422,9 @@ struct DerivedTypeCollection { inline void setAdditionalValue(const uint32_t &_value) { std::get<0>(values_) = _value; } std::tuple values_; - bool operator==(const TestExtendedPolymorphicStruct &_other) const; + inline bool operator==(const TestExtendedPolymorphicStruct& _other) const { + return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getAdditionalValue() == _other.getAdditionalValue()); + } inline bool operator!=(const TestExtendedPolymorphicStruct &_other) const { return !((*this) == _other); } @@ -432,7 +444,9 @@ struct DerivedTypeCollection { inline void setNumberValue(const uint32_t &_value) { std::get<0>(values_) = _value; } inline const std::shared_ptr &getPolymorphicMember() const { return std::get<1>(values_); } inline void setPolymorphicMember(const std::shared_ptr &_value) { std::get<1>(values_) = _value; } - bool operator==(const StructWithPolymorphicMember &_other) const; + inline bool operator==(const StructWithPolymorphicMember& _other) const { + return (getNumberValue() == _other.getNumberValue() && getPolymorphicMember() == _other.getPolymorphicMember()); + } inline bool operator!=(const StructWithPolymorphicMember &_other) const { return !((*this) == _other); } @@ -448,7 +462,9 @@ struct DerivedTypeCollection { } inline const TestEnumMap &getTestMap() const { return std::get<0>(values_); } inline void setTestMap(const TestEnumMap &_value) { std::get<0>(values_) = _value; } - bool operator==(const StructWithEnumKeyMap &_other) const; + inline bool operator==(const StructWithEnumKeyMap& _other) const { + return (getTestMap() == _other.getTestMap()); + } inline bool operator!=(const StructWithEnumKeyMap &_other) const { return !((*this) == _other); } diff --git a/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp b/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp index beb2ed8..3a98d9b 100644 --- a/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp +++ b/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp index 2c47dda..2f401f1 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterface.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_ -#define COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_ +#ifndef V1_COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_ +#define V1_COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_ @@ -55,4 +55,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_ +#endif // V1_COMMONAPI_TESTS_EXTENDED_INTERFACE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp index daebf8c..077c236 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_ -#define COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_ #include @@ -158,4 +158,4 @@ CommonAPI::InterfaceVersionAttribute& ExtendedInterfaceProxy<_AttributeExtension // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Extended_Interface_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp index 3dfb547..9a3080f 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_ #include #include @@ -51,4 +51,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_Extended_Interface_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp index 7618ad1..432640f 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Extended_Interface_STUB_HPP_ -#define COMMONAPI_TESTS_Extended_Interface_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_Extended_Interface_STUB_HPP_ +#define V1_COMMONAPI_TESTS_Extended_Interface_STUB_HPP_ #include @@ -109,4 +109,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Extended_Interface_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_Extended_Interface_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp index 6f9de13..f3bc8ac 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp index 3f36ee3..d353919 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/ExtendedInterfaceStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT_HPP_ #include @@ -68,4 +68,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_Extended_Interface_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp index 4383045..5ce8a0e 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterface.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_ -#define COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_ +#ifndef V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_ +#define V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_ @@ -55,4 +55,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_ +#endif // V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp index de0af83..edc78ab 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_ #include @@ -170,4 +170,4 @@ struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestFreedesktopDerive // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp index 65f35f8..d1496e4 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_ #include #include @@ -48,4 +48,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp index 54e7c1c..4f2f3fe 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_ #include @@ -113,4 +113,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp index 0e72205..255ad8b 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp index 02cacc6..63d7b42 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT_HPP_ #include @@ -79,4 +79,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp index 9d726d3..801533d 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterface.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_ -#define COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_ +#ifndef V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_ +#define V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_ @@ -53,4 +53,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_ +#endif // V1_COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp index 08b45ac..e1dc664 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_ #include @@ -251,4 +251,4 @@ struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestFreedesktopInterf // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp index a4efed7..fec0ce3 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_ #include @@ -56,4 +56,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp index 9af7df6..c354509 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_ #include @@ -132,4 +132,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp index e06ecaa..4dd9cda 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp index d81fb94..ba97beb 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT_HPP_ #include @@ -108,4 +108,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp index ab6a78b..2177ee6 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterface.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_TEST_INTERFACE_HPP_ -#define COMMONAPI_TESTS_TEST_INTERFACE_HPP_ +#ifndef V1_COMMONAPI_TESTS_TEST_INTERFACE_HPP_ +#define V1_COMMONAPI_TESTS_TEST_INTERFACE_HPP_ @@ -53,4 +53,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_TEST_INTERFACE_HPP_ +#endif // V1_COMMONAPI_TESTS_TEST_INTERFACE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp index 792309c..53e2afb 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManager.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_ -#define COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_ +#ifndef V1_COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_ +#define V1_COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_ #include @@ -54,4 +54,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_ +#endif // V1_COMMONAPI_TESTS_TEST_INTERFACE_MANAGER_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp index d302418..41cbd78 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_ -#define COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_ #include @@ -128,4 +128,4 @@ CommonAPI::ProxyManager& TestInterfaceManagerProxy<_AttributeExtensions...>::get // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp index 29740a5..5a0e67f 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_ #include @@ -47,4 +47,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp index 7b341f8..640df57 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_ -#define COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_ #include @@ -108,4 +108,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp index 57442e0..0241f20 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp index 1dfb361..67f21e8 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceManagerStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT_HPP_ #include @@ -70,4 +70,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp index f22aea7..82b94ce 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_PROXY_HPP_ -#define COMMONAPI_TESTS_Test_Interface_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_PROXY_HPP_ #include @@ -524,4 +524,4 @@ struct DefaultAttributeProxyHelper<::v1::commonapi::tests::TestInterfaceProxy, // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Interface_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp index f719377..5c6f74e 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_ #include @@ -99,4 +99,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp index 0330129..dcf9441 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_STUB_HPP_ -#define COMMONAPI_TESTS_Test_Interface_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_STUB_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_STUB_HPP_ #include @@ -213,4 +213,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Interface_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp index ebb5b5e..f669169 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp index a5ddbb3..215345d 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/TestInterfaceStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT_HPP_ #include @@ -123,4 +123,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_Test_Interface_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp deleted file mode 100644 index 46bfa98..0000000 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. -* Used org.franca.core 0.9.1.201412191134. -* -* 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/. -*/ -#include "BranchInterface.hpp" - -namespace v1 { -namespace commonapi { -namespace tests { -namespace managed { - - - -} // namespace managed -} // namespace tests -} // namespace commonapi -} // namespace v1 diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp index 4b95f46..3381172 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterface.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_ -#define COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_ @@ -41,17 +41,15 @@ public: NOTOK = 1 }; - testBranchMethodError() + testBranchMethodError() : CommonAPI::Enumeration(static_cast(Literal::OK)) {} - testBranchMethodError(const Literal &_value) - : CommonAPI::Enumeration(static_cast(_value)) {} - testBranchMethodError(const int32_t &_value) - : CommonAPI::Enumeration(_value) {} + testBranchMethodError(Literal _literal) + : CommonAPI::Enumeration(static_cast(_literal)) {} inline bool validate() const { switch (value_) { - case static_cast(Literal::OK): - case static_cast(Literal::NOTOK): + case static_cast(Literal::OK): + case static_cast(Literal::NOTOK): return true; default: return false; @@ -95,4 +93,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp index a8a4f49..bdd01f3 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_ -#define COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_ #include @@ -155,4 +155,4 @@ CommonAPI::InterfaceVersionAttribute& BranchInterfaceProxy<_AttributeExtensions. // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp index de4d3ef..72507e9 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_ #include @@ -52,4 +52,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp index b2cd06b..2122252 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_ -#define COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_ #include @@ -107,4 +107,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp index d8e59bd..669bd1d 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp index 5e494f0..4913639 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/BranchInterfaceStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT_HPP_ #include @@ -68,4 +68,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp deleted file mode 100644 index 285a8d6..0000000 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. -* Used org.franca.core 0.9.1.201412191134. -* -* 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/. -*/ -#include "LeafInterface.hpp" - -namespace v1 { -namespace commonapi { -namespace tests { -namespace managed { - - - -} // namespace managed -} // namespace tests -} // namespace commonapi -} // namespace v1 diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp index a8332b4..f27f3e7 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterface.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_ -#define COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_ @@ -41,17 +41,15 @@ public: NOTOK = 1 }; - testLeafMethodError() + testLeafMethodError() : CommonAPI::Enumeration(static_cast(Literal::OK)) {} - testLeafMethodError(const Literal &_value) - : CommonAPI::Enumeration(static_cast(_value)) {} - testLeafMethodError(const int32_t &_value) - : CommonAPI::Enumeration(_value) {} + testLeafMethodError(Literal _literal) + : CommonAPI::Enumeration(static_cast(_literal)) {} inline bool validate() const { switch (value_) { - case static_cast(Literal::OK): - case static_cast(Literal::NOTOK): + case static_cast(Literal::OK): + case static_cast(Literal::NOTOK): return true; default: return false; @@ -95,4 +93,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp index 852a916..cce9ffa 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_ -#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_ #include @@ -155,4 +155,4 @@ CommonAPI::InterfaceVersionAttribute& LeafInterfaceProxy<_AttributeExtensions... // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp index bd4c9ff..752d4aa 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_ #include @@ -52,4 +52,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp index 43b58f9..2193b8c 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_ -#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_ #include @@ -107,4 +107,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp index c30041d..4e8b9a8 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp index b66a486..d388742 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/LeafInterfaceStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT_HPP_ #include @@ -68,4 +68,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp deleted file mode 100644 index b1f04dc..0000000 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* -* This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. -* Used org.franca.core 0.9.1.201412191134. -* -* 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/. -*/ -#include "RootInterface.hpp" - -namespace v1 { -namespace commonapi { -namespace tests { -namespace managed { - - - -} // namespace managed -} // namespace tests -} // namespace commonapi -} // namespace v1 diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp index c505b5c..d7f9e33 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterface.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_ -#define COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_ #include @@ -42,17 +42,15 @@ public: NOTOK = 1 }; - testRootMethodError() + testRootMethodError() : CommonAPI::Enumeration(static_cast(Literal::OK)) {} - testRootMethodError(const Literal &_value) - : CommonAPI::Enumeration(static_cast(_value)) {} - testRootMethodError(const int32_t &_value) - : CommonAPI::Enumeration(_value) {} + testRootMethodError(Literal _literal) + : CommonAPI::Enumeration(static_cast(_literal)) {} inline bool validate() const { switch (value_) { - case static_cast(Literal::OK): - case static_cast(Literal::NOTOK): + case static_cast(Literal::OK): + case static_cast(Literal::NOTOK): return true; default: return false; @@ -96,4 +94,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp index c2b8aa2..767ac1b 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_ -#define COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_ #include @@ -165,4 +165,4 @@ CommonAPI::ProxyManager& RootInterfaceProxy<_AttributeExtensions...>::getProxyMa // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp index 70f7c49..248235a 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_ #include @@ -57,4 +57,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp index da4abbc..0513590 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_ -#define COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_ #include @@ -121,4 +121,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp index 9a06017..5c129f0 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp index c207d38..ba18f95 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/RootInterfaceStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT_HPP_ #include @@ -77,4 +77,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp index 57c1225..360a1ea 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRoot.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_ -#define COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_ #include @@ -56,4 +56,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_SECOND_ROOT_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp index 0aec7bb..0bcf226 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_ -#define COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_ #include @@ -130,4 +130,4 @@ CommonAPI::ProxyManager& SecondRootProxy<_AttributeExtensions...>::getProxyManag // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp index 11dda50..41a4cc2 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_ -#define COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_ #include @@ -49,4 +49,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp index 16526e5..ccdddfd 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_ -#define COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_ #include @@ -110,4 +110,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp index 8bd5886..af9be9f 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp index e1b9ba2..dd7bb14 100644 --- a/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp +++ b/src/test/src-gen/core/v1/commonapi/tests/managed/SecondRootStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_ -#define COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT_HPP_ #include @@ -72,4 +72,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT +#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp index 8a09882..d193bb8 100644 --- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterface.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_ -#define FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_ +#ifndef V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_ +#define V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_ @@ -55,4 +55,4 @@ namespace CommonAPI { // Compatibility namespace v1_0 = v1; -#endif // FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_ +#endif // V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_HPP_ diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp new file mode 100644 index 0000000..25df376 --- /dev/null +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManager.hpp @@ -0,0 +1,60 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. +* Used org.franca.core 0.9.1.201412191134. +* +* 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 V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_NO_OBJECT_MANAGER_HPP_ +#define V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_NO_OBJECT_MANAGER_HPP_ + + + +#include + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif + +#include + +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +class LegacyInterfaceNoObjectManager +: virtual public LegacyInterface { +public: + virtual ~LegacyInterfaceNoObjectManager() { } + + static inline const char* getInterface(); + static inline CommonAPI::Version getInterfaceVersion(); +}; + +const char* LegacyInterfaceNoObjectManager::getInterface() { + return ("fake.legacy.service.LegacyInterfaceNoObjectManager"); +} + +CommonAPI::Version LegacyInterfaceNoObjectManager::getInterfaceVersion() { + return CommonAPI::Version(1, 0); +} + + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 + +namespace CommonAPI { +} + + +// Compatibility +namespace v1_0 = v1; + +#endif // V1_FAKE_LEGACY_SERVICE_LEGACY_INTERFACE_NO_OBJECT_MANAGER_HPP_ diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxy.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxy.hpp new file mode 100644 index 0000000..4397b30 --- /dev/null +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxy.hpp @@ -0,0 +1,134 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. +* Used org.franca.core 0.9.1.201412191134. +* +* 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 V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_HPP_ + +#include + +#include "v1/fake/legacy/service/LegacyInterfaceProxy.hpp" + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif + + +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +template +class LegacyInterfaceNoObjectManagerProxy + : virtual public LegacyInterfaceNoObjectManager, + virtual public LegacyInterfaceNoObjectManagerProxyBase, + public LegacyInterfaceProxy<_AttributeExtensions...>, + virtual public _AttributeExtensions... { +public: + LegacyInterfaceNoObjectManagerProxy(std::shared_ptr delegate); + ~LegacyInterfaceNoObjectManagerProxy(); + + typedef LegacyInterfaceNoObjectManager InterfaceType; + + inline static const char* getInterface() { + return(LegacyInterfaceNoObjectManager::getInterface()); + } + + + + + + /** + * Returns the CommonAPI address of the remote partner this proxy communicates with. + */ + virtual const CommonAPI::Address &getAddress() const; + + /** + * Returns true if the remote partner for this proxy is currently known to be available. + */ + virtual bool isAvailable() const; + + /** + * Returns true if the remote partner for this proxy is available. + */ + virtual bool isAvailableBlocking() const; + + /** + * Returns the wrapper class that is used to (de-)register for notifications about + * the availability of the remote partner of this proxy. + */ + virtual CommonAPI::ProxyStatusEvent& getProxyStatusEvent(); + + /** + * Returns the wrapper class that is used to access version information of the remote + * partner of this proxy. + */ + virtual CommonAPI::InterfaceVersionAttribute& getInterfaceVersionAttribute(); + + private: + std::shared_ptr delegate_; +}; + +typedef LegacyInterfaceNoObjectManagerProxy<> LegacyInterfaceNoObjectManagerProxyDefault; + + +// +// LegacyInterfaceNoObjectManagerProxy Implementation +// +template +LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::LegacyInterfaceNoObjectManagerProxy(std::shared_ptr delegate): + ::v1::fake::legacy::service::LegacyInterfaceProxy<_AttributeExtensions...>(delegate), + _AttributeExtensions(*(std::dynamic_pointer_cast(delegate)))..., + delegate_(std::dynamic_pointer_cast(delegate)) { +} + +template +LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::~LegacyInterfaceNoObjectManagerProxy() { +} + + +template +const CommonAPI::Address &LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::getAddress() const { + return delegate_->getAddress(); +} + +template +bool LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::isAvailable() const { + return delegate_->isAvailable(); +} + +template +bool LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::isAvailableBlocking() const { + return delegate_->isAvailableBlocking(); +} + +template +CommonAPI::ProxyStatusEvent& LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::getProxyStatusEvent() { + return delegate_->getProxyStatusEvent(); +} + +template +CommonAPI::InterfaceVersionAttribute& LegacyInterfaceNoObjectManagerProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() { + return delegate_->getInterfaceVersionAttribute(); +} + + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 + + + +// Compatibility +namespace v1_0 = v1; + +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp new file mode 100644 index 0000000..34ff82e --- /dev/null +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerProxyBase.hpp @@ -0,0 +1,50 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. +* Used org.franca.core 0.9.1.201412191134. +* +* 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 V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_BASE_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_BASE_HPP_ + +#include +#include + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif + + +#include + +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +class LegacyInterfaceNoObjectManagerProxyBase + : virtual public LegacyInterfaceProxyBase { +public: + + + + +}; + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 + + +// Compatibility +namespace v1_0 = v1; + +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp new file mode 100644 index 0000000..3afdae2 --- /dev/null +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStub.hpp @@ -0,0 +1,110 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. +* Used org.franca.core 0.9.1.201412191134. +* +* 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 V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_HPP_ + +#include + + + +#include + +#include + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif + + +#include + +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +/** + * Receives messages from remote and handles all dispatching of deserialized calls + * to a stub for the service LegacyInterfaceNoObjectManager. Also provides means to send broadcasts + * and attribute-changed-notifications of observable attributes as defined by this service. + * An application developer should not need to bother with this class. + */ +class LegacyInterfaceNoObjectManagerStubAdapter + : public virtual CommonAPI::StubAdapter, + public virtual LegacyInterfaceNoObjectManager, + public virtual LegacyInterfaceStubAdapter { + public: + + + + virtual void deactivateManagedInstances() = 0; +protected: + /** + * Defines properties for storing the ClientIds of clients / proxies that have + * subscribed to the selective broadcasts + */ +}; + +/** + * Defines the necessary callbacks to handle remote set events related to the attributes + * defined in the IDL description for LegacyInterfaceNoObjectManager. + * For each attribute two callbacks are defined: + * - a verification callback that allows to verify the requested value and to prevent setting + * e.g. an invalid value ("onRemoteSet"). + * - an action callback to do local work after the attribute value has been changed + * ("onRemoteChanged"). + * + * This class and the one below are the ones an application developer needs to have + * a look at if he wants to implement a service. + */ +class LegacyInterfaceNoObjectManagerStubRemoteEvent +: public virtual LegacyInterfaceStubRemoteEvent +{ +public: + virtual ~LegacyInterfaceNoObjectManagerStubRemoteEvent() { } + +}; + +/** + * Defines the interface that must be implemented by any class that should provide + * the service LegacyInterfaceNoObjectManager to remote clients. + * This class and the one above are the ones an application developer needs to have + * a look at if he wants to implement a service. + */ +class LegacyInterfaceNoObjectManagerStub + : public virtual CommonAPI::Stub, + public virtual LegacyInterfaceStub +{ +public: + + virtual ~LegacyInterfaceNoObjectManagerStub() {} + virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr clientId) = 0; + + + + using CommonAPI::Stub::initStubAdapter; + typedef CommonAPI::Stub::StubAdapterType StubAdapterType; + typedef CommonAPI::Stub::RemoteEventHandlerType RemoteEventHandlerType; + typedef LegacyInterfaceNoObjectManagerStubRemoteEvent RemoteEventType; + typedef LegacyInterfaceNoObjectManager StubInterface; +}; + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 + + +// Compatibility +namespace v1_0 = v1; + +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.cpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.cpp new file mode 100644 index 0000000..a195973 --- /dev/null +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.cpp @@ -0,0 +1,46 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. +* Used org.franca.core 0.9.1.201412191134. +* +* 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/. +*/ +#include +#include + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +LegacyInterfaceNoObjectManagerStubDefault::LegacyInterfaceNoObjectManagerStubDefault(): + remoteEventHandler_(this), + interfaceVersion_(LegacyInterfaceNoObjectManager::getInterfaceVersion()) { +} + +const CommonAPI::Version& LegacyInterfaceNoObjectManagerStubDefault::getInterfaceVersion(std::shared_ptr _client) { + (void)_client; + return interfaceVersion_; +} + +LegacyInterfaceNoObjectManagerStubRemoteEvent* LegacyInterfaceNoObjectManagerStubDefault::initStubAdapter(const std::shared_ptr &_adapter) { + LegacyInterfaceStubDefault::initStubAdapter(_adapter); + CommonAPI::Stub::stubAdapter_ = _adapter; + return &remoteEventHandler_; +} + + + + + +LegacyInterfaceNoObjectManagerStubDefault::RemoteEventHandler::RemoteEventHandler(LegacyInterfaceNoObjectManagerStubDefault *_defaultStub) + : LegacyInterfaceStubDefault::RemoteEventHandler(_defaultStub), + defaultStub_(_defaultStub) { +} + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.hpp new file mode 100644 index 0000000..b970bcc --- /dev/null +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerStubDefault.hpp @@ -0,0 +1,72 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. +* Used org.franca.core 0.9.1.201412191134. +* +* 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 V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_DEFAULT_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_DEFAULT_HPP_ + +#include + +#include +#include + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +/** + * Provides a default implementation for LegacyInterfaceNoObjectManagerStubRemoteEvent and + * LegacyInterfaceNoObjectManagerStub. Method callbacks have an empty implementation, + * remote set calls on attributes will always change the value of the attribute + * to the one received. + * + * Override this stub if you only want to provide a subset of the functionality + * that would be defined for this service, and/or if you do not need any non-default + * behaviour. + */ +class LegacyInterfaceNoObjectManagerStubDefault + : public virtual LegacyInterfaceNoObjectManagerStub, + public virtual LegacyInterfaceStubDefault { +public: + LegacyInterfaceNoObjectManagerStubDefault(); + + LegacyInterfaceNoObjectManagerStubRemoteEvent* initStubAdapter(const std::shared_ptr &_adapter); + + const CommonAPI::Version& getInterfaceVersion(std::shared_ptr _client); + + + + + +protected: + class RemoteEventHandler: public virtual LegacyInterfaceNoObjectManagerStubRemoteEvent, public virtual LegacyInterfaceStubDefault::RemoteEventHandler { + public: + RemoteEventHandler(LegacyInterfaceNoObjectManagerStubDefault *_defaultStub); + + + private: + LegacyInterfaceNoObjectManagerStubDefault *defaultStub_; + }; +private: + LegacyInterfaceNoObjectManagerStubDefault::RemoteEventHandler remoteEventHandler_; + + + CommonAPI::Version interfaceVersion_; +}; + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 + + +// Compatibility +namespace v1_0 = v1; + +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_STUB_DEFAULT diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp index d2173da..e4484ef 100644 --- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_ -#define FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_ +#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_ #include @@ -212,4 +212,4 @@ CommonAPI::InterfaceVersionAttribute& LegacyInterfaceProxy<_AttributeExtensions. // Compatibility namespace v1_0 = v1; -#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_ +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_HPP_ diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp index dae25c5..03eb9a1 100644 --- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceProxyBase.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_ -#define FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_ +#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_ #include @@ -58,4 +58,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_ +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_PROXY_BASE_HPP_ diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp index 0824f31..8aeca14 100644 --- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStub.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_ -#define FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_ +#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_ #include @@ -113,4 +113,4 @@ public: // Compatibility namespace v1_0 = v1; -#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_ +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_HPP_ diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp index 6a8bae2..9c8237c 100644 --- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp index 4f06bbd..f5e459d 100644 --- a/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp +++ b/src/test/src-gen/core/v1/fake/legacy/service/LegacyInterfaceStubDefault.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.1.4.v201511201311. +* Used org.genivi.commonapi.core 3.1.5.v201512091035. * Used org.franca.core 0.9.1.201412191134. * * 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 FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_ -#define FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_ +#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT_HPP_ #include @@ -70,4 +70,4 @@ private: // Compatibility namespace v1_0 = v1; -#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_STUB_DEFAULT diff --git a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp index 34c8d55..c38adac 100644 --- a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp +++ b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. - * Used org.genivi.commonapi.dbus 3.1.4.v201511201313. + * Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp index b963cc7..f40ca1d 100644 --- a/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp +++ b/src/test/src-gen/dbus/commonapi/tests/DerivedTypeCollectionDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp index 1e846e6..7bd03b9 100644 --- a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp +++ b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. - * Used org.genivi.commonapi.dbus 3.1.4.v201511201313. + * Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp index 5d04aa4..7fe7971 100644 --- a/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp +++ b/src/test/src-gen/dbus/commonapi/tests/PredefinedTypeCollectionDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp index 5350a38..0bd7ed8 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp index 3cae58f..5253b0b 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Extended_Interface_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_Extended_Interface_DBUS_DEPLOYMENT_HPP_ @@ -40,4 +40,4 @@ namespace ExtendedInterface_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_EXTENDEDINTERFACE_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_Extended_Interface_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp index 1dacb44..0b7e3f7 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp index f4ba72f..fc3cb8b 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_ #include #include @@ -59,5 +59,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Extended_Interface_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp index cb579a5..5eb09b1 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp index 26fc51b..f87194d 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_ #include #include @@ -271,4 +271,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_Extended_Interface_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp index 2d53d35..c958881 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp index 6169af6..f5d7490 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_DEPLOYMENT_HPP_ @@ -40,4 +40,4 @@ namespace TestFreedesktopDerivedInterface_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_TESTFREEDESKTOPDERIVEDINTERFACE_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp index 09aac22..07761c9 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp index e7bd68a..ec25b27 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_ #include #include @@ -61,5 +61,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp index 77577e1..3efb939 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp index 52f645e..a261c2e 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_ #include #include @@ -169,4 +169,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp index 7c2dabd..50dcd15 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp index eb509d2..61a02b5 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_DEPLOYMENT_HPP_ #include @@ -42,4 +42,4 @@ namespace TestFreedesktopInterface_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_TESTFREEDESKTOPINTERFACE_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp index 79f9fb1..7a6ff88 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp index be3c892..c9111cd 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_ #include #include "v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp" @@ -66,5 +66,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp index ed77a4e..b809c44 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp index dbbfa5a..88a7d6d 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_ #include #include "v1/commonapi/tests/TestFreedesktopInterfaceDBusDeployment.hpp" @@ -138,4 +138,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Freedesktop_Interface_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp index 76d5d69..e01f5b8 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp index 38acd4c..e534f66 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_DBUS_DEPLOYMENT_HPP_ #include @@ -42,4 +42,4 @@ namespace TestInterface_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_TESTINTERFACE_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp index e4eeee7..2b4f03e 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp index c7c1389..372ceaa 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_ #include #include "v1/commonapi/tests/TestInterfaceDBusDeployment.hpp" @@ -90,5 +90,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp index 67a8b07..46562ab 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp index e2a7787..a3e1d1b 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_ #include #include "v1/commonapi/tests/TestInterfaceDBusDeployment.hpp" @@ -250,4 +250,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp index 8cfbdf1..db4511e 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp index d1ea4b5..01e3e12 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_DEPLOYMENT_HPP_ @@ -40,4 +40,4 @@ namespace TestInterfaceManager_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_TESTINTERFACEMANAGER_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp index 594c9f3..523088a 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp index ca52bac..f39b1fa 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_ #include #include "v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp" @@ -59,5 +59,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp index 511b538..c2b7ca2 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp index 1d2fd09..579bae9 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/TestInterfaceManagerDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_ #include #include "v1/commonapi/tests/TestInterfaceManagerDBusDeployment.hpp" @@ -105,4 +105,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_Test_Interface_Manager_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp index 19e51f5..0d1717d 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp index 49bdd2c..8e1e77d 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_DEPLOYMENT_HPP_ @@ -42,4 +42,4 @@ namespace BranchInterface_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_BRANCHINTERFACE_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp index 43872d8..0cc455a 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp index 36987e2..ff5db78 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_ #include #include "v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp" @@ -60,5 +60,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp index 7fb3e68..f29d7dd 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp index a66319e..febb27b 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_ #include #include "v1/commonapi/tests/managed/BranchInterfaceDBusDeployment.hpp" @@ -111,4 +111,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Branch_Interface_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp index ad090e2..cf1954e 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp index 2263af3..8af07cd 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_DEPLOYMENT_HPP_ @@ -42,4 +42,4 @@ namespace LeafInterface_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_LEAFINTERFACE_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp index fd4df47..0f195aa 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp index 8eff349..8ae1945 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_ #include #include "v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp" @@ -60,5 +60,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp index dbf3f36..7cfe184 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp index ca99f2f..996d9ee 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_ #include #include "v1/commonapi/tests/managed/LeafInterfaceDBusDeployment.hpp" @@ -111,4 +111,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Leaf_Interface_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp index 7df2021..0df6d39 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp index 1d3e157..c12f214 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_DEPLOYMENT_HPP_ @@ -42,4 +42,4 @@ namespace RootInterface_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_ROOTINTERFACE_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp index 8115315..e498af5 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp index f0a458f..a10ede2 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_ #include #include "v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp" @@ -65,5 +65,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp index 6466b61..956c206 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp index de6ffe9..b09573a 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_ #include #include "v1/commonapi/tests/managed/RootInterfaceDBusDeployment.hpp" @@ -120,4 +120,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Root_Interface_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp index 596e267..9586b10 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp index 423adf0..f7f1ac5 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_DEPLOYMENT_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_DEPLOYMENT_HPP_ @@ -42,4 +42,4 @@ namespace SecondRoot_ { } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_DBUS_SECONDROOT_DEPLOYMENT_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp index 35fac99..d5c8df1 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp index ed2e0d3..a84fce2 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_ -#define COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_ #include #include "v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp" @@ -61,5 +61,5 @@ private: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp index 355c97c..58d33f3 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp index f68ffa7..d0bdeed 100644 --- a/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_ -#define COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_ +#define V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_ #include #include "v1/commonapi/tests/managed/SecondRootDBusDeployment.hpp" @@ -107,4 +107,4 @@ public: } // namespace commonapi } // namespace v1 -#endif // COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_COMMONAPI_TESTS_MANAGED_Second_Root_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp index 71bbbe1..8ed45be 100644 --- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp index 5497d10..0d84e65 100644 --- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -8,8 +8,8 @@ * http://mozilla.org/MPL/2.0/. */ -#ifndef COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_ -#define COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_ +#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_DEPLOYMENT_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_DEPLOYMENT_HPP_ @@ -42,4 +42,4 @@ namespace LegacyInterface_ { } // namespace fake } // namespace v1 -#endif // COMMONAPI_DBUS_LEGACYINTERFACE_DEPLOYMENT_HPP_ +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp index d0c7aba..3f731dd 100644 --- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp index 19b7d79..2978fbc 100644 --- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusProxy.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_ -#define FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_ +#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_ #include #include "v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp" @@ -64,5 +64,5 @@ private: } // namespace fake } // namespace v1 -#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_ +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_PROXY_HPP_ diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp index 9c145ea..ed34480 100644 --- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp index 95b2423..1010478 100644 --- a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp @@ -1,14 +1,14 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.dbus 3.1.4.v201511201313. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. * Used org.franca.core 0.9.1.201412191134. * * 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 FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_ -#define FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_ +#ifndef V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_ #include #include "v1/fake/legacy/service/LegacyInterfaceDBusDeployment.hpp" @@ -129,4 +129,4 @@ public: } // namespace fake } // namespace v1 -#endif // FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_ +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.cpp new file mode 100644 index 0000000..9253afc --- /dev/null +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.cpp @@ -0,0 +1,30 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. +* Used org.franca.core 0.9.1.201412191134. +* +* 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/. +*/ +#include "LegacyInterfaceNoObjectManagerDBusDeployment.hpp" + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { +namespace LegacyInterfaceNoObjectManager_ { + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + +} // namespace LegacyInterfaceNoObjectManager_ +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp new file mode 100644 index 0000000..58cb658 --- /dev/null +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp @@ -0,0 +1,45 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. +* Used org.franca.core 0.9.1.201412191134. +* +* 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 V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_DEPLOYMENT_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_DEPLOYMENT_HPP_ + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { +namespace LegacyInterfaceNoObjectManager_ { + +// Interface-specific deployment types + +// Type-specific deployments + +// Attribute-specific deployments + +// Argument-specific deployments + +// Broadcast-specific deployments + + +} // namespace LegacyInterfaceNoObjectManager_ +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 + +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_DEPLOYMENT_HPP_ diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.cpp new file mode 100644 index 0000000..2098d31 --- /dev/null +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.cpp @@ -0,0 +1,55 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. +* Used org.franca.core 0.9.1.201412191134. +* +* 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/. +*/ +#include + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +std::shared_ptr createLegacyInterfaceNoObjectManagerDBusProxy( + const CommonAPI::DBus::DBusAddress &_address, + const std::shared_ptr &_connection) { + return std::make_shared(_address, _connection); +} + +INITIALIZER(registerLegacyInterfaceNoObjectManagerDBusProxy) { + CommonAPI::DBus::DBusAddressTranslator::get()->insert( + "local:fake.legacy.service.LegacyInterfaceNoObjectManager:fake.legacy.service.LegacyInterfaceNoObjectManager", + "", + "", + ""); + CommonAPI::DBus::Factory::get()->registerProxyCreateMethod( + LegacyInterfaceNoObjectManager::getInterface(), + &createLegacyInterfaceNoObjectManagerDBusProxy); +} + +LegacyInterfaceNoObjectManagerDBusProxy::LegacyInterfaceNoObjectManagerDBusProxy( + const CommonAPI::DBus::DBusAddress &_address, + const std::shared_ptr &_connection) + : CommonAPI::DBus::DBusProxy(_address, _connection), + LegacyInterfaceDBusProxy(_address, _connection) +{ + CommonAPI::DBus::DBusServiceRegistry::get(_connection)->setDBusServicePredefined(_address.getService()); +} + + + + + +void LegacyInterfaceNoObjectManagerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { + ownVersionMajor = 1; + ownVersionMinor = 0; + } + + } // namespace service + } // namespace legacy + } // namespace fake + } // namespace v1 diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.hpp new file mode 100644 index 0000000..8968f71 --- /dev/null +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusProxy.hpp @@ -0,0 +1,63 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. +* Used org.franca.core 0.9.1.201412191134. +* +* 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 V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_PROXY_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_PROXY_HPP_ + +#include +#include +#include "v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp" + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif + +#include +#include +#include +#include + +#undef COMMONAPI_INTERNAL_COMPILATION + +#include + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +class LegacyInterfaceNoObjectManagerDBusProxy + : virtual public LegacyInterfaceNoObjectManagerProxyBase, + virtual public LegacyInterfaceDBusProxy { +public: + LegacyInterfaceNoObjectManagerDBusProxy( + const CommonAPI::DBus::DBusAddress &_address, + const std::shared_ptr &_connection); + + virtual ~LegacyInterfaceNoObjectManagerDBusProxy() { } + + + + + + virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const; + +private: + + + +}; + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 + +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_PROXY_HPP_ + diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.cpp new file mode 100644 index 0000000..0eb82b0 --- /dev/null +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.cpp @@ -0,0 +1,157 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. +* Used org.franca.core 0.9.1.201412191134. +* +* 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/. +*/ +#include +#include + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +std::shared_ptr createLegacyInterfaceNoObjectManagerDBusStubAdapter( + const CommonAPI::DBus::DBusAddress &_address, + const std::shared_ptr &_connection, + const std::shared_ptr &_stub) { + return std::make_shared(_address, _connection, _stub); +} + +INITIALIZER(registerLegacyInterfaceNoObjectManagerDBusStubAdapter) { + CommonAPI::DBus::DBusAddressTranslator::get()->insert( + "local:fake.legacy.service.LegacyInterfaceNoObjectManager:fake.legacy.service.LegacyInterfaceNoObjectManager", + "", + "", + ""); + CommonAPI::DBus::Factory::get()->registerStubAdapterCreateMethod( + LegacyInterfaceNoObjectManager::getInterface(), &createLegacyInterfaceNoObjectManagerDBusStubAdapter); +} + +LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::~LegacyInterfaceNoObjectManagerDBusStubAdapterInternal() { + deactivateManagedInstances(); + LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::deinit(); +} + +void LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::deactivateManagedInstances() { + +} + +const char* LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const { + static const std::string introspectionData = + std::string(LegacyInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData()) + + + "" + ; + return introspectionData.c_str(); +} + +CommonAPI::DBus::DBusGetAttributeStubDispatcher< + ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub, + CommonAPI::Version + > LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher(&LegacyInterfaceNoObjectManagerStub::getInterfaceVersion, "uu"); + + +#ifdef WIN32 +#endif + + +#ifdef WIN32 + +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub, + std::tuple, + std::tuple, + std::tuple, + std::tuple + + > LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::testMethodStubDispatcher( + &LegacyInterfaceNoObjectManagerStub::TestMethod, "ii", + std::make_tuple(static_cast(nullptr)), + std::make_tuple(static_cast(nullptr), static_cast(nullptr))); + +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub, + std::tuple<>, + std::tuple, + std::tuple<>, + std::tuple + + > LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::otherTestMethodStubDispatcher( + &LegacyInterfaceNoObjectManagerStub::OtherTestMethod, "si", + std::make_tuple(), + std::make_tuple(static_cast(nullptr), static_cast(nullptr))); + +CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub, + std::tuple<>, + std::tuple<>, + std::tuple<>, + std::tuple<> + + > LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::finishStubDispatcher( + &LegacyInterfaceNoObjectManagerStub::finish, "", + std::make_tuple(), + std::make_tuple()); +#endif + + + +#ifdef WIN32 +#endif + +const LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::StubDispatcherTable& LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getStubDispatcherTable() { + return stubDispatcherTable_; +} + +const CommonAPI::DBus::StubAttributeTable& LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getStubAttributeTable() { + return stubAttributeTable_; +} + +LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal( + const CommonAPI::DBus::DBusAddress &_address, + const std::shared_ptr &_connection, + const std::shared_ptr &_stub) + : CommonAPI::DBus::DBusStubAdapter(_address, _connection,false), + LegacyInterfaceNoObjectManagerDBusStubAdapterHelper(_address, _connection, std::dynamic_pointer_cast(_stub), false), + LegacyInterfaceDBusStubAdapterInternal(_address, _connection, _stub), + stubDispatcherTable_({ + #ifdef WIN32 + { { "TestMethod", "i" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::testMethodStubDispatcher }, + { { "OtherTestMethod", "" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::otherTestMethodStubDispatcher }, + { { "finish", "" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::finishStubDispatcher } + #endif + }), + stubAttributeTable_() { + + #ifdef WIN32 + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher }); + #else + auto parentDispatcherTable = LegacyInterfaceDBusStubAdapterInternal::getStubDispatcherTable(); + stubDispatcherTable_.insert(parentDispatcherTable.begin(), parentDispatcherTable.end()); + + auto interfaceVersionGetter = stubDispatcherTable_.find({ "getInterfaceVersion", "" }); + if(interfaceVersionGetter != stubDispatcherTable_.end()) { + interfaceVersionGetter->second = &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher; + } else { + stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &fake::legacy::service::LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher }); + } + + auto parentAttributeTable = LegacyInterfaceDBusStubAdapterInternal::getStubAttributeTable(); + stubAttributeTable_.insert(parentAttributeTable.begin(), parentAttributeTable.end()); + + #endif +} + +bool LegacyInterfaceNoObjectManagerDBusStubAdapterInternal::hasFreedesktopProperties() { + return false; +} + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 diff --git a/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.hpp new file mode 100644 index 0000000..9c6fd92 --- /dev/null +++ b/src/test/src-gen/dbus/v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusStubAdapter.hpp @@ -0,0 +1,159 @@ +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.dbus 3.1.5.v201512091037. +* Used org.franca.core 0.9.1.201412191134. +* +* 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 V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_STUB_ADAPTER_HPP_ +#define V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_STUB_ADAPTER_HPP_ + +#include +#include +#include "v1/fake/legacy/service/LegacyInterfaceNoObjectManagerDBusDeployment.hpp" + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif + +#include +#include +#include +#include +#include + +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace v1 { +namespace fake { +namespace legacy { +namespace service { + +typedef CommonAPI::DBus::DBusStubAdapterHelper LegacyInterfaceNoObjectManagerDBusStubAdapterHelper; + +class LegacyInterfaceNoObjectManagerDBusStubAdapterInternal + : public virtual LegacyInterfaceNoObjectManagerStubAdapter, + public LegacyInterfaceNoObjectManagerDBusStubAdapterHelper, + public LegacyInterfaceDBusStubAdapterInternal +{ +public: + LegacyInterfaceNoObjectManagerDBusStubAdapterInternal( + const CommonAPI::DBus::DBusAddress &_address, + const std::shared_ptr &_connection, + const std::shared_ptr &_stub); + + ~LegacyInterfaceNoObjectManagerDBusStubAdapterInternal(); + + virtual bool hasFreedesktopProperties(); + + inline static const char* getInterface() { + return LegacyInterfaceNoObjectManager::getInterface(); + } + + + + + const LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::StubDispatcherTable& getStubDispatcherTable(); + const CommonAPI::DBus::StubAttributeTable& getStubAttributeTable(); + + void deactivateManagedInstances(); + + virtual const CommonAPI::Address &getAddress() const { + return DBusStubAdapter::getAddress(); + } + + virtual void init(std::shared_ptr instance) { + return LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::init(instance); + } + + virtual void deinit() { + return LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::deinit(); + } + + virtual bool onInterfaceDBusMessage(const CommonAPI::DBus::DBusMessage& dbusMessage) { + return LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::onInterfaceDBusMessage(dbusMessage); + } + + virtual bool onInterfaceDBusFreedesktopPropertiesMessage(const CommonAPI::DBus::DBusMessage& dbusMessage) { + return LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::onInterfaceDBusFreedesktopPropertiesMessage(dbusMessage); + } + +static CommonAPI::DBus::DBusGetAttributeStubDispatcher< + ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub, + CommonAPI::Version + > getLegacyInterfaceNoObjectManagerInterfaceVersionStubDispatcher; + + +#ifdef WIN32 +#endif + + +#ifdef WIN32 + +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub, + std::tuple, + std::tuple, + std::tuple, + std::tuple + + > testMethodStubDispatcher; + +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub, + std::tuple<>, + std::tuple, + std::tuple<>, + std::tuple + + > otherTestMethodStubDispatcher; + +static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< + ::v1::fake::legacy::service::LegacyInterfaceNoObjectManagerStub, + std::tuple<>, + std::tuple<>, + std::tuple<>, + std::tuple<> + + > finishStubDispatcher; +#endif + + +#ifdef WIN32 +#endif + + protected: + virtual const char* getMethodsDBusIntrospectionXmlData() const; + + private: + LegacyInterfaceNoObjectManagerDBusStubAdapterHelper::StubDispatcherTable stubDispatcherTable_; + CommonAPI::DBus::StubAttributeTable stubAttributeTable_; +}; + +class LegacyInterfaceNoObjectManagerDBusStubAdapter + : public LegacyInterfaceNoObjectManagerDBusStubAdapterInternal, + public std::enable_shared_from_this { +public: + LegacyInterfaceNoObjectManagerDBusStubAdapter( + const CommonAPI::DBus::DBusAddress &_address, + const std::shared_ptr &_connection, + const std::shared_ptr &_stub) + : CommonAPI::DBus::DBusStubAdapter( + _address, + _connection, + false), + LegacyInterfaceNoObjectManagerDBusStubAdapterInternal( + _address, + _connection, + _stub) { + } +}; + +} // namespace service +} // namespace legacy +} // namespace fake +} // namespace v1 + +#endif // V1_FAKE_LEGACY_SERVICE_Legacy_Interface_No_Object_Manager_DBUS_STUB_ADAPTER_HPP_ diff --git a/src/test/test-commonapi-dbus.ini b/src/test/test-commonapi-dbus.ini index 45df7e2..34683ef 100644 --- a/src/test/test-commonapi-dbus.ini +++ b/src/test/test-commonapi-dbus.ini @@ -40,6 +40,11 @@ service=fake.legacy.service.connection path=/some/legacy/path/6259504 interface=fake.legacy.service.LegacyInterface +[local:fake.legacy.service.LegacyInterfaceNoObjectManager:fake.legacy.service] +service=fake.legacy.service.connection +path=/some/legacy/path/6259504 +interface=fake.legacy.service.LegacyInterfaceNoObjectManager + [local:commonapi.tests.managed.RootInterface:commonapi.tests.managed.RootInterfaceOne] service=commonapi.tests.managed.roots.on.same.object.path.RootInterfaceOne path=/commonapi/tests/managed/RootInterface -- cgit v1.2.1