summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürgen Gehring <juergen.gehring@bmw.de>2015-06-17 05:12:07 -0700
committerJürgen Gehring <juergen.gehring@bmw.de>2015-06-17 05:12:07 -0700
commit49d0b428ca19852d49965f35328a314f22d88807 (patch)
tree4b8d945f29cac4b4b599f79a872cc5029288f5c5
parent54982071a99484488207ad3bd5e9391a15bffe02 (diff)
downloadgenivi-common-api-dbus-runtime-49d0b428ca19852d49965f35328a314f22d88807.tar.gz
CommonAPI 3.1.23.1.2
-rw-r--r--CMakeLists.txt6
-rw-r--r--CommonAPI-DBus.sln44
-rw-r--r--CommonAPI-DBus.vcxproj154
-rw-r--r--UnitTests.vcxproj200
-rw-r--r--include/CommonAPI/DBus/DBusAddressTranslator.hpp9
-rw-r--r--include/CommonAPI/DBus/DBusConnection.hpp18
-rw-r--r--include/CommonAPI/DBus/DBusFactory.hpp2
-rw-r--r--include/CommonAPI/DBus/DBusMessage.hpp4
-rw-r--r--include/CommonAPI/DBus/DBusOutputStream.hpp15
-rw-r--r--include/CommonAPI/DBus/DBusProxy.hpp3
-rw-r--r--include/CommonAPI/DBus/DBusStubAdapterHelper.hpp33
-rw-r--r--include/CommonAPI/DBus/DBusTypeOutputStream.hpp31
-rw-r--r--src/CommonAPI/DBus/DBusAddressTranslator.cpp27
-rw-r--r--src/CommonAPI/DBus/DBusConnection.cpp54
-rw-r--r--src/CommonAPI/DBus/DBusFactory.cpp6
-rw-r--r--src/CommonAPI/DBus/DBusMainLoopContext.cpp18
-rw-r--r--src/CommonAPI/DBus/DBusProxy.cpp14
-rw-r--r--src/test/CMakeLists.txt63
-rw-r--r--src/test/DBusAddressTranslatorTest.cpp19
-rw-r--r--src/test/DBusConnectionTest.cpp8
-rw-r--r--src/test/DemoMainLoop.hpp2
-rw-r--r--src/test/commonapi/tests/DerivedTypeCollection.hpp354
-rw-r--r--src/test/src-gen/commonapi/tests/DerivedTypeCollection.cpp76
-rw-r--r--src/test/src-gen/commonapi/tests/PredefinedTypeCollection.hpp64
-rw-r--r--src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp (renamed from src/test/commonapi/tests/DerivedTypeCollection.cpp)13
-rw-r--r--src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp (renamed from src/test/src-gen/commonapi/tests/DerivedTypeCollection.hpp)137
-rw-r--r--src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp (renamed from src/test/commonapi/tests/PredefinedTypeCollection.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterface.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterface.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp)6
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStub.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceStub.hpp)4
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.cpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp54
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp169
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp47
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp112
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp93
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp78
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterface.hpp52
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxy.hpp250
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp55
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp131
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp221
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp107
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestInterface.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterface.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceProxy.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxyBase.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceProxyBase.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStub.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceStub.hpp)20
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceStubDefault.cpp)6
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceStubDefault.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterface.cpp)6
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.hpp81
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceProxy.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp)4
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.cpp)6
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterface.cpp)6
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.hpp81
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceProxy.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp)4
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.cpp)6
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterface.cpp)6
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.hpp82
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceProxy.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStub.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceStub.hpp)4
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp)6
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRoot.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRoot.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootProxy.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStub.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootStub.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp)2
-rw-r--r--src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterface.hpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterface.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxy.hpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceProxy.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp)2
-rw-r--r--src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStub.hpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceStub.hpp)8
-rw-r--r--src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.cpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.cpp)10
-rw-r--r--src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp)4
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp)8
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp)106
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp)21
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp)10
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp)17
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp)136
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp)17
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp)2
-rw-r--r--src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp (renamed from src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp)2
-rw-r--r--src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterface.hpp64
-rw-r--r--src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterface.hpp64
-rw-r--r--src/test/src-gen/v1_0/commonapi/tests/managed/RootInterface.hpp65
123 files changed, 2199 insertions, 1514 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d23844a..d0f3f56 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 1 )
+SET( LIBCOMMONAPI_DBUS_PATCH_VERSION 2 )
message(STATUS "Project name: ${PROJECT_NAME}")
@@ -97,9 +97,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.1 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+ FIND_PACKAGE(CommonAPI 3.1.2 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
else()
- FIND_PACKAGE(CommonAPI 3.1.1 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+ FIND_PACKAGE(CommonAPI 3.1.2 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
endif()
message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
diff --git a/CommonAPI-DBus.sln b/CommonAPI-DBus.sln
deleted file mode 100644
index d48b6fc..0000000
--- a/CommonAPI-DBus.sln
+++ /dev/null
@@ -1,44 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonAPI-DBus", "CommonAPI-DBus.vcxproj", "{D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests.vcxproj", "{A437B05C-A664-493D-B60A-822A3A7A1CED}"
- ProjectSection(ProjectDependencies) = postProject
- {D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C} = {D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Temp", "Temp", "{04DC3156-3D34-4F00-9A14-77D360BA3384}"
- ProjectSection(SolutionItems) = preProject
- src\test\DBusInputStreamTest.cpp = src\test\DBusInputStreamTest.cpp
- src\test\DBusMainLoopIntegrationTest.cpp = src\test\DBusMainLoopIntegrationTest.cpp
- src\test\DBusManagedTest.cpp = src\test\DBusManagedTest.cpp
- src\test\DBusObjectManagerStubTest.cpp = src\test\DBusObjectManagerStubTest.cpp
- src\test\DBusRuntimeTest.cpp = src\test\DBusRuntimeTest.cpp
- src\test\DBusServiceRegistryTest.cpp = src\test\DBusServiceRegistryTest.cpp
- src\test\DBusStubAdapterTest.cpp = src\test\DBusStubAdapterTest.cpp
- src\test\DBusTypeStreamTest.cpp = src\test\DBusTypeStreamTest.cpp
- src\test\DBusVariantOutputStreamTest.cpp = src\test\DBusVariantOutputStreamTest.cpp
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}.Debug|Win32.ActiveCfg = Debug|Win32
- {D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}.Debug|Win32.Build.0 = Debug|Win32
- {D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}.Release|Win32.ActiveCfg = Release|Win32
- {D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}.Release|Win32.Build.0 = Release|Win32
- {A437B05C-A664-493D-B60A-822A3A7A1CED}.Debug|Win32.ActiveCfg = Debug|Win32
- {A437B05C-A664-493D-B60A-822A3A7A1CED}.Debug|Win32.Build.0 = Debug|Win32
- {A437B05C-A664-493D-B60A-822A3A7A1CED}.Release|Win32.ActiveCfg = Release|Win32
- {A437B05C-A664-493D-B60A-822A3A7A1CED}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/CommonAPI-DBus.vcxproj b/CommonAPI-DBus.vcxproj
deleted file mode 100644
index 6ee29b5..0000000
--- a/CommonAPI-DBus.vcxproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="include\CommonAPI\DBus\DBusAddress.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusAddressTranslator.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusAttribute.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusClientId.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusConfig.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusConnection.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusDaemonProxy.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusDeployment.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusError.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusEvent.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusFactory.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusFreedesktopAttribute.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusFreedesktopPropertiesStub.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusFreedesktopStubAdapterHelper.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusFreedesktopVariant.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusFunctionalHash.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusHelper.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusInputStream.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusInstanceAvailabilityStatusChangedEvent.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusInterfaceHandler.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusMainLoopContext.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusMessage.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusMultiEvent.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusObjectManager.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusObjectManagerStub.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusOutputStream.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusProxy.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusProxyAsyncCallbackHandler.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusProxyBase.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusProxyConnection.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusProxyHelper.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusProxyManager.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusSelectiveEvent.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusSerializableArguments.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusServiceRegistry.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusStubAdapter.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusStubAdapterHelper.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusTypeOutputStream.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusTypes.hpp" />
- <ClInclude Include="include\CommonAPI\DBus\DBusUtils.hpp" />
- <ClInclude Include="include\murmurhash\MurmurHash3.h" />
- <ClInclude Include="include\pugixml\pugiconfig.hpp" />
- <ClInclude Include="include\pugixml\pugixml.hpp" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\CommonAPI\DBus\DBusAddress.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusAddressTranslator.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusClientId.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusConnection.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusDaemonProxy.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusDeployment.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusError.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusFactory.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusFreedesktopPropertiesStub.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusFunctionalHash.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusInputStream.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusMainLoopContext.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusMessage.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusObjectManager.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusObjectManagerStub.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusOutputStream.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusProxy.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusProxyBase.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusProxyManager.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusServiceRegistry.cpp" />
- <ClCompile Include="src\CommonAPI\DBus\DBusStubAdapter.cpp" />
- <ClCompile Include="src\murmurhash\MurmurHash3.cpp" />
- <ClCompile Include="src\pugixml\pugixml.cpp" />
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}</ProjectGuid>
- <RootNamespace>CommonAPIDBus</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <TargetName>$(ProjectName)d</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>WIN32;COMMONAPI_INTERNAL_COMPILATION;COMMONAPI_DBUS_VERSION_MAJOR=2;COMMONAPI_DBUS_VERSION_MINOR=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <DebugInformationFormat>OldStyle</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <AdditionalIncludeDirectories>include;$(DBUS_BUILD_DIR);$(DBUS_DIR);$(COMMONAPI_DIR)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <MinimalRebuild>false</MinimalRebuild>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(ProgramFiles)\dbus\bin\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalOptions>/VERBOSE %(AdditionalOptions)</AdditionalOptions>
- </Link>
- <Lib />
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <SDLCheck>true</SDLCheck>
- <AdditionalIncludeDirectories>$(COMMONAPI_DIR)\src;$(DBUS_BUILD_DIR);$(DBUS_DIR);$(SolutionDir)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;COMMONAPI_INTERNAL_COMPILATION;COMMONAPI_DBUS_VERSION_MAJOR=2;COMMONAPI_DBUS_VERSION_MINOR=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <DebugInformationFormat>OldStyle</DebugInformationFormat>
- <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/UnitTests.vcxproj b/UnitTests.vcxproj
deleted file mode 100644
index aa02c8a..0000000
--- a/UnitTests.vcxproj
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\test\commonapi\tests\DerivedTypeCollection.hpp" />
- <ClInclude Include="src\test\commonapi\tests\ExtendedInterface.hpp" />
- <ClInclude Include="src\test\commonapi\tests\ExtendedInterfaceDBusProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\ExtendedInterfaceDBusStubAdapter.hpp" />
- <ClInclude Include="src\test\commonapi\tests\ExtendedInterfaceProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\ExtendedInterfaceProxyBase.hpp" />
- <ClInclude Include="src\test\commonapi\tests\ExtendedInterfaceStub.hpp" />
- <ClInclude Include="src\test\commonapi\tests\ExtendedInterfaceStubDefault.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\BranchInterface.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\BranchInterfaceDBusProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\BranchInterfaceDBusStubAdapter.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\BranchInterfaceProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\BranchInterfaceProxyBase.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\BranchInterfaceStub.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\BranchInterfaceStubDefault.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\LeafInterface.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\LeafInterfaceDBusProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\LeafInterfaceDBusStubAdapter.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\LeafInterfaceProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\LeafInterfaceProxyBase.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\LeafInterfaceStub.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\LeafInterfaceStubDefault.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\RootInterface.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\RootInterfaceDBusProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\RootInterfaceDBusStubAdapter.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\RootInterfaceProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\RootInterfaceProxyBase.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\RootInterfaceStub.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\RootInterfaceStubDefault.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\SecondRoot.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\SecondRootDBusProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\SecondRootDBusStubAdapter.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\SecondRootProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\SecondRootProxyBase.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\SecondRootStub.hpp" />
- <ClInclude Include="src\test\commonapi\tests\managed\SecondRootStubDefault.hpp" />
- <ClInclude Include="src\test\commonapi\tests\PredefinedTypeCollection.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopDerivedInterface.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceDBusProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceProxyBase.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceStub.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceStubDefault.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopInterface.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopInterfaceDBusProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopInterfaceDBusStubAdapter.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopInterfaceProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopInterfaceProxyBase.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopInterfaceStub.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestFreedesktopInterfaceStubDefault.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestInterface.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestInterfaceDBusProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestInterfaceDBusStubAdapter.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestInterfaceProxy.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestInterfaceProxyBase.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestInterfaceStub.hpp" />
- <ClInclude Include="src\test\commonapi\tests\TestInterfaceStubDefault.hpp" />
- <ClInclude Include="src\test\DBusTestUtils.hpp" />
- <ClInclude Include="src\test\DemoMainLoop.hpp" />
- <ClInclude Include="src\test\DemoPoll.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="src\test\commonapi\tests\DerivedTypeCollection.cpp" />
- <ClCompile Include="src\test\commonapi\tests\ExtendedInterfaceDBusProxy.cpp" />
- <ClCompile Include="src\test\commonapi\tests\ExtendedInterfaceDBusStubAdapter.cpp" />
- <ClCompile Include="src\test\commonapi\tests\ExtendedInterfaceStubDefault.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\BranchInterface.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\BranchInterfaceDBusProxy.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\BranchInterfaceDBusStubAdapter.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\BranchInterfaceStubDefault.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\LeafInterface.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\LeafInterfaceDBusProxy.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\LeafInterfaceDBusStubAdapter.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\LeafInterfaceStubDefault.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\RootInterface.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\RootInterfaceDBusProxy.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\RootInterfaceDBusStubAdapter.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\RootInterfaceStubDefault.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\SecondRootDBusProxy.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\SecondRootDBusStubAdapter.cpp" />
- <ClCompile Include="src\test\commonapi\tests\managed\SecondRootStubDefault.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceDBusProxy.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestFreedesktopDerivedInterfaceStubDefault.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestFreedesktopInterfaceDBusProxy.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestFreedesktopInterfaceDBusStubAdapter.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestFreedesktopInterfaceStubDefault.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestInterfaceDBusProxy.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestInterfaceDBusStubAdapter.cpp" />
- <ClCompile Include="src\test\commonapi\tests\TestInterfaceStubDefault.cpp" />
- <ClCompile Include="src\test\DBusAddressTranslatorTest.cpp" />
- <ClCompile Include="src\test\DBusBroadcastTest.cpp" />
- <ClCompile Include="src\test\DBusClientIdTest.cpp" />
- <ClCompile Include="src\test\DBusCommunicationTest.cpp" />
- <ClCompile Include="src\test\DBusConnectionTest.cpp" />
- <ClCompile Include="src\test\DBusDaemonProxyTest.cpp" />
- <ClCompile Include="src\test\DBusFactoryTest.cpp" />
- <ClCompile Include="src\test\DBusFreedesktopPropertiesTest.cpp" />
- <ClCompile Include="src\test\DBusLoadTest.cpp" />
- <ClCompile Include="src\test\DBusMultipleConnectionTest.cpp" />
- <ClCompile Include="src\test\DBusOutputStreamTest.cpp" />
- <ClCompile Include="src\test\DBusPolymorphicTest.cpp" />
- <ClCompile Include="src\test\DBusProxyTest.cpp" />
- <ClCompile Include="src\test\DBusServicePublisherTest.cpp" />
- <ClCompile Include="src\test\DBusVariantTest.cpp" />
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{A437B05C-A664-493D-B60A-822A3A7A1CED}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>UnitTests</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
- <CharacterSet>Unicode</CharacterSet>
- <UseOfMfc>false</UseOfMfc>
- <CLRSupport>false</CLRSupport>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v120</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- <TargetName>$(ProjectName)d</TargetName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(DBUS_DIR);$(DBUS_BUILD_DIR);$(SolutionDir)\include;$(SolutionDir)\src\test;$(COMMONAPI_DIR)\include;$(GTEST)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ENABLE_ATTRIBUTE_EXTENSIONS;WIN32;COMMONAPI_INTERNAL_COMPILATION;_DEBUG;__EXCEPTIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <UseFullPaths>true</UseFullPaths>
- <ShowIncludes>false</ShowIncludes>
- <DebugInformationFormat>OldStyle</DebugInformationFormat>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(DBUS_BUILD_DIR)\bin\Debug;$(GTEST)\msvc\gtest-md\Debug;C:\CommonAPI\CommonAPI\Debug;$(SolutionDir)\Debug;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>CommonAPId.lib;CommonAPI-DBusd.lib;gtestd.lib;gtest_main-mdd.lib;dbus-1d.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(DBUS_DIR);$(DBUS_BUILD_DIR);$(SolutionDir)\src;$(SolutionDir)\src\test;$(COMMONAPI_DIR)\src;$(GTEST)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ENABLE_ATTRIBUTE_EXTENSIONS;COMMONAPI_INTERNAL_COMPILATION;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <UseFullPaths>true</UseFullPaths>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(DBUS_BUILD_DIR)\bin\Release;$(GTEST)\msvc\gtest-md\Release;$(COMMONAPI_DIR)\Release;$(SolutionDir)\Release;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>CommonAPI.lib;CommonAPI-DBus.lib;gtest.lib;gtest_main-md.lib;dbus-1.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/include/CommonAPI/DBus/DBusAddressTranslator.hpp b/include/CommonAPI/DBus/DBusAddressTranslator.hpp
index 6d950e9..7f11197 100644
--- a/include/CommonAPI/DBus/DBusAddressTranslator.hpp
+++ b/include/CommonAPI/DBus/DBusAddressTranslator.hpp
@@ -3,10 +3,6 @@
// 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/.
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#error "Only <CommonAPI/CommonAPI.hpp> can be included directly, this file may disappear or change contents."
-#endif
-
#ifndef COMMONAPI_DBUS_ADDRESSTRANSLATOR_HPP_
#define COMMONAPI_DBUS_ADDRESSTRANSLATOR_HPP_
@@ -16,6 +12,7 @@
#include <CommonAPI/Address.hpp>
#include <CommonAPI/DBus/DBusAddress.hpp>
+#include <CommonAPI/DBus/DBusTypes.hpp>
namespace CommonAPI {
namespace DBus {
@@ -37,6 +34,8 @@ public:
COMMONAPI_EXPORT void insert(const std::string &_address,
const std::string &_service, const std::string &_path, const std::string &_interface);
+ COMMONAPI_EXPORT DBusType_t getDBusBusType() const;
+
private:
COMMONAPI_EXPORT bool readConfiguration();
@@ -53,6 +52,8 @@ private:
std::map<DBusAddress, CommonAPI::Address> backwards_;
std::mutex mutex_;
+
+ DBusType_t dBusBusType_;
};
} // namespace DBus
diff --git a/include/CommonAPI/DBus/DBusConnection.hpp b/include/CommonAPI/DBus/DBusConnection.hpp
index 436cfab..cce6296 100644
--- a/include/CommonAPI/DBus/DBusConnection.hpp
+++ b/include/CommonAPI/DBus/DBusConnection.hpp
@@ -225,8 +225,22 @@ public:
mutable std::unordered_map<std::string, uint16_t> connectionNameCount_;
- typedef std::pair<DBusPendingCall*, std::tuple<int, DBusMessageReplyAsyncHandler*, DBusMessage> > TimeoutMapElement;
- mutable std::map<DBusPendingCall*, std::tuple<int, DBusMessageReplyAsyncHandler*, DBusMessage>> timeoutMap_;
+ typedef std::pair<
+ DBusPendingCall*,
+ std::tuple<
+ std::chrono::time_point<std::chrono::high_resolution_clock>,
+ DBusMessageReplyAsyncHandler*,
+ DBusMessage
+ >
+ > TimeoutMapElement;
+ mutable std::map<
+ DBusPendingCall*,
+ std::tuple<
+ std::chrono::time_point<std::chrono::high_resolution_clock>,
+ DBusMessageReplyAsyncHandler*,
+ DBusMessage
+ >
+ > timeoutMap_;
typedef std::pair<DBusMessageReplyAsyncHandler *, DBusMessage> MainloopTimeout_t;
mutable std::list<MainloopTimeout_t> mainloopTimeouts_;
diff --git a/include/CommonAPI/DBus/DBusFactory.hpp b/include/CommonAPI/DBus/DBusFactory.hpp
index fa0808b..644e035 100644
--- a/include/CommonAPI/DBus/DBusFactory.hpp
+++ b/include/CommonAPI/DBus/DBusFactory.hpp
@@ -105,7 +105,7 @@ private:
ServicesMap services_;
- DBusType_t defaultBusType_;
+ DBusType_t dBusBusType_;
};
} // namespace DBus
diff --git a/include/CommonAPI/DBus/DBusMessage.hpp b/include/CommonAPI/DBus/DBusMessage.hpp
index dc5d72e..97c521d 100644
--- a/include/CommonAPI/DBus/DBusMessage.hpp
+++ b/include/CommonAPI/DBus/DBusMessage.hpp
@@ -14,6 +14,10 @@
#include <dbus/dbus.h>
+#ifdef WIN32
+#include <stdint.h>
+#endif
+
#include <CommonAPI/Export.hpp>
namespace CommonAPI {
diff --git a/include/CommonAPI/DBus/DBusOutputStream.hpp b/include/CommonAPI/DBus/DBusOutputStream.hpp
index 1148f3e..b0bdd22 100644
--- a/include/CommonAPI/DBus/DBusOutputStream.hpp
+++ b/include/CommonAPI/DBus/DBusOutputStream.hpp
@@ -47,6 +47,21 @@ public:
*/
COMMONAPI_EXPORT DBusOutputStream(DBusMessage dbusMessage);
+ COMMONAPI_EXPORT void beginWriteVectorOfSerializableStructs() {
+ align(sizeof(uint32_t));
+ pushPosition();
+ _writeValue(static_cast<uint32_t>(0)); // Placeholder
+
+ align(8);
+ pushPosition(); // Start of map data
+ }
+
+ COMMONAPI_EXPORT void endWriteVector() {
+ // Write number of written bytes to placeholder position
+ const uint32_t length = getPosition() - popPosition();
+ _writeValueAt(popPosition(), length);
+ }
+
COMMONAPI_EXPORT OutputStream &writeValue(const bool &_value, const EmptyDeployment *_depl) {
uint32_t tmp = (_value ? 1 : 0);
return _writeValue(tmp);
diff --git a/include/CommonAPI/DBus/DBusProxy.hpp b/include/CommonAPI/DBus/DBusProxy.hpp
index af40863..058a681 100644
--- a/include/CommonAPI/DBus/DBusProxy.hpp
+++ b/include/CommonAPI/DBus/DBusProxy.hpp
@@ -74,6 +74,9 @@ private:
DBusReadonlyAttribute<InterfaceVersionAttribute> interfaceVersionAttribute_;
std::shared_ptr<DBusServiceRegistry> dbusServiceRegistry_;
+
+ mutable std::mutex availabilityMutex_;
+ mutable std::condition_variable availabilityCondition_;
};
diff --git a/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp b/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp
index 56e5021..730a5c7 100644
--- a/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp
+++ b/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp
@@ -32,6 +32,9 @@ public:
virtual ~StubDispatcherBase() { }
};
+
+
+
struct DBusAttributeDispatcherStruct {
StubDispatcherBase* getter;
StubDispatcherBase* setter;
@@ -56,6 +59,10 @@ class DBusStubAdapterHelper: public virtual DBusStubAdapter {
virtual bool dispatchDBusMessage(const DBusMessage& dbusMessage,
const std::shared_ptr<_StubClass>& stub,
DBusStubAdapterHelper<_StubClass>& dbusStubAdapterHelper) = 0;
+ virtual void appendGetAllReply(const DBusMessage& dbusMessage,
+ const std::shared_ptr<_StubClass>& stub,
+ DBusStubAdapterHelper<_StubClass>& dbusStubAdapterHelper,
+ DBusOutputStream &_output) {}
};
// interfaceMemberName, interfaceMemberSignature
typedef std::pair<const char*, const char*> DBusInterfaceMemberPath;
@@ -185,28 +192,24 @@ class DBusStubAdapterHelper: public virtual DBusStubAdapter {
DBusMessage dbusMessageReply = dbusMessage.createMethodReturn("a{sv}");
DBusOutputStream dbusOutputStream(dbusMessageReply);
- /*
- dbusOutputStream.beginWriteVectorOfSerializableStructs(getStubAttributeTable().size());
- std::shared_ptr<DBusClientId> clientId = std::make_shared<DBusClientId>(std::string(dbusMessage.getSenderName()));
+ dbusOutputStream.beginWriteVectorOfSerializableStructs();
+ std::shared_ptr<DBusClientId> clientId = std::make_shared<DBusClientId>(std::string(dbusMessage.getSender()));
for(auto attributeDispatcherIterator = getStubAttributeTable().begin(); attributeDispatcherIterator != getStubAttributeTable().end(); attributeDispatcherIterator++) {
+
//To prevent the destruction of the stub whilst still handling a message
if (stub_) {
- DBusGetFreedesktopAttributeStubDispatcherBase<_StubClass>* const getterDispatcher = dynamic_cast<DBusGetFreedesktopAttributeStubDispatcherBase<_StubClass>*>(attributeDispatcherIterator->second.getter);
-
- if(getterDispatcher == NULL) { // readonly attributes do not have a setter
- return false;
- }
-
+ StubDispatcher* getterDispatcher = static_cast<StubDispatcher*>(attributeDispatcherIterator->second.getter);
+ assert(getterDispatcher != NULL); // all attributes have at least a getter
dbusOutputStream << attributeDispatcherIterator->first;
- getterDispatcher->dispatchDBusMessageAndAppendReply(dbusMessage, stub_, dbusOutputStream, clientId);
+ getterDispatcher->appendGetAllReply(dbusMessage, stub_, *this, dbusOutputStream);
}
}
dbusOutputStream.endWriteVector();
- */
dbusOutputStream.flush();
+
return getDBusConnection()->sendDBusMessage(dbusMessageReply);
}
};
@@ -521,6 +524,14 @@ class DBusGetAttributeStubDispatcher: public virtual DBusStubAdapterHelper<_Stub
bool dispatchDBusMessage(const DBusMessage& dbusMessage, const std::shared_ptr<_StubClass>& stub, DBusStubAdapterHelperType& dbusStubAdapterHelper) {
return sendAttributeValueReply(dbusMessage, stub, dbusStubAdapterHelper);
}
+
+ void appendGetAllReply(const DBusMessage& dbusMessage, const std::shared_ptr<_StubClass>& stub, DBusStubAdapterHelperType& dbusStubAdapterHelper, DBusOutputStream &_output) {
+ std::shared_ptr<DBusClientId> clientId = std::make_shared<DBusClientId>(std::string(dbusMessage.getSender()));
+ auto varDepl = CommonAPI::DBus::VariantDeployment<_AttributeDepl>(true, depl_); // presuming FreeDesktop variant deployment, as support for "legacy" service only
+ _output << CommonAPI::Deployable<CommonAPI::Variant<_AttributeType>, CommonAPI::DBus::VariantDeployment<_AttributeDepl>>((stub.get()->*getStubFunctor_)(clientId), &varDepl);
+ _output.flush();
+ }
+
protected:
virtual bool sendAttributeValueReply(const DBusMessage& dbusMessage, const std::shared_ptr<_StubClass>& stub, DBusStubAdapterHelperType& dbusStubAdapterHelper) {
DBusMessage dbusMessageReply = dbusMessage.createMethodReturn(signature_);
diff --git a/include/CommonAPI/DBus/DBusTypeOutputStream.hpp b/include/CommonAPI/DBus/DBusTypeOutputStream.hpp
index 3ba7cf7..928eadc 100644
--- a/include/CommonAPI/DBus/DBusTypeOutputStream.hpp
+++ b/include/CommonAPI/DBus/DBusTypeOutputStream.hpp
@@ -80,6 +80,11 @@ public:
return (*this);
}
+ TypeOutputStream &writeType(const Version &) {
+ signature_.append("(uu)");
+ return (*this);
+ }
+
TypeOutputStream &writeVersionType() {
signature_.append("(uu)");
return (*this);
@@ -87,7 +92,7 @@ public:
template<typename... _Types>
TypeOutputStream &writeType(const Struct<_Types...> &_value) {
- signature_.append("(");
+ signature_.append("(");
const auto itsSize(std::tuple_size<std::tuple<_Types...>>::value);
StructTypeWriter<itsSize-1, DBusTypeOutputStream, Struct<_Types...>>{}
(*this, _value);
@@ -97,28 +102,28 @@ public:
template<class _PolymorphicStruct>
TypeOutputStream &writeType(const std::shared_ptr<_PolymorphicStruct> &_value) {
- signature_.append("(");
- _value->writeType(*this);
+ signature_.append("(");
+ _value->template writeType<>((*this));
signature_.append(")");
return (*this);
}
template<typename... _Types>
TypeOutputStream &writeType(const Variant<_Types...> &_value) {
- signature_.append("(yv)");
- return (*this);
+ signature_.append("(yv)");
+ return (*this);
}
template<typename _Deployment, typename... _Types>
TypeOutputStream &writeType(const Variant<_Types...> &_value, const _Deployment *_depl) {
- if (_depl != nullptr && _depl->isFreeDesktop_) {
- signature_.append("v");
- } else {
- signature_.append("(yv)");
- }
- TypeOutputStreamWriteVisitor<DBusTypeOutputStream> typeVisitor(*this);
- ApplyVoidVisitor<TypeOutputStreamWriteVisitor<DBusTypeOutputStream>,
- Variant<_Types...>, _Types...>::visit(typeVisitor, _value);
+ if (_depl != nullptr && _depl->isFreeDesktop_) {
+ signature_.append("v");
+ } else {
+ signature_.append("(yv)");
+ }
+ TypeOutputStreamWriteVisitor<DBusTypeOutputStream> typeVisitor(*this);
+ ApplyVoidVisitor<TypeOutputStreamWriteVisitor<DBusTypeOutputStream>,
+ Variant<_Types...>, _Types...>::visit(typeVisitor, _value);
return (*this);
}
diff --git a/src/CommonAPI/DBus/DBusAddressTranslator.cpp b/src/CommonAPI/DBus/DBusAddressTranslator.cpp
index 5c5e3f1..57101b4 100644
--- a/src/CommonAPI/DBus/DBusAddressTranslator.cpp
+++ b/src/CommonAPI/DBus/DBusAddressTranslator.cpp
@@ -24,16 +24,15 @@ namespace DBus {
const char *COMMONAPI_DBUS_DEFAULT_CONFIG_FILE = "commonapi-dbus.ini";
const char *COMMONAPI_DBUS_DEFAULT_CONFIG_FOLDER = "/etc/";
-const std::size_t DBUS_MAXIMUM_NAME_LENGTH = 255;
-
-static std::shared_ptr<DBusAddressTranslator> theTranslator = std::make_shared<DBusAddressTranslator>();
std::shared_ptr<DBusAddressTranslator> DBusAddressTranslator::get() {
+ static std::shared_ptr<DBusAddressTranslator> theTranslator = std::make_shared<DBusAddressTranslator>();
return theTranslator;
}
DBusAddressTranslator::DBusAddressTranslator()
- : defaultDomain_("local") {
+ : defaultDomain_("local"),
+ dBusBusType_(DBusType_t::SESSION) {
init();
isDefault_ = ("dbus" == Runtime::get()->getDefaultBinding());
@@ -190,6 +189,21 @@ DBusAddressTranslator::readConfiguration() {
return false;
for (auto itsMapping : reader.getSections()) {
+ if(itsMapping.first == "dbus") {
+ // TODO this is kind of misplaced in the AddressTranslator...
+ std::string bus_type_str_ = itsMapping.second->getValue("dbus_bus_type");
+ if(bus_type_str_ == "SESSION") {
+ dBusBusType_ = DBusType_t::SESSION;
+ } else if (bus_type_str_ == "SYSTEM") {
+ dBusBusType_ = DBusType_t::SYSTEM;
+ } else {
+ COMMONAPI_FATAL("Invalid dbus_bus_type specified in .ini file, "
+ "choose one of {SYSTEM, SESSION}");
+ continue;
+ }
+ COMMONAPI_INFO("D-Bus bus type set to: " + bus_type_str_ + " via ini file");
+ continue;
+ }
CommonAPI::Address itsAddress(itsMapping.first);
std::string service = itsMapping.second->getValue("service");
@@ -291,5 +305,10 @@ DBusAddressTranslator::isValid(
return true;
}
+DBusType_t
+DBusAddressTranslator::getDBusBusType() const {
+ return dBusBusType_;
+}
+
} // namespace DBus
} // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusConnection.cpp b/src/CommonAPI/DBus/DBusConnection.cpp
index 07e7da5..cb4f8aa 100644
--- a/src/CommonAPI/DBus/DBusConnection.cpp
+++ b/src/CommonAPI/DBus/DBusConnection.cpp
@@ -14,6 +14,7 @@
#include <CommonAPI/DBus/DBusConnection.hpp>
#include <CommonAPI/DBus/DBusInputStream.hpp>
#include <CommonAPI/DBus/DBusProxy.hpp>
+#include <CommonAPI/DBus/DBusAddressTranslator.hpp>
namespace CommonAPI {
namespace DBus {
@@ -75,7 +76,7 @@ DBusConnection::DBusConnection(DBusType_t busType) :
watchContext_(NULL),
pauseDispatching_(false),
connection_(NULL),
- busType_(busType),
+ busType_(DBusAddressTranslator::get()->getDBusBusType()),
dbusConnectionStatusEvent_(this),
libdbusSignalMatchRulesCount_(0),
dbusObjectMessageHandler_(),
@@ -288,6 +289,15 @@ bool DBusConnection::connect(DBusError &dbusError, bool startDispatchThread) {
connection_ = dbus_bus_get_private(libdbusType, &dbusError.libdbusError_);
if (dbusError) {
+ #ifdef _MSC_VER
+ COMMONAPI_ERROR(std::string(__FUNCTION__) +
+ ": Name: " + dbusError.getName() +
+ " Message: " + dbusError.getMessage())
+ #else
+ COMMONAPI_ERROR(std::string(__PRETTY_FUNCTION__) +
+ ": Name: " + dbusError.getName() +
+ " Message: " + dbusError.getMessage())
+ #endif
return false;
}
@@ -390,6 +400,17 @@ bool DBusConnection::requestServiceNameAndBlock(const std::string& serviceName)
isServiceNameAcquired = (libdbusStatus == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER);
if (isServiceNameAcquired) {
connectionNameCount_.insert( { serviceName, (uint16_t)1 } );
+ }
+ else {
+ #ifdef _MSC_VER // Visual Studio
+ COMMONAPI_ERROR(std::string(__FUNCTION__) +
+ ": Name: " + dbusError.getName() +
+ " Message: " + dbusError.getMessage())
+ #else
+ COMMONAPI_ERROR(std::string(__PRETTY_FUNCTION__) +
+ ": Name: " + dbusError.getName() +
+ " Message: " + dbusError.getMessage())
+ #endif
}
} else {
conIter->second = conIter->second + 1;
@@ -466,30 +487,32 @@ void DBusConnection::enforceAsynchronousTimeouts() const {
while (!enforcerThreadCancelled_) {
enforceTimeoutMutex_.lock();
- int minTimeout = std::numeric_limits<int>::max(); // not really, but nearly "forever"
+ int timeout = std::numeric_limits<int>::max(); // not really, but nearly "forever"
if (timeoutMap_.size() > 0) {
auto minTimeoutElement = std::min_element(timeoutMap_.begin(), timeoutMap_.end(),
[] (const TimeoutMapElement& lhs, const TimeoutMapElement& rhs) {
return std::get<0>(lhs.second) < std::get<0>(rhs.second);
});
- minTimeout = std::get<0>(minTimeoutElement->second);
+ auto minTimeout = std::get<0>(minTimeoutElement->second);
+
+ std::chrono::high_resolution_clock::time_point now = std::chrono::high_resolution_clock::now();
+
+ timeout = (int)std::chrono::duration_cast<std::chrono::milliseconds>(minTimeout - now).count();
}
enforceTimeoutMutex_.unlock();
- auto startTime = std::chrono::high_resolution_clock::now();
if (std::cv_status::timeout ==
- enforceTimeoutCondition_.wait_for(itsLock, std::chrono::milliseconds(minTimeout))) {
+ enforceTimeoutCondition_.wait_for(itsLock, std::chrono::milliseconds(timeout))) {
//Do not access members if the DBusConnection was destroyed during the unlocked phase.
enforceTimeoutMutex_.lock();
auto it = timeoutMap_.begin();
while (it != timeoutMap_.end()) {
- int& currentTimeout = std::get<0>(it->second);
+ std::chrono::high_resolution_clock::time_point now = std::chrono::high_resolution_clock::now();
- currentTimeout -= minTimeout;
- if (currentTimeout <= 0) {
+ if (now > std::get<0>(it->second)) {
DBusPendingCall* libdbusPendingCall = it->first;
if (!dbus_pending_call_get_completed(libdbusPendingCall)) {
@@ -516,11 +539,6 @@ void DBusConnection::enforceAsynchronousTimeouts() const {
}
}
enforceTimeoutMutex_.unlock();
- } else {
- auto notifyTime = std::chrono::high_resolution_clock::now();
- int elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(notifyTime - startTime).count();
- for (auto &i : timeoutMap_)
- std::get<0>(i.second) -= elapsed;
}
}
}
@@ -578,7 +596,15 @@ std::future<CallStatus> DBusConnection::sendDBusMessageWithReplyAsync(
if (_info->timeout_ != DBUS_TIMEOUT_INFINITE) {
dbus_pending_call_ref(libdbusPendingCall);
- std::tuple<int, DBusMessageReplyAsyncHandler*, DBusMessage> toInsert { _info->timeout_, replyAsyncHandler, dbusMessage };
+ auto timeoutPoint = std::chrono::high_resolution_clock::now() + std::chrono::milliseconds(_info->timeout_);
+ std::tuple<
+ std::chrono::time_point<std::chrono::high_resolution_clock>,
+ DBusMessageReplyAsyncHandler*,
+ DBusMessage> toInsert {
+ timeoutPoint,
+ replyAsyncHandler,
+ dbusMessage
+ };
enforceTimeoutMutex_.lock();
timeoutMap_.insert( { libdbusPendingCall, toInsert } );
diff --git a/src/CommonAPI/DBus/DBusFactory.cpp b/src/CommonAPI/DBus/DBusFactory.cpp
index 4f7e0b9..f75619c 100644
--- a/src/CommonAPI/DBus/DBusFactory.cpp
+++ b/src/CommonAPI/DBus/DBusFactory.cpp
@@ -28,7 +28,7 @@ Factory::get() {
}
Factory::Factory()
- : defaultBusType_(DBusType_t::SESSION) {
+ : dBusBusType_(DBusAddressTranslator::get()->getDBusBusType()) {
}
Factory::~Factory() {
@@ -225,7 +225,7 @@ Factory::getConnection(const ConnectionId_t &_connectionId) {
// No connection found, lets create and initialize one
std::shared_ptr<DBusConnection> itsConnection
- = std::make_shared<DBusConnection>(defaultBusType_);
+ = std::make_shared<DBusConnection>(dBusBusType_);
connections_.insert({ _connectionId, itsConnection });
itsConnection->connect(true);
@@ -244,7 +244,7 @@ Factory::getConnection(std::shared_ptr<MainLoopContext> _context) {
// No connection found, lets create and initialize one
std::shared_ptr<DBusConnection> itsConnection
- = std::make_shared<DBusConnection>(defaultBusType_);
+ = std::make_shared<DBusConnection>(dBusBusType_);
contextConnections_.insert({ _context.get(), itsConnection } );
itsConnection->connect(false);
diff --git a/src/CommonAPI/DBus/DBusMainLoopContext.cpp b/src/CommonAPI/DBus/DBusMainLoopContext.cpp
index dea1ff9..beaee2c 100644
--- a/src/CommonAPI/DBus/DBusMainLoopContext.cpp
+++ b/src/CommonAPI/DBus/DBusMainLoopContext.cpp
@@ -89,12 +89,28 @@ const pollfd& DBusWatch::getAssociatedFileDescriptor() {
}
void DBusWatch::dispatch(unsigned int eventFlags) {
+#ifdef WIN32
+ unsigned int dbusWatchFlags = 0;
+
+ if (eventFlags & (POLLRDBAND | POLLRDNORM)) {
+ dbusWatchFlags |= DBUS_WATCH_READABLE;
+ }
+ if (eventFlags & POLLWRNORM) {
+ dbusWatchFlags |= DBUS_WATCH_WRITABLE;
+ }
+ if (eventFlags & (POLLERR | POLLNVAL)) {
+ dbusWatchFlags |= DBUS_WATCH_ERROR;
+ }
+ if (eventFlags & POLLHUP) {
+ dbusWatchFlags |= DBUS_WATCH_HANGUP;
+ }
+#else
// Pollflags do not correspond directly to DBus watch flags
unsigned int dbusWatchFlags = (eventFlags & POLLIN) |
((eventFlags & POLLOUT) >> 1) |
((eventFlags & POLLERR) >> 1) |
((eventFlags & POLLHUP) >> 1);
-
+#endif
dbus_watch_handle(libdbusWatch_, dbusWatchFlags);
}
diff --git a/src/CommonAPI/DBus/DBusProxy.cpp b/src/CommonAPI/DBus/DBusProxy.cpp
index a28abff..47336f7 100644
--- a/src/CommonAPI/DBus/DBusProxy.cpp
+++ b/src/CommonAPI/DBus/DBusProxy.cpp
@@ -49,16 +49,13 @@ bool DBusProxy::isAvailable() const {
}
bool DBusProxy::isAvailableBlocking() const {
- if (availabilityStatus_ == AvailabilityStatus::UNKNOWN) {
- std::chrono::milliseconds singleWaitDuration(2);
+ std::unique_lock<std::mutex> lock(availabilityMutex_);
- // Wait for the service registry
- while (availabilityStatus_ == AvailabilityStatus::UNKNOWN) {
- std::this_thread::sleep_for(singleWaitDuration);
- }
- }
+ while (availabilityStatus_ != AvailabilityStatus::AVAILABLE) {
+ availabilityCondition_.wait(lock);
+ }
- return isAvailable();
+ return true;
}
ProxyStatusEvent& DBusProxy::getProxyStatusEvent() {
@@ -72,6 +69,7 @@ InterfaceVersionAttribute& DBusProxy::getInterfaceVersionAttribute() {
void DBusProxy::onDBusServiceInstanceStatus(const AvailabilityStatus& availabilityStatus) {
availabilityStatus_ = availabilityStatus;
dbusProxyStatusEvent_.notifyListeners(availabilityStatus);
+ availabilityCondition_.notify_one();
}
DBusProxyConnection::DBusSignalHandlerToken DBusProxy::subscribeForSelectiveBroadcastOnConnection(
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 52122c1..f6620a1 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -8,7 +8,8 @@ cmake_minimum_required (VERSION 2.8.1)
pkg_check_modules(GLIB glib-2.0)
include_directories(.
- ./src-gen
+ ./src-gen/core
+ ./src-gen/dbus
${COMMONAPI_INCLUDE_DIRS}
${DBus_INCLUDE_DIRS}
${gtest_SOURCE_DIR}/include
@@ -17,41 +18,41 @@ include_directories(.
set(VERSION "v1_0")
-set(TestInterfaceSources src-gen/commonapi/tests/DerivedTypeCollection.cpp
- src-gen/${VERSION}/commonapi/tests/TestInterfaceStubDefault.cpp)
+set(TestInterfaceSources src-gen/core/commonapi/tests/DerivedTypeCollection.cpp
+ src-gen/core/${VERSION}/commonapi/tests/TestInterfaceStubDefault.cpp)
set(TestInterfaceDBusSources ${TestInterfaceSources}
- src-gen/${VERSION}/commonapi/tests/TestInterfaceDBusProxy.cpp
- src-gen/${VERSION}/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
- src-gen/${VERSION}/fake/legacy/service/LegacyInterfaceDBusProxy.cpp)
+ 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)
set(FreedesktopPropertiesDBusSources ${TestInterfaceSources}
- src-gen/${VERSION}/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
- src-gen/${VERSION}/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
- src-gen/${VERSION}/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
- src-gen/${VERSION}/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
- src-gen/${VERSION}/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
- src-gen/${VERSION}/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp)
-
-set(ManagedSources src-gen/${VERSION}/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
- src-gen/${VERSION}/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
- src-gen/${VERSION}/commonapi/tests/managed/RootInterfaceStubDefault.cpp
- src-gen/${VERSION}/commonapi/tests/managed/SecondRootStubDefault.cpp)
+ src-gen/dbus/${VERSION}/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
+ src-gen/core/${VERSION}/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
+ src-gen/core/${VERSION}/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp)
+
+set(ManagedSources src-gen/core/${VERSION}/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
+ src-gen/core/${VERSION}/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
+ src-gen/core/${VERSION}/commonapi/tests/managed/RootInterfaceStubDefault.cpp
+ src-gen/core/${VERSION}/commonapi/tests/managed/SecondRootStubDefault.cpp)
set(ManagedDBusSources ${ManagedSources}
- src-gen/${VERSION}/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
- src-gen/${VERSION}/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
- src-gen/${VERSION}/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
- src-gen/${VERSION}/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
- src-gen/${VERSION}/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
- src-gen/${VERSION}/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
- src-gen/${VERSION}/commonapi/tests/managed/SecondRootDBusProxy.cpp
- src-gen/${VERSION}/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp)
-
-set(ExtendedInterfaceSources src-gen/${VERSION}/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
- src-gen/${VERSION}/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
- src-gen/${VERSION}/commonapi/tests/ExtendedInterfaceStubDefault.cpp)
+ src-gen/dbus/${VERSION}/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/managed/SecondRootDBusProxy.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp)
+
+set(ExtendedInterfaceSources src-gen/dbus/${VERSION}/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
+ src-gen/dbus/${VERSION}/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
+ src-gen/core/${VERSION}/commonapi/tests/ExtendedInterfaceStubDefault.cpp)
set(LIB_LINK_LIBRARIES -Wl,--no-as-needed CommonAPI-DBus -Wl,--as-needed CommonAPI)
@@ -95,7 +96,11 @@ target_link_libraries(SomeOtherNameForGeneratedDBus ${LIB_LINK_LIBRARIES})
add_executable(DBusMainLoopIntegrationTest DBusMainLoopIntegrationTest.cpp
${TestInterfaceDBusSources})
+if (MSVC)
+target_link_libraries(DBusMainLoopIntegrationTest ${TEST_LINK_LIBRARIES} ws2_32)
+else()
target_link_libraries(DBusMainLoopIntegrationTest ${TEST_LINK_LIBRARIES} ${GLIB_LDFLAGS})
+endif()
##############################################################################
# DBusServiceRegistryTest
diff --git a/src/test/DBusAddressTranslatorTest.cpp b/src/test/DBusAddressTranslatorTest.cpp
index 78d1b00..e26eef9 100644
--- a/src/test/DBusAddressTranslatorTest.cpp
+++ b/src/test/DBusAddressTranslatorTest.cpp
@@ -220,6 +220,23 @@ TEST_F(AddressTranslatorTest, InsertAddressPossible) {
ASSERT_EQ(commonApiAddressRef, commonApiAddressResult.getAddress());
}
+TEST_F(AddressTranslatorTest, InsertUniqueBusNameTranslate) {
+ std::shared_ptr<CommonAPI::DBus::DBusAddressTranslator> translator = CommonAPI::DBus::DBusAddressTranslator::get();
+
+ translator->insert("local:my.Interface:busname.legacy.service_1_133",
+ ":1.133", /* unique bus name */
+ "/org/busname/legacy/service",
+ "busname.legacy.service");
+
+ CommonAPI::DBus::DBusAddress dbusAddress;
+
+ translator->translate("local:my.Interface:busname.legacy.service_1_133", dbusAddress);
+
+ ASSERT_EQ(":1.133", dbusAddress.getService());
+ ASSERT_EQ("busname.legacy.service", dbusAddress.getInterface());
+ ASSERT_EQ("/org/busname/legacy/service", dbusAddress.getObjectPath());
+}
+
TEST_F(AddressTranslatorTest, InsertAddressNotPossibleConflictTranslate) {
std::shared_ptr<CommonAPI::DBus::DBusAddressTranslator> translator = CommonAPI::DBus::DBusAddressTranslator::get();
@@ -451,7 +468,7 @@ void callPythonService(std::string _pythonFileNameAndCommand) {
const char *pathToFolderForFakeLegacyService =
getenv("TEST_COMMONAPI_DBUS_ADDRESS_TRANSLATOR_FAKE_LEGACY_SERVICE_FOLDER");
- ASSERT_NE(pathToFolderForFakeLegacyService, NULL) << "Environment variable "
+ ASSERT_NE(pathToFolderForFakeLegacyService, nullptr) << "Environment variable "
"TEST_COMMONAPI_DBUS_ADDRESS_TRANSLATOR_FAKE_LEGACY_SERVICE_FOLDER "
"is not set!";
diff --git a/src/test/DBusConnectionTest.cpp b/src/test/DBusConnectionTest.cpp
index cc93990..9c8212e 100644
--- a/src/test/DBusConnectionTest.cpp
+++ b/src/test/DBusConnectionTest.cpp
@@ -95,7 +95,7 @@ TEST_F(DBusConnectionTest, ConnectionStatusEventWorks) {
TEST_F(DBusConnectionTest, SendingAsyncDBusMessagesWorks) {
const char service[] = "commonapi.dbus.test.TestInterface_commonapi.dbus.test.TestObject";
const char objectPath[] = "/commonapi/dbus/test/TestObject";
- const char interface[] = "commonapi.dbus.test.TestInterface";
+ const char interfaceName[] = "commonapi.dbus.test.TestInterface";
const char methodName[] = "TestMethod";
auto interfaceHandlerDBusConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION);
@@ -121,7 +121,7 @@ TEST_F(DBusConnectionTest, SendingAsyncDBusMessagesWorks) {
for (uint32_t expectedDBusMessageCount = 1; expectedDBusMessageCount <= 10; expectedDBusMessageCount++) {
CommonAPI::DBus::DBusMessage dbusMessageCall = CommonAPI::DBus::DBusMessage::createMethodCall(
- CommonAPI::DBus::DBusAddress(service, objectPath, interface),
+ CommonAPI::DBus::DBusAddress(service, objectPath, interfaceName),
methodName,
"");
@@ -156,7 +156,7 @@ TEST_F(DBusConnectionTest, SendingAsyncDBusMessagesWorks) {
TEST_F(DBusConnectionTest, SendingAsyncDBusMessagesWorksManualDispatch) {
const char service[] = "commonapi.dbus.test.TestInterface_commonapi.dbus.test.TestObject";
const char objectPath[] = "/commonapi/dbus/test/TestObject";
- const char interface[] = "commonapi.dbus.test.TestInterface";
+ const char interfaceName[] = "commonapi.dbus.test.TestInterface";
const char methodName[] = "TestMethod";
auto interfaceHandlerDBusConnection = CommonAPI::DBus::DBusConnection::getBus(CommonAPI::DBus::DBusType_t::SESSION);
@@ -182,7 +182,7 @@ TEST_F(DBusConnectionTest, SendingAsyncDBusMessagesWorksManualDispatch) {
for (uint32_t expectedDBusMessageCount = 1; expectedDBusMessageCount <= 10; expectedDBusMessageCount++) {
CommonAPI::DBus::DBusMessage dbusMessageCall = CommonAPI::DBus::DBusMessage::createMethodCall(
- CommonAPI::DBus::DBusAddress(service, objectPath, interface),
+ CommonAPI::DBus::DBusAddress(service, objectPath, interfaceName),
methodName,
"");
diff --git a/src/test/DemoMainLoop.hpp b/src/test/DemoMainLoop.hpp
index 8bcd741..0626d3c 100644
--- a/src/test/DemoMainLoop.hpp
+++ b/src/test/DemoMainLoop.hpp
@@ -240,7 +240,7 @@ class MainLoop {
watchIterator != watchesToDispatch_.end();
watchIterator++) {
Watch* watch = watchIterator->second;
- const unsigned int flags = 7;
+ const unsigned int flags = watch->getAssociatedFileDescriptor().events;
watch->dispatch(flags);
}
diff --git a/src/test/commonapi/tests/DerivedTypeCollection.hpp b/src/test/commonapi/tests/DerivedTypeCollection.hpp
deleted file mode 100644
index 95d63c5..0000000
--- a/src/test/commonapi/tests/DerivedTypeCollection.hpp
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.0.1.v201504231326.
-* 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_Derived_Type_Collection_HPP_
-#define COMMONAPI_TESTS_Derived_Type_Collection_HPP_
-
-
-#include <commonapi/tests/PredefinedTypeCollection.hpp>
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#endif
-
-#include <CommonAPI/Deployment.hpp>
-#include <CommonAPI/InputStream.hpp>
-#include <CommonAPI/OutputStream.hpp>
-#include <CommonAPI/Struct.hpp>
-#include <CommonAPI/Types.hpp>
-#include <cstdint>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace commonapi {
-namespace tests {
-
-struct DerivedTypeCollection {
- struct TestStruct : CommonAPI::Struct<commonapi::tests::PredefinedTypeCollection::TestString, uint16_t> {
-
- TestStruct() {
- }
- TestStruct(const commonapi::tests::PredefinedTypeCollection::TestString &_testString, const uint16_t &_uintValue)
- {
- std::get<0>(values_) = _testString;
- std::get<1>(values_) = _uintValue;
- }
- /**
- * the name of the property
- */
- inline const commonapi::tests::PredefinedTypeCollection::TestString &getTestString() const { return std::get<0>(values_); }
- inline void setTestString(const commonapi::tests::PredefinedTypeCollection::TestString &_value) { std::get<0>(values_) = _value; }
- /**
- * the actual value
- */
- 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 !((*this) == _other);
- }
-
- };
- typedef std::vector<TestStruct> TestArrayTestStruct;
- typedef std::unordered_map<uint32_t, TestArrayTestStruct> TestMap;
- /**
- * Common errors.
- */
-
- struct TestEnum : CommonAPI::Enumeration<int32_t> {
- TestEnum() = default;
- TestEnum(const int32_t &_value)
- : CommonAPI::Enumeration<int32_t>(_value) {}
- static const int32_t E_UNKNOWN = 0;
- static const int32_t E_OK = 1;
- static const int32_t E_OUT_OF_RANGE = 2;
- static const int32_t E_NOT_USED = 3;
- };
-
- struct TestEnumExtended : TestEnum {
- TestEnumExtended() = default;
- TestEnumExtended(const int32_t &_value)
- : TestEnum(_value) {}
- static const int32_t E_NEW = 4;
- };
-
- struct TestEnumExtended2 : TestEnumExtended {
- TestEnumExtended2() = default;
- TestEnumExtended2(const int32_t &_value)
- : TestEnumExtended(_value) {}
- static const int32_t E_NEW2 = 5;
- };
- struct TestStructExtended : CommonAPI::Struct<commonapi::tests::PredefinedTypeCollection::TestString, uint16_t, TestEnumExtended2> {
-
- TestStructExtended() {
- }
- TestStructExtended(const commonapi::tests::PredefinedTypeCollection::TestString &_testString, const uint16_t &_uintValue, const TestEnumExtended2 &_testEnumExtended2)
- {
- std::get<0>(values_) = _testString;
- std::get<1>(values_) = _uintValue;
- std::get<2>(values_) = _testEnumExtended2;
- }
- /**
- * the name of the property
- */
- inline const commonapi::tests::PredefinedTypeCollection::TestString &getTestString() const { return std::get<0>(values_); }
- inline void setTestString(const commonapi::tests::PredefinedTypeCollection::TestString &_value) { std::get<0>(values_) = _value; }
- /**
- * the actual value
- */
- inline const uint16_t &getUintValue() const { return std::get<1>(values_); }
- 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 !((*this) == _other);
- }
-
- };
- typedef std::unordered_map<TestEnum, std::string, CommonAPI::EnumHasher<TestEnum>> TestEnumMap;
-
- struct TestEnumMissingValue : CommonAPI::Enumeration<int32_t> {
- TestEnumMissingValue() = default;
- TestEnumMissingValue(const int32_t &_value)
- : CommonAPI::Enumeration<int32_t>(_value) {}
- static const int32_t E1 = 0;
- static const int32_t E2 = 1;
- static const int32_t E3 = 2;
- };
- typedef std::vector<uint64_t> TestArrayUInt64;
- static const CommonAPI::Serial TESTPOLYMORPHICSTRUCT_SERIAL = 0x8F51A326;
- static const CommonAPI::Serial TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL = 0xA49310F2;
-
- struct TestPolymorphicStruct : CommonAPI::PolymorphicStruct {
- static std::shared_ptr<TestPolymorphicStruct> create(CommonAPI::Serial _serial);
- const CommonAPI::Serial getSerial() const { return TESTPOLYMORPHICSTRUCT_SERIAL; }
-
- TestPolymorphicStruct() {
- }
- TestPolymorphicStruct(const commonapi::tests::PredefinedTypeCollection::TestString &_testString, const uint16_t &_uintValue)
- {
- std::get<0>(values_) = _testString;
- std::get<1>(values_) = _uintValue;
- }
- template<class _Input>
- void readValue(CommonAPI::InputStream<_Input> &_input, const CommonAPI::EmptyDeployment *_depl) {
- _input.template readValue<CommonAPI::EmptyDeployment>(std::get<0>(values_));
- _input.template readValue<CommonAPI::EmptyDeployment>(std::get<1>(values_));
- switch (getSerial()) {
- case TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
- static_cast<TestExtendedPolymorphicStruct *>(this)->template readValue<_Input>(_input, _depl);
- break;
- default:
- break;
- }
- }
-
- template<class _Input, class _Deployment>
- void readValue(CommonAPI::InputStream<_Input> &_input, const _Deployment *_depl) {
- _input.template readValue<>(std::get<0>(values_), std::get<0>(_depl->values_));
- _input.template readValue<>(std::get<1>(values_), std::get<1>(_depl->values_));
- switch (getSerial()) {
- case TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
- static_cast<TestExtendedPolymorphicStruct *>(this)->template readValue<>(_input, _depl);
- break;
- default:
- break;
- }
- }
-
- template<class _Output>
- void writeType(CommonAPI::TypeOutputStream<_Output> &_output) {
- _output.writeType(std::get<0>(values_));
- _output.writeType(std::get<1>(values_));
- switch (getSerial()) {
- case TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
- static_cast<TestExtendedPolymorphicStruct *>(this)->template writeType<_Output>(_output);
- break;
- default:
- break;
- }
- }
-
- template<class _Output>
- void writeValue(CommonAPI::OutputStream<_Output> &_output, const CommonAPI::EmptyDeployment *_depl) {
- _output.template writeValue<CommonAPI::EmptyDeployment>(std::get<0>(values_));
- _output.template writeValue<CommonAPI::EmptyDeployment>(std::get<1>(values_));
- switch (getSerial()) {
- case TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
- static_cast<TestExtendedPolymorphicStruct *>(this)->template writeValue<_Output>(_output, _depl);
- break;
- default:
- break;
- }
- }
-
- template<class _Output, class _Deployment>
- void writeValue(CommonAPI::OutputStream<_Output> &_output, const _Deployment *_depl) {
- _output.template writeValue<>(std::get<0>(values_), _depl, std::get<0>(_depl->values_));
- _output.template writeValue<>(std::get<1>(values_), _depl, std::get<1>(_depl->values_));
- switch (getSerial()) {
- case TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
- static_cast<TestExtendedPolymorphicStruct *>(this)->template writeValue<>(_output, _depl);
- break;
- default:
- break;
- }
- }
- /**
- * the name of the property
- */
- inline const commonapi::tests::PredefinedTypeCollection::TestString &getTestString() const { return std::get<0>(values_); }
- inline void setTestString(const commonapi::tests::PredefinedTypeCollection::TestString &_value) { std::get<0>(values_) = _value; }
- /**
- * the actual value
- */
- inline const uint16_t &getUintValue() const { return std::get<1>(values_); }
- 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 !((*this) == _other);
- }
-
- };
- struct TestExtendedPolymorphicStruct : TestPolymorphicStruct {
- const CommonAPI::Serial getSerial() const { return TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL; }
-
- TestExtendedPolymorphicStruct() {
- }
- TestExtendedPolymorphicStruct(const commonapi::tests::PredefinedTypeCollection::TestString &_testString, const uint16_t &_uintValue, const uint32_t &_additionalValue)
- : TestPolymorphicStruct(_testString, _uintValue)
- {
- std::get<0>(values_) = _additionalValue;
- }
- template<class _Input>
- void readValue(CommonAPI::InputStream<_Input> &_input, const CommonAPI::EmptyDeployment *_depl) {
- _input.template readValue<CommonAPI::EmptyDeployment>(std::get<0>(values_));
- }
-
- template<class _Input, class _Deployment>
- void readValue(CommonAPI::InputStream<_Input> &_input, const _Deployment *_depl) {
- _input.template readValue<>(std::get<0>(values_), std::get<2>(_depl->values_));
- }
-
- template<class _Output>
- void writeType(CommonAPI::TypeOutputStream<_Output> &_output) {
- _output.writeType(std::get<0>(values_));
- }
-
- template<class _Output>
- void writeValue(CommonAPI::OutputStream<_Output> &_output, const CommonAPI::EmptyDeployment *_depl) {
- _output.template writeValue<CommonAPI::EmptyDeployment>(std::get<0>(values_));
- }
-
- template<class _Output, class _Deployment>
- void writeValue(CommonAPI::OutputStream<_Output> &_output, const _Deployment *_depl) {
- _output.template writeValue<>(std::get<0>(values_), _depl, std::get<2>(_depl->values_));
- }
- inline const uint32_t &getAdditionalValue() const { return std::get<0>(values_); }
- inline void setAdditionalValue(const uint32_t &_value) { std::get<0>(values_) = _value; }
-
- std::tuple<uint32_t> values_;
- bool operator==(const TestExtendedPolymorphicStruct &_other) const;
- inline bool operator!=(const TestExtendedPolymorphicStruct &_other) const {
- return !((*this) == _other);
- }
-
- };
- typedef std::unordered_map<uint8_t, std::shared_ptr<TestPolymorphicStruct>> MapIntToPolymorphic;
- struct StructWithPolymorphicMember : CommonAPI::Struct<uint32_t, std::shared_ptr<TestPolymorphicStruct>> {
-
- StructWithPolymorphicMember() {
- }
- StructWithPolymorphicMember(const uint32_t &_numberValue, const std::shared_ptr<TestPolymorphicStruct> &_polymorphicMember)
- {
- std::get<0>(values_) = _numberValue;
- std::get<1>(values_) = _polymorphicMember;
- }
- inline const uint32_t &getNumberValue() const { return std::get<0>(values_); }
- inline void setNumberValue(const uint32_t &_value) { std::get<0>(values_) = _value; }
- inline const std::shared_ptr<TestPolymorphicStruct> &getPolymorphicMember() const { return std::get<1>(values_); }
- inline void setPolymorphicMember(const std::shared_ptr<TestPolymorphicStruct> &_value) { std::get<1>(values_) = _value; }
- bool operator==(const StructWithPolymorphicMember &_other) const;
- inline bool operator!=(const StructWithPolymorphicMember &_other) const {
- return !((*this) == _other);
- }
-
- };
- struct StructWithEnumKeyMap : CommonAPI::Struct<TestEnumMap> {
-
- StructWithEnumKeyMap() {
- }
- StructWithEnumKeyMap(const TestEnumMap &_testMap)
- {
- std::get<0>(values_) = _testMap;
- }
- 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 !((*this) == _other);
- }
-
- };
-
-
-
-static inline const char* getTypeCollectionName() {
- static const char* typeCollectionName = "commonapi.tests.DerivedTypeCollection";
- return typeCollectionName;
-}
-
-
-}; // struct DerivedTypeCollection
-
-} // namespace tests
-} // namespace commonapi
-
-namespace CommonAPI {
-}
-
-
-namespace std {
- //Hash for TestEnum
- template<>
- struct hash<::commonapi::tests::DerivedTypeCollection::TestEnum> {
- inline size_t operator()(const ::commonapi::tests::DerivedTypeCollection::TestEnum& testEnum) const {
- return static_cast<int32_t>(testEnum);
- }
- };
- //Hash for TestEnumExtended2
- template<>
- struct hash<::commonapi::tests::DerivedTypeCollection::TestEnumExtended2> {
- inline size_t operator()(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended2& testEnumExtended2) const {
- return static_cast<int32_t>(testEnumExtended2);
- }
- };
- //Hash for TestEnumMissingValue
- template<>
- struct hash<::commonapi::tests::DerivedTypeCollection::TestEnumMissingValue> {
- inline size_t operator()(const ::commonapi::tests::DerivedTypeCollection::TestEnumMissingValue& testEnumMissingValue) const {
- return static_cast<int32_t>(testEnumMissingValue);
- }
- };
- //Hash for TestEnumExtended
- template<>
- struct hash<::commonapi::tests::DerivedTypeCollection::TestEnumExtended> {
- inline size_t operator()(const ::commonapi::tests::DerivedTypeCollection::TestEnumExtended& testEnumExtended) const {
- return static_cast<int32_t>(testEnumExtended);
- }
- };
-}
-
-#endif // COMMONAPI_TESTS_Derived_Type_Collection_HPP_
diff --git a/src/test/src-gen/commonapi/tests/DerivedTypeCollection.cpp b/src/test/src-gen/commonapi/tests/DerivedTypeCollection.cpp
deleted file mode 100644
index fbdd309..0000000
--- a/src/test/src-gen/commonapi/tests/DerivedTypeCollection.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
-* 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 "DerivedTypeCollection.hpp"
-
-
-namespace commonapi {
-namespace tests {
-
-
-bool DerivedTypeCollection::TestStructExtended::operator==(const DerivedTypeCollection::TestStructExtended& _other) const {
- return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getTestEnumExtended2() == _other.getTestEnumExtended2());
-}
-
-#ifndef WIN32
-const int32_t DerivedTypeCollection::TestEnum::E_UNKNOWN;
-const int32_t DerivedTypeCollection::TestEnum::E_OK;
-const int32_t DerivedTypeCollection::TestEnum::E_OUT_OF_RANGE;
-const int32_t DerivedTypeCollection::TestEnum::E_NOT_USED;
-#endif
-#ifndef WIN32
-const int32_t DerivedTypeCollection::TestEnumExtended2::E_NEW2;
-#endif
-#ifndef WIN32
-const int32_t DerivedTypeCollection::TestEnumMissingValue::E1;
-const int32_t DerivedTypeCollection::TestEnumMissingValue::E2;
-const int32_t DerivedTypeCollection::TestEnumMissingValue::E3;
-#endif
-#ifndef WIN32
-const int32_t DerivedTypeCollection::TestEnumExtended::E_NEW;
-#endif
-
-bool DerivedTypeCollection::TestStruct::operator==(const DerivedTypeCollection::TestStruct& _other) const {
- return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue());
-}
-
-std::shared_ptr<DerivedTypeCollection::TestPolymorphicStruct> DerivedTypeCollection::TestPolymorphicStruct::create(CommonAPI::Serial _serial) {
- switch (_serial) {
- case DerivedTypeCollection::TESTPOLYMORPHICSTRUCT_SERIAL:
- return std::make_shared<DerivedTypeCollection::TestPolymorphicStruct>();
- case DerivedTypeCollection::TESTEXTENDEDPOLYMORPHICSTRUCT_SERIAL:
- return std::make_shared<DerivedTypeCollection::TestExtendedPolymorphicStruct>();
- default:
- break;
- }
- return std::shared_ptr<DerivedTypeCollection::TestPolymorphicStruct>();
-}
-
-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
-} // namespace commonapi
diff --git a/src/test/src-gen/commonapi/tests/PredefinedTypeCollection.hpp b/src/test/src-gen/commonapi/tests/PredefinedTypeCollection.hpp
deleted file mode 100644
index b69d0a6..0000000
--- a/src/test/src-gen/commonapi/tests/PredefinedTypeCollection.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
-* 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_Predefined_Type_Collection_HPP_
-#define COMMONAPI_TESTS_Predefined_Type_Collection_HPP_
-
-
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#endif
-
-#include <CommonAPI/ByteBuffer.hpp>
-#include <CommonAPI/Types.hpp>
-#include <cstdint>
-#include <string>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace commonapi {
-namespace tests {
-
-struct PredefinedTypeCollection {
- typedef uint8_t TestUInt8;
- typedef uint16_t TestUInt16;
- typedef uint32_t TestUInt32;
- typedef uint64_t TestUInt64;
- typedef int8_t TestInt8;
- typedef int16_t TestInt16;
- typedef int32_t TestInt32;
- typedef int64_t TestInt64;
- typedef bool TestBoolean;
- typedef CommonAPI::ByteBuffer TestByteBuffer;
- typedef double TestDouble;
- typedef float TestFloat;
- typedef std::string TestString;
-
-
-
-static inline const char* getTypeCollectionName() {
- static const char* typeCollectionName = "commonapi.tests.PredefinedTypeCollection";
- return typeCollectionName;
-}
-
-
-}; // struct PredefinedTypeCollection
-
-} // namespace tests
-} // namespace commonapi
-
-namespace CommonAPI {
-}
-
-
-namespace std {
-}
-
-#endif // COMMONAPI_TESTS_Predefined_Type_Collection_HPP_
diff --git a/src/test/commonapi/tests/DerivedTypeCollection.cpp b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.cpp
index edf4c7c..f1e1b69 100644
--- a/src/test/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.0.1.v201504231326.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -18,17 +18,6 @@ bool DerivedTypeCollection::TestStructExtended::operator==(const DerivedTypeColl
return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue() && getTestEnumExtended2() == _other.getTestEnumExtended2());
}
-#ifndef WIN32
-const int32_t DerivedTypeCollection::TestEnum::E_UNKNOWN;
-const int32_t DerivedTypeCollection::TestEnum::E_OK;
-const int32_t DerivedTypeCollection::TestEnum::E_OUT_OF_RANGE;
-const int32_t DerivedTypeCollection::TestEnum::E_NOT_USED;
-const int32_t DerivedTypeCollection::TestEnumExtended2::E_NEW2;
-const int32_t DerivedTypeCollection::TestEnumMissingValue::E1;
-const int32_t DerivedTypeCollection::TestEnumMissingValue::E2;
-const int32_t DerivedTypeCollection::TestEnumMissingValue::E3;
-const int32_t DerivedTypeCollection::TestEnumExtended::E_NEW;
-#endif
bool DerivedTypeCollection::TestStruct::operator==(const DerivedTypeCollection::TestStruct& _other) const {
return (getTestString() == _other.getTestString() && getUintValue() == _other.getUintValue());
diff --git a/src/test/src-gen/commonapi/tests/DerivedTypeCollection.hpp b/src/test/src-gen/core/commonapi/tests/DerivedTypeCollection.hpp
index 2583e9b..70675c4 100644
--- a/src/test/src-gen/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.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -65,45 +65,90 @@ struct DerivedTypeCollection {
*/
struct TestEnum : CommonAPI::Enumeration<int32_t> {
+ enum Literal : int32_t {
+ E_UNKNOWN = 0,
+ E_OK = 1,
+ E_OUT_OF_RANGE = 2,
+ E_NOT_USED = 3
+ };
+
TestEnum() = default;
- TestEnum(const int32_t &_value)
- : CommonAPI::Enumeration<int32_t>(_value) {}
- /**
- * description: default
- */
- static const int32_t E_UNKNOWN = 0;
- /**
- * description: no error - positive reply
- */
- static const int32_t E_OK = 1;
- /**
- * description: value out of range
- */
- static const int32_t E_OUT_OF_RANGE = 2;
- /**
- * description: not used
- */
- static const int32_t E_NOT_USED = 3;
+ TestEnum(const Literal &_value)
+ : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+
+ inline bool operator==(const TestEnum &_other) const { return (value_ == _other.value_); }
+ inline bool operator!=(const TestEnum &_other) const { return (value_ != _other.value_); }
+ inline bool operator<=(const TestEnum &_other) const { return (value_ <= _other.value_); }
+ inline bool operator>=(const TestEnum &_other) const { return (value_ >= _other.value_); }
+ inline bool operator<(const TestEnum &_other) const { return (value_ < _other.value_); }
+ inline bool operator>(const TestEnum &_other) const { return (value_ > _other.value_); }
+
+ inline bool operator==(const Literal &_value) const { return (value_ == static_cast<int32_t>(_value)); }
+ inline bool operator!=(const Literal &_value) const { return (value_ != static_cast<int32_t>(_value)); }
+ inline bool operator<=(const Literal &_value) const { return (value_ <= static_cast<int32_t>(_value)); }
+ inline bool operator>=(const Literal &_value) const { return (value_ >= static_cast<int32_t>(_value)); }
+ inline bool operator<(const Literal &_value) const { return (value_ < static_cast<int32_t>(_value)); }
+ inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
};
struct TestEnumExtended : TestEnum {
+ enum Literal : int32_t {
+ E_NEW = 4
+ };
+
TestEnumExtended() = default;
- TestEnumExtended(const int32_t &_value)
- : TestEnum(_value) {}
- /**
- * description: new error
- */
- static const int32_t E_NEW = 4;
+ TestEnumExtended(const Literal &_value)
+ : TestEnum(static_cast<TestEnum::Literal>(_value)) {}
+ TestEnumExtended &operator=(const TestEnum::Literal &_value) {
+ value_ = static_cast<int32_t>(_value);
+ return (*this);
+ }
+
+ inline bool operator==(const TestEnumExtended &_other) const { return (value_ == _other.value_); }
+ inline bool operator!=(const TestEnumExtended &_other) const { return (value_ != _other.value_); }
+ inline bool operator<=(const TestEnumExtended &_other) const { return (value_ <= _other.value_); }
+ inline bool operator>=(const TestEnumExtended &_other) const { return (value_ >= _other.value_); }
+ inline bool operator<(const TestEnumExtended &_other) const { return (value_ < _other.value_); }
+ inline bool operator>(const TestEnumExtended &_other) const { return (value_ > _other.value_); }
+
+ inline bool operator==(const Literal &_value) const { return (value_ == static_cast<int32_t>(_value)); }
+ inline bool operator!=(const Literal &_value) const { return (value_ != static_cast<int32_t>(_value)); }
+ inline bool operator<=(const Literal &_value) const { return (value_ <= static_cast<int32_t>(_value)); }
+ inline bool operator>=(const Literal &_value) const { return (value_ >= static_cast<int32_t>(_value)); }
+ inline bool operator<(const Literal &_value) const { return (value_ < static_cast<int32_t>(_value)); }
+ inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
};
struct TestEnumExtended2 : TestEnumExtended {
+ enum Literal : int32_t {
+ E_NEW2 = 5
+ };
+
TestEnumExtended2() = default;
- TestEnumExtended2(const int32_t &_value)
- : TestEnumExtended(_value) {}
- /**
- * description: new error
- */
- static const int32_t E_NEW2 = 5;
+ TestEnumExtended2(const Literal &_value)
+ : TestEnumExtended(static_cast<TestEnumExtended::Literal>(_value)) {}
+ TestEnumExtended2 &operator=(const TestEnumExtended::Literal &_value) {
+ value_ = static_cast<int32_t>(_value);
+ return (*this);
+ }
+ TestEnumExtended &operator=(const TestEnum::Literal &_value) {
+ value_ = static_cast<int32_t>(_value);
+ return (*this);
+ }
+
+ inline bool operator==(const TestEnumExtended2 &_other) const { return (value_ == _other.value_); }
+ inline bool operator!=(const TestEnumExtended2 &_other) const { return (value_ != _other.value_); }
+ inline bool operator<=(const TestEnumExtended2 &_other) const { return (value_ <= _other.value_); }
+ inline bool operator>=(const TestEnumExtended2 &_other) const { return (value_ >= _other.value_); }
+ inline bool operator<(const TestEnumExtended2 &_other) const { return (value_ < _other.value_); }
+ inline bool operator>(const TestEnumExtended2 &_other) const { return (value_ > _other.value_); }
+
+ inline bool operator==(const Literal &_value) const { return (value_ == static_cast<int32_t>(_value)); }
+ inline bool operator!=(const Literal &_value) const { return (value_ != static_cast<int32_t>(_value)); }
+ inline bool operator<=(const Literal &_value) const { return (value_ <= static_cast<int32_t>(_value)); }
+ inline bool operator>=(const Literal &_value) const { return (value_ >= static_cast<int32_t>(_value)); }
+ inline bool operator<(const Literal &_value) const { return (value_ < static_cast<int32_t>(_value)); }
+ inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
};
struct TestStructExtended : CommonAPI::Struct<::commonapi::tests::PredefinedTypeCollection::TestString, uint16_t, TestEnumExtended2> {
@@ -136,15 +181,29 @@ struct DerivedTypeCollection {
typedef std::unordered_map<TestEnum, std::string, CommonAPI::EnumHasher<TestEnum>> TestEnumMap;
struct TestEnumMissingValue : CommonAPI::Enumeration<int32_t> {
+ enum Literal : int32_t {
+ E1 = 0,
+ E2 = 1,
+ E3 = 2
+ };
+
TestEnumMissingValue() = default;
- TestEnumMissingValue(const int32_t &_value)
- : CommonAPI::Enumeration<int32_t>(_value) {}
- /**
- * description: default
- */
- static const int32_t E1 = 0;
- static const int32_t E2 = 1;
- static const int32_t E3 = 2;
+ TestEnumMissingValue(const Literal &_value)
+ : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+
+ inline bool operator==(const TestEnumMissingValue &_other) const { return (value_ == _other.value_); }
+ inline bool operator!=(const TestEnumMissingValue &_other) const { return (value_ != _other.value_); }
+ inline bool operator<=(const TestEnumMissingValue &_other) const { return (value_ <= _other.value_); }
+ inline bool operator>=(const TestEnumMissingValue &_other) const { return (value_ >= _other.value_); }
+ inline bool operator<(const TestEnumMissingValue &_other) const { return (value_ < _other.value_); }
+ inline bool operator>(const TestEnumMissingValue &_other) const { return (value_ > _other.value_); }
+
+ inline bool operator==(const Literal &_value) const { return (value_ == static_cast<int32_t>(_value)); }
+ inline bool operator!=(const Literal &_value) const { return (value_ != static_cast<int32_t>(_value)); }
+ inline bool operator<=(const Literal &_value) const { return (value_ <= static_cast<int32_t>(_value)); }
+ inline bool operator>=(const Literal &_value) const { return (value_ >= static_cast<int32_t>(_value)); }
+ inline bool operator<(const Literal &_value) const { return (value_ < static_cast<int32_t>(_value)); }
+ inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
};
typedef std::vector<uint64_t> TestArrayUInt64;
static const CommonAPI::Serial TESTPOLYMORPHICSTRUCT_SERIAL = 0x8F51A326;
diff --git a/src/test/commonapi/tests/PredefinedTypeCollection.hpp b/src/test/src-gen/core/commonapi/tests/PredefinedTypeCollection.hpp
index 4abfb2d..cfcdb44 100644
--- a/src/test/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.0.1.v201504231326.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/ExtendedInterface.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterface.hpp
index 07e4b4b..2bf3f5c 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterface.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterface.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp
index 6c4a1e5..66951e6 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -37,8 +37,8 @@ public:
typedef ExtendedInterface InterfaceType;
- inline static const char* getInterfaceId() {
- return(ExtendedInterface::getInterfaceId());
+ inline static const char* getInterface() {
+ return(ExtendedInterface::getInterface());
}
diff --git a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp
index 5ab90c0..4b5bed2 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/ExtendedInterfaceStub.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStub.hpp
index 96ec358..09d23ca 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStub.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -85,7 +85,7 @@ class ExtendedInterfaceStub
public virtual TestInterfaceStub
{
public:
- typedef std::function<void ()> TestIntMethodExtendedReply_t;
+ typedef std::function<void ()>TestIntMethodExtendedReply_t;
virtual ~ExtendedInterfaceStub() {}
virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
diff --git a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.cpp
index ad918f2..8e81969 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp
index 30156c9..906fc03 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/ExtendedInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp
new file mode 100644
index 0000000..7356067
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp
@@ -0,0 +1,54 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+
+
+#include <v1_0/commonapi/tests/TestFreedesktopInterface.hpp>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/Types.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+class TestFreedesktopDerivedInterface
+: virtual public TestFreedesktopInterface {
+public:
+ virtual ~TestFreedesktopDerivedInterface() { }
+
+ static inline const char* getInterface();
+ static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* TestFreedesktopDerivedInterface::getInterface() {
+ return ("commonapi.tests.TestFreedesktopDerivedInterface");
+}
+
+CommonAPI::Version TestFreedesktopDerivedInterface::getInterfaceVersion() {
+ return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+namespace CommonAPI {
+}
+
+#endif // COMMONAPI_TESTS_TEST_FREEDESKTOP_DERIVED_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp
new file mode 100644
index 0000000..184de9d
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxy.hpp
@@ -0,0 +1,169 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp>
+
+#include "v1_0/commonapi/tests/TestFreedesktopInterfaceProxy.hpp"
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/AttributeExtension.hpp>
+#include <CommonAPI/Factory.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+template <typename ... _AttributeExtensions>
+class TestFreedesktopDerivedInterfaceProxy
+ : virtual public TestFreedesktopDerivedInterface,
+ virtual public TestFreedesktopDerivedInterfaceProxyBase,
+ virtual public TestFreedesktopInterfaceProxy<_AttributeExtensions...>,
+ public _AttributeExtensions... {
+public:
+ TestFreedesktopDerivedInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
+ ~TestFreedesktopDerivedInterfaceProxy();
+
+ typedef TestFreedesktopDerivedInterface InterfaceType;
+
+ inline static const char* getInterface() {
+ return(TestFreedesktopDerivedInterface::getInterface());
+ }
+
+ /**
+ * Returns the wrapper class that provides access to the attribute TestAttributedFromDerivedInterface.
+ */
+ virtual TestAttributedFromDerivedInterfaceAttribute& getTestAttributedFromDerivedInterfaceAttribute() {
+ return delegate_->getTestAttributedFromDerivedInterfaceAttribute();
+ }
+
+
+
+
+ /**
+ * 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<TestFreedesktopDerivedInterfaceProxyBase> delegate_;
+};
+
+typedef TestFreedesktopDerivedInterfaceProxy<> TestFreedesktopDerivedInterfaceProxyDefault;
+
+namespace TestFreedesktopDerivedInterfaceExtensions {
+ template <template <typename > class _ExtensionType>
+ class TestAttributedFromDerivedInterfaceAttributeExtension {
+ public:
+ typedef _ExtensionType<TestFreedesktopDerivedInterfaceProxyBase::TestAttributedFromDerivedInterfaceAttribute> extension_type;
+
+ static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<TestFreedesktopDerivedInterfaceProxyBase::TestAttributedFromDerivedInterfaceAttribute>, extension_type>::value,
+ "Not CommonAPI Attribute Extension!");
+ #ifdef WIN32
+ TestAttributedFromDerivedInterfaceAttributeExtension() {}
+ #endif
+
+ TestAttributedFromDerivedInterfaceAttributeExtension(TestFreedesktopDerivedInterfaceProxyBase& proxy): attributeExtension_(proxy.getTestAttributedFromDerivedInterfaceAttribute()) {
+ }
+
+ inline extension_type& getTestAttributedFromDerivedInterfaceAttributeExtension() {
+ return attributeExtension_;
+ }
+
+ private:
+ extension_type attributeExtension_;
+ };
+
+} // namespace TestFreedesktopDerivedInterfaceExtensions
+
+//
+// TestFreedesktopDerivedInterfaceProxy Implementation
+//
+template <typename ... _AttributeExtensions>
+TestFreedesktopDerivedInterfaceProxy<_AttributeExtensions...>::TestFreedesktopDerivedInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
+ TestFreedesktopInterfaceProxy<_AttributeExtensions...>(delegate),
+ _AttributeExtensions(*(std::dynamic_pointer_cast<TestFreedesktopDerivedInterfaceProxyBase>(delegate)))...,
+ delegate_(std::dynamic_pointer_cast<TestFreedesktopDerivedInterfaceProxyBase>(delegate)) {
+}
+
+template <typename ... _AttributeExtensions>
+TestFreedesktopDerivedInterfaceProxy<_AttributeExtensions...>::~TestFreedesktopDerivedInterfaceProxy() {
+}
+
+
+template <typename ... _AttributeExtensions>
+const CommonAPI::Address &TestFreedesktopDerivedInterfaceProxy<_AttributeExtensions...>::getAddress() const {
+ return delegate_->getAddress();
+}
+
+template <typename ... _AttributeExtensions>
+bool TestFreedesktopDerivedInterfaceProxy<_AttributeExtensions...>::isAvailable() const {
+ return delegate_->isAvailable();
+}
+
+template <typename ... _AttributeExtensions>
+bool TestFreedesktopDerivedInterfaceProxy<_AttributeExtensions...>::isAvailableBlocking() const {
+ return delegate_->isAvailableBlocking();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::ProxyStatusEvent& TestFreedesktopDerivedInterfaceProxy<_AttributeExtensions...>::getProxyStatusEvent() {
+ return delegate_->getProxyStatusEvent();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::InterfaceVersionAttribute& TestFreedesktopDerivedInterfaceProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
+ return delegate_->getInterfaceVersionAttribute();
+}
+
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+namespace CommonAPI {
+template<template<typename > class _AttributeExtension>
+struct DefaultAttributeProxyHelper<::v1_0::commonapi::tests::TestFreedesktopDerivedInterfaceProxy,
+ _AttributeExtension> {
+ typedef typename ::v1_0::commonapi::tests::TestFreedesktopDerivedInterfaceProxy<
+ ::v1_0::commonapi::tests::TestFreedesktopDerivedInterfaceExtensions::TestAttributedFromDerivedInterfaceAttributeExtension<_AttributeExtension>
+ > class_t;
+};
+}
+
+#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp
new file mode 100644
index 0000000..878fc6a
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceProxyBase.hpp
@@ -0,0 +1,47 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
+#include <v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
+
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+
+#include <CommonAPI/Attribute.hpp>
+#include <CommonAPI/Proxy.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+class TestFreedesktopDerivedInterfaceProxyBase
+ : virtual public TestFreedesktopInterfaceProxyBase {
+public:
+ typedef CommonAPI::ObservableAttribute<uint32_t> TestAttributedFromDerivedInterfaceAttribute;
+
+
+ virtual TestAttributedFromDerivedInterfaceAttribute& getTestAttributedFromDerivedInterfaceAttribute() = 0;
+
+
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp
new file mode 100644
index 0000000..7276fd0
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp
@@ -0,0 +1,112 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+#include <functional>
+
+
+
+#include <v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
+
+#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterface.hpp>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+
+#include <CommonAPI/Stub.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+/**
+ * Receives messages from remote and handles all dispatching of deserialized calls
+ * to a stub for the service TestFreedesktopDerivedInterface. 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 TestFreedesktopDerivedInterfaceStubAdapter
+ : virtual public CommonAPI::StubAdapter,
+ public TestFreedesktopDerivedInterface,
+ public virtual TestFreedesktopInterfaceStubAdapter {
+ public:
+ ///Notifies all remote listeners about a change of value of the attribute TestAttributedFromDerivedInterface.
+ virtual void fireTestAttributedFromDerivedInterfaceAttributeChanged(const uint32_t& TestAttributedFromDerivedInterface) = 0;
+
+
+
+ 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 TestFreedesktopDerivedInterface.
+ * 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<AttributeName>").
+ * - an action callback to do local work after the attribute value has been changed
+ * ("onRemote<AttributeName>Changed").
+ *
+ * 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 TestFreedesktopDerivedInterfaceStubRemoteEvent
+: public virtual TestFreedesktopInterfaceStubRemoteEvent
+{
+public:
+ virtual ~TestFreedesktopDerivedInterfaceStubRemoteEvent() { }
+
+ /// Verification callback for remote set requests on the attribute TestAttributedFromDerivedInterface
+ virtual bool onRemoteSetTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t TestAttributedFromDerivedInterface) = 0;
+ /// Action callback for remote set requests on the attribute TestAttributedFromDerivedInterface
+ virtual void onRemoteTestAttributedFromDerivedInterfaceAttributeChanged() = 0;
+};
+
+/**
+ * Defines the interface that must be implemented by any class that should provide
+ * the service TestFreedesktopDerivedInterface 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 TestFreedesktopDerivedInterfaceStub
+ : public virtual CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>,
+ public virtual TestFreedesktopInterfaceStub
+{
+public:
+
+ virtual ~TestFreedesktopDerivedInterfaceStub() {}
+ virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
+
+ /// Provides getter access to the attribute TestAttributedFromDerivedInterface
+ virtual const uint32_t &getTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) = 0;
+
+
+ using CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>::initStubAdapter;
+ typedef CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>::StubAdapterType StubAdapterType;
+ typedef CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
+ typedef TestFreedesktopDerivedInterfaceStubRemoteEvent RemoteEventType;
+ typedef TestFreedesktopDerivedInterface StubInterface;
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp
new file mode 100644
index 0000000..dfccb28
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.cpp
@@ -0,0 +1,93 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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 <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp>
+#include <assert.h>
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+TestFreedesktopDerivedInterfaceStubDefault::TestFreedesktopDerivedInterfaceStubDefault():
+ remoteEventHandler_(this),
+ interfaceVersion_(TestFreedesktopDerivedInterface::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& TestFreedesktopDerivedInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+ return interfaceVersion_;
+}
+
+TestFreedesktopDerivedInterfaceStubRemoteEvent* TestFreedesktopDerivedInterfaceStubDefault::initStubAdapter(const std::shared_ptr<TestFreedesktopDerivedInterfaceStubAdapter> &_adapter) {
+ TestFreedesktopInterfaceStubDefault::initStubAdapter(_adapter);
+ CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>::stubAdapter_ = _adapter;
+ return &remoteEventHandler_;
+}
+
+const uint32_t& TestFreedesktopDerivedInterfaceStubDefault::getTestAttributedFromDerivedInterfaceAttribute() {
+ return testAttributedFromDerivedInterfaceAttributeValue_;
+}
+
+const uint32_t& TestFreedesktopDerivedInterfaceStubDefault::getTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+ return getTestAttributedFromDerivedInterfaceAttribute();
+}
+
+void TestFreedesktopDerivedInterfaceStubDefault::setTestAttributedFromDerivedInterfaceAttribute(uint32_t _value) {
+ const bool valueChanged = trySetTestAttributedFromDerivedInterfaceAttribute(std::move(_value));
+ if (valueChanged && stubAdapter_ != NULL) {
+ CommonAPI::Stub<TestFreedesktopDerivedInterfaceStubAdapter, TestFreedesktopDerivedInterfaceStubRemoteEvent>::stubAdapter_->fireTestAttributedFromDerivedInterfaceAttributeChanged(testAttributedFromDerivedInterfaceAttributeValue_);
+ }
+}
+
+bool TestFreedesktopDerivedInterfaceStubDefault::trySetTestAttributedFromDerivedInterfaceAttribute(uint32_t _value) {
+ if (!validateTestAttributedFromDerivedInterfaceAttributeRequestedValue(_value))
+ return false;
+
+ const bool valueChanged = (testAttributedFromDerivedInterfaceAttributeValue_ != _value);
+ testAttributedFromDerivedInterfaceAttributeValue_ = std::move(_value);
+ return valueChanged;
+}
+
+bool TestFreedesktopDerivedInterfaceStubDefault::validateTestAttributedFromDerivedInterfaceAttributeRequestedValue(const uint32_t &_value) {
+ return true;
+}
+
+void TestFreedesktopDerivedInterfaceStubDefault::setTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+ setTestAttributedFromDerivedInterfaceAttribute(_value);
+}
+
+void TestFreedesktopDerivedInterfaceStubDefault::onRemoteTestAttributedFromDerivedInterfaceAttributeChanged() {
+ // No operation in default
+}
+
+void TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler::onRemoteTestAttributedFromDerivedInterfaceAttributeChanged() {
+ assert(defaultStub_ !=NULL);
+ defaultStub_->onRemoteTestAttributedFromDerivedInterfaceAttributeChanged();
+}
+
+bool TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestAttributedFromDerivedInterfaceAttribute(uint32_t _value) {
+ assert(defaultStub_ !=NULL);
+ return defaultStub_->trySetTestAttributedFromDerivedInterfaceAttribute(std::move(_value));
+}
+
+bool TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+ return onRemoteSetTestAttributedFromDerivedInterfaceAttribute(_value);
+}
+
+
+
+
+
+TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(TestFreedesktopDerivedInterfaceStubDefault *_defaultStub)
+ : TestFreedesktopInterfaceStubDefault::RemoteEventHandler(_defaultStub),
+ defaultStub_(_defaultStub) {
+}
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp
new file mode 100644
index 0000000..1e7554f
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStubDefault.hpp
@@ -0,0 +1,78 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+#include <v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp>
+
+#include <v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceStub.hpp>
+#include <sstream>
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+/**
+ * Provides a default implementation for TestFreedesktopDerivedInterfaceStubRemoteEvent and
+ * TestFreedesktopDerivedInterfaceStub. 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 TestFreedesktopDerivedInterfaceStubDefault
+ : public virtual TestFreedesktopDerivedInterfaceStub,
+ public virtual TestFreedesktopInterfaceStubDefault {
+public:
+ TestFreedesktopDerivedInterfaceStubDefault();
+
+ TestFreedesktopDerivedInterfaceStubRemoteEvent* initStubAdapter(const std::shared_ptr<TestFreedesktopDerivedInterfaceStubAdapter> &_adapter);
+
+ const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client);
+
+ virtual const uint32_t& getTestAttributedFromDerivedInterfaceAttribute();
+ virtual const uint32_t& getTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client);
+ virtual void setTestAttributedFromDerivedInterfaceAttribute(uint32_t _value);
+ virtual void setTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value);
+
+
+
+
+protected:
+ virtual bool trySetTestAttributedFromDerivedInterfaceAttribute(uint32_t _value);
+ virtual bool validateTestAttributedFromDerivedInterfaceAttributeRequestedValue(const uint32_t &_value);
+ virtual void onRemoteTestAttributedFromDerivedInterfaceAttributeChanged();
+ class RemoteEventHandler: public virtual TestFreedesktopDerivedInterfaceStubRemoteEvent, public virtual TestFreedesktopInterfaceStubDefault::RemoteEventHandler {
+ public:
+ RemoteEventHandler(TestFreedesktopDerivedInterfaceStubDefault *_defaultStub);
+
+ virtual bool onRemoteSetTestAttributedFromDerivedInterfaceAttribute(uint32_t _value);
+ virtual bool onRemoteSetTestAttributedFromDerivedInterfaceAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value);
+ virtual void onRemoteTestAttributedFromDerivedInterfaceAttributeChanged();
+
+
+ private:
+ TestFreedesktopDerivedInterfaceStubDefault *defaultStub_;
+ };
+private:
+ TestFreedesktopDerivedInterfaceStubDefault::RemoteEventHandler remoteEventHandler_;
+
+ uint32_t testAttributedFromDerivedInterfaceAttributeValue_;
+
+ CommonAPI::Version interfaceVersion_;
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+#endif // COMMONAPI_TESTS_Test_Freedesktop_Derived_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterface.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterface.hpp
new file mode 100644
index 0000000..cbfb596
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterface.hpp
@@ -0,0 +1,52 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/Types.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+class TestFreedesktopInterface {
+public:
+ virtual ~TestFreedesktopInterface() { }
+
+ static inline const char* getInterface();
+ static inline CommonAPI::Version getInterfaceVersion();
+};
+
+const char* TestFreedesktopInterface::getInterface() {
+ return ("commonapi.tests.TestFreedesktopInterface");
+}
+
+CommonAPI::Version TestFreedesktopInterface::getInterfaceVersion() {
+ return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+namespace CommonAPI {
+}
+
+#endif // COMMONAPI_TESTS_TEST_FREEDESKTOP_INTERFACE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxy.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxy.hpp
new file mode 100644
index 0000000..2cd92b5
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxy.hpp
@@ -0,0 +1,250 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+#include <v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp>
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/AttributeExtension.hpp>
+#include <CommonAPI/Factory.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+template <typename ... _AttributeExtensions>
+class TestFreedesktopInterfaceProxy
+ : virtual public TestFreedesktopInterface,
+ virtual public TestFreedesktopInterfaceProxyBase,
+ public _AttributeExtensions... {
+public:
+ TestFreedesktopInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate);
+ ~TestFreedesktopInterfaceProxy();
+
+ typedef TestFreedesktopInterface InterfaceType;
+
+
+ /**
+ * Returns the wrapper class that provides access to the attribute TestPredefinedTypeAttribute.
+ */
+ virtual TestPredefinedTypeAttributeAttribute& getTestPredefinedTypeAttributeAttribute() {
+ return delegate_->getTestPredefinedTypeAttributeAttribute();
+ }
+ /**
+ * Returns the wrapper class that provides access to the attribute TestReadonlyAttribute.
+ */
+ virtual TestReadonlyAttributeAttribute& getTestReadonlyAttributeAttribute() {
+ return delegate_->getTestReadonlyAttributeAttribute();
+ }
+ /**
+ * Returns the wrapper class that provides access to the attribute TestDerivedStructAttribute.
+ */
+ virtual TestDerivedStructAttributeAttribute& getTestDerivedStructAttributeAttribute() {
+ return delegate_->getTestDerivedStructAttributeAttribute();
+ }
+ /**
+ * Returns the wrapper class that provides access to the attribute TestDerivedArrayAttribute.
+ */
+ virtual TestDerivedArrayAttributeAttribute& getTestDerivedArrayAttributeAttribute() {
+ return delegate_->getTestDerivedArrayAttributeAttribute();
+ }
+
+
+
+
+ /**
+ * 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<TestFreedesktopInterfaceProxyBase> delegate_;
+};
+
+typedef TestFreedesktopInterfaceProxy<> TestFreedesktopInterfaceProxyDefault;
+
+namespace TestFreedesktopInterfaceExtensions {
+ template <template <typename > class _ExtensionType>
+ class TestPredefinedTypeAttributeAttributeExtension {
+ public:
+ typedef _ExtensionType<TestFreedesktopInterfaceProxyBase::TestPredefinedTypeAttributeAttribute> extension_type;
+
+ static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<TestFreedesktopInterfaceProxyBase::TestPredefinedTypeAttributeAttribute>, extension_type>::value,
+ "Not CommonAPI Attribute Extension!");
+ #ifdef WIN32
+ TestPredefinedTypeAttributeAttributeExtension() {}
+ #endif
+
+ TestPredefinedTypeAttributeAttributeExtension(TestFreedesktopInterfaceProxyBase& proxy): attributeExtension_(proxy.getTestPredefinedTypeAttributeAttribute()) {
+ }
+
+ inline extension_type& getTestPredefinedTypeAttributeAttributeExtension() {
+ return attributeExtension_;
+ }
+
+ private:
+ extension_type attributeExtension_;
+ };
+
+ template <template <typename > class _ExtensionType>
+ class TestReadonlyAttributeAttributeExtension {
+ public:
+ typedef _ExtensionType<TestFreedesktopInterfaceProxyBase::TestReadonlyAttributeAttribute> extension_type;
+
+ static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<TestFreedesktopInterfaceProxyBase::TestReadonlyAttributeAttribute>, extension_type>::value,
+ "Not CommonAPI Attribute Extension!");
+ #ifdef WIN32
+ TestReadonlyAttributeAttributeExtension() {}
+ #endif
+
+ TestReadonlyAttributeAttributeExtension(TestFreedesktopInterfaceProxyBase& proxy): attributeExtension_(proxy.getTestReadonlyAttributeAttribute()) {
+ }
+
+ inline extension_type& getTestReadonlyAttributeAttributeExtension() {
+ return attributeExtension_;
+ }
+
+ private:
+ extension_type attributeExtension_;
+ };
+
+ template <template <typename > class _ExtensionType>
+ class TestDerivedStructAttributeAttributeExtension {
+ public:
+ typedef _ExtensionType<TestFreedesktopInterfaceProxyBase::TestDerivedStructAttributeAttribute> extension_type;
+
+ static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<TestFreedesktopInterfaceProxyBase::TestDerivedStructAttributeAttribute>, extension_type>::value,
+ "Not CommonAPI Attribute Extension!");
+ #ifdef WIN32
+ TestDerivedStructAttributeAttributeExtension() {}
+ #endif
+
+ TestDerivedStructAttributeAttributeExtension(TestFreedesktopInterfaceProxyBase& proxy): attributeExtension_(proxy.getTestDerivedStructAttributeAttribute()) {
+ }
+
+ inline extension_type& getTestDerivedStructAttributeAttributeExtension() {
+ return attributeExtension_;
+ }
+
+ private:
+ extension_type attributeExtension_;
+ };
+
+ template <template <typename > class _ExtensionType>
+ class TestDerivedArrayAttributeAttributeExtension {
+ public:
+ typedef _ExtensionType<TestFreedesktopInterfaceProxyBase::TestDerivedArrayAttributeAttribute> extension_type;
+
+ static_assert(std::is_base_of<typename CommonAPI::AttributeExtension<TestFreedesktopInterfaceProxyBase::TestDerivedArrayAttributeAttribute>, extension_type>::value,
+ "Not CommonAPI Attribute Extension!");
+ #ifdef WIN32
+ TestDerivedArrayAttributeAttributeExtension() {}
+ #endif
+
+ TestDerivedArrayAttributeAttributeExtension(TestFreedesktopInterfaceProxyBase& proxy): attributeExtension_(proxy.getTestDerivedArrayAttributeAttribute()) {
+ }
+
+ inline extension_type& getTestDerivedArrayAttributeAttributeExtension() {
+ return attributeExtension_;
+ }
+
+ private:
+ extension_type attributeExtension_;
+ };
+
+} // namespace TestFreedesktopInterfaceExtensions
+
+//
+// TestFreedesktopInterfaceProxy Implementation
+//
+template <typename ... _AttributeExtensions>
+TestFreedesktopInterfaceProxy<_AttributeExtensions...>::TestFreedesktopInterfaceProxy(std::shared_ptr<CommonAPI::Proxy> delegate):
+ _AttributeExtensions(*(std::dynamic_pointer_cast<TestFreedesktopInterfaceProxyBase>(delegate)))...,
+ delegate_(std::dynamic_pointer_cast<TestFreedesktopInterfaceProxyBase>(delegate)) {
+}
+
+template <typename ... _AttributeExtensions>
+TestFreedesktopInterfaceProxy<_AttributeExtensions...>::~TestFreedesktopInterfaceProxy() {
+}
+
+
+template <typename ... _AttributeExtensions>
+const CommonAPI::Address &TestFreedesktopInterfaceProxy<_AttributeExtensions...>::getAddress() const {
+ return delegate_->getAddress();
+}
+
+template <typename ... _AttributeExtensions>
+bool TestFreedesktopInterfaceProxy<_AttributeExtensions...>::isAvailable() const {
+ return delegate_->isAvailable();
+}
+
+template <typename ... _AttributeExtensions>
+bool TestFreedesktopInterfaceProxy<_AttributeExtensions...>::isAvailableBlocking() const {
+ return delegate_->isAvailableBlocking();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::ProxyStatusEvent& TestFreedesktopInterfaceProxy<_AttributeExtensions...>::getProxyStatusEvent() {
+ return delegate_->getProxyStatusEvent();
+}
+
+template <typename ... _AttributeExtensions>
+CommonAPI::InterfaceVersionAttribute& TestFreedesktopInterfaceProxy<_AttributeExtensions...>::getInterfaceVersionAttribute() {
+ return delegate_->getInterfaceVersionAttribute();
+}
+
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+namespace CommonAPI {
+template<template<typename > class _AttributeExtension>
+struct DefaultAttributeProxyHelper<::v1_0::commonapi::tests::TestFreedesktopInterfaceProxy,
+ _AttributeExtension> {
+ typedef typename ::v1_0::commonapi::tests::TestFreedesktopInterfaceProxy<
+ ::v1_0::commonapi::tests::TestFreedesktopInterfaceExtensions::TestPredefinedTypeAttributeAttributeExtension<_AttributeExtension>,
+ ::v1_0::commonapi::tests::TestFreedesktopInterfaceExtensions::TestReadonlyAttributeAttributeExtension<_AttributeExtension>,
+ ::v1_0::commonapi::tests::TestFreedesktopInterfaceExtensions::TestDerivedStructAttributeAttributeExtension<_AttributeExtension>,
+ ::v1_0::commonapi::tests::TestFreedesktopInterfaceExtensions::TestDerivedArrayAttributeAttributeExtension<_AttributeExtension>
+ > class_t;
+};
+}
+
+#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp
new file mode 100644
index 0000000..0b50008
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceProxyBase.hpp
@@ -0,0 +1,55 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+#include <v1_0/commonapi/tests/TestFreedesktopInterface.hpp>
+
+
+#include <commonapi/tests/DerivedTypeCollection.hpp>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <cstdint>
+#include <vector>
+
+#include <CommonAPI/Attribute.hpp>
+#include <CommonAPI/Proxy.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+class TestFreedesktopInterfaceProxyBase
+ : virtual public CommonAPI::Proxy {
+public:
+ typedef CommonAPI::ObservableAttribute<uint32_t> TestPredefinedTypeAttributeAttribute;
+ typedef CommonAPI::ObservableReadonlyAttribute<uint32_t> TestReadonlyAttributeAttribute;
+ typedef CommonAPI::ObservableAttribute<::commonapi::tests::DerivedTypeCollection::TestStructExtended> TestDerivedStructAttributeAttribute;
+ typedef CommonAPI::ObservableAttribute<::commonapi::tests::DerivedTypeCollection::TestArrayUInt64> TestDerivedArrayAttributeAttribute;
+
+
+ virtual TestPredefinedTypeAttributeAttribute& getTestPredefinedTypeAttributeAttribute() = 0;
+ virtual TestReadonlyAttributeAttribute& getTestReadonlyAttributeAttribute() = 0;
+ virtual TestDerivedStructAttributeAttribute& getTestDerivedStructAttributeAttribute() = 0;
+ virtual TestDerivedArrayAttributeAttribute& getTestDerivedArrayAttributeAttribute() = 0;
+
+
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_PROXY_BASE_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp
new file mode 100644
index 0000000..740b733
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp
@@ -0,0 +1,131 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+#include <functional>
+
+
+
+#include <commonapi/tests/DerivedTypeCollection.hpp>
+
+#include <v1_0/commonapi/tests/TestFreedesktopInterface.hpp>
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <cstdint>
+#include <vector>
+
+#include <CommonAPI/Stub.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+/**
+ * Receives messages from remote and handles all dispatching of deserialized calls
+ * to a stub for the service TestFreedesktopInterface. 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 TestFreedesktopInterfaceStubAdapter
+ : virtual public CommonAPI::StubAdapter,
+ public TestFreedesktopInterface {
+ public:
+ ///Notifies all remote listeners about a change of value of the attribute TestPredefinedTypeAttribute.
+ virtual void fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& TestPredefinedTypeAttribute) = 0;
+ ///Notifies all remote listeners about a change of value of the attribute TestReadonlyAttribute.
+ virtual void fireTestReadonlyAttributeAttributeChanged(const uint32_t& TestReadonlyAttribute) = 0;
+ ///Notifies all remote listeners about a change of value of the attribute TestDerivedStructAttribute.
+ virtual void fireTestDerivedStructAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& TestDerivedStructAttribute) = 0;
+ ///Notifies all remote listeners about a change of value of the attribute TestDerivedArrayAttribute.
+ virtual void fireTestDerivedArrayAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& TestDerivedArrayAttribute) = 0;
+
+
+
+ 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 TestFreedesktopInterface.
+ * 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<AttributeName>").
+ * - an action callback to do local work after the attribute value has been changed
+ * ("onRemote<AttributeName>Changed").
+ *
+ * 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 TestFreedesktopInterfaceStubRemoteEvent
+{
+public:
+ virtual ~TestFreedesktopInterfaceStubRemoteEvent() { }
+
+ /// Verification callback for remote set requests on the attribute TestPredefinedTypeAttribute
+ virtual bool onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t TestPredefinedTypeAttribute) = 0;
+ /// Action callback for remote set requests on the attribute TestPredefinedTypeAttribute
+ virtual void onRemoteTestPredefinedTypeAttributeAttributeChanged() = 0;
+ /// Verification callback for remote set requests on the attribute TestDerivedStructAttribute
+ virtual bool onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended TestDerivedStructAttribute) = 0;
+ /// Action callback for remote set requests on the attribute TestDerivedStructAttribute
+ virtual void onRemoteTestDerivedStructAttributeAttributeChanged() = 0;
+ /// Verification callback for remote set requests on the attribute TestDerivedArrayAttribute
+ virtual bool onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 TestDerivedArrayAttribute) = 0;
+ /// Action callback for remote set requests on the attribute TestDerivedArrayAttribute
+ virtual void onRemoteTestDerivedArrayAttributeAttributeChanged() = 0;
+};
+
+/**
+ * Defines the interface that must be implemented by any class that should provide
+ * the service TestFreedesktopInterface 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 TestFreedesktopInterfaceStub
+ : public virtual CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>
+{
+public:
+
+ virtual ~TestFreedesktopInterfaceStub() {}
+ virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
+
+ /// Provides getter access to the attribute TestPredefinedTypeAttribute
+ virtual const uint32_t &getTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) = 0;
+ /// Provides getter access to the attribute TestReadonlyAttribute
+ virtual const uint32_t &getTestReadonlyAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) = 0;
+ /// Provides getter access to the attribute TestDerivedStructAttribute
+ virtual const ::commonapi::tests::DerivedTypeCollection::TestStructExtended &getTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) = 0;
+ /// Provides getter access to the attribute TestDerivedArrayAttribute
+ virtual const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 &getTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) = 0;
+
+
+ using CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::initStubAdapter;
+ typedef CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::StubAdapterType StubAdapterType;
+ typedef CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::RemoteEventHandlerType RemoteEventHandlerType;
+ typedef TestFreedesktopInterfaceStubRemoteEvent RemoteEventType;
+ typedef TestFreedesktopInterface StubInterface;
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_HPP_
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
new file mode 100644
index 0000000..89b004d
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.cpp
@@ -0,0 +1,221 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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 <v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp>
+#include <assert.h>
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+TestFreedesktopInterfaceStubDefault::TestFreedesktopInterfaceStubDefault():
+ remoteEventHandler_(this),
+ interfaceVersion_(TestFreedesktopInterface::getInterfaceVersion()) {
+}
+
+const CommonAPI::Version& TestFreedesktopInterfaceStubDefault::getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client) {
+ return interfaceVersion_;
+}
+
+TestFreedesktopInterfaceStubRemoteEvent* TestFreedesktopInterfaceStubDefault::initStubAdapter(const std::shared_ptr<TestFreedesktopInterfaceStubAdapter> &_adapter) {
+ CommonAPI::Stub<TestFreedesktopInterfaceStubAdapter, TestFreedesktopInterfaceStubRemoteEvent>::stubAdapter_ = _adapter;
+ return &remoteEventHandler_;
+}
+
+const uint32_t& TestFreedesktopInterfaceStubDefault::getTestPredefinedTypeAttributeAttribute() {
+ return testPredefinedTypeAttributeAttributeValue_;
+}
+
+const uint32_t& TestFreedesktopInterfaceStubDefault::getTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+ return getTestPredefinedTypeAttributeAttribute();
+}
+
+void TestFreedesktopInterfaceStubDefault::setTestPredefinedTypeAttributeAttribute(uint32_t _value) {
+ const bool valueChanged = trySetTestPredefinedTypeAttributeAttribute(std::move(_value));
+ if (valueChanged && stubAdapter_ != NULL) {
+ stubAdapter_->fireTestPredefinedTypeAttributeAttributeChanged(testPredefinedTypeAttributeAttributeValue_);
+ }
+}
+
+bool TestFreedesktopInterfaceStubDefault::trySetTestPredefinedTypeAttributeAttribute(uint32_t _value) {
+ if (!validateTestPredefinedTypeAttributeAttributeRequestedValue(_value))
+ return false;
+
+ const bool valueChanged = (testPredefinedTypeAttributeAttributeValue_ != _value);
+ testPredefinedTypeAttributeAttributeValue_ = std::move(_value);
+ return valueChanged;
+}
+
+bool TestFreedesktopInterfaceStubDefault::validateTestPredefinedTypeAttributeAttributeRequestedValue(const uint32_t &_value) {
+ return true;
+}
+
+void TestFreedesktopInterfaceStubDefault::setTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+ setTestPredefinedTypeAttributeAttribute(_value);
+}
+
+void TestFreedesktopInterfaceStubDefault::onRemoteTestPredefinedTypeAttributeAttributeChanged() {
+ // No operation in default
+}
+
+void TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteTestPredefinedTypeAttributeAttributeChanged() {
+ assert(defaultStub_ !=NULL);
+ defaultStub_->onRemoteTestPredefinedTypeAttributeAttributeChanged();
+}
+
+bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestPredefinedTypeAttributeAttribute(uint32_t _value) {
+ assert(defaultStub_ !=NULL);
+ return defaultStub_->trySetTestPredefinedTypeAttributeAttribute(std::move(_value));
+}
+
+bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value) {
+ return onRemoteSetTestPredefinedTypeAttributeAttribute(_value);
+}
+
+const uint32_t& TestFreedesktopInterfaceStubDefault::getTestReadonlyAttributeAttribute() {
+ return testReadonlyAttributeAttributeValue_;
+}
+
+const uint32_t& TestFreedesktopInterfaceStubDefault::getTestReadonlyAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+ return getTestReadonlyAttributeAttribute();
+}
+
+void TestFreedesktopInterfaceStubDefault::setTestReadonlyAttributeAttribute(uint32_t _value) {
+ const bool valueChanged = trySetTestReadonlyAttributeAttribute(std::move(_value));
+ if (valueChanged && stubAdapter_ != NULL) {
+ stubAdapter_->fireTestReadonlyAttributeAttributeChanged(testReadonlyAttributeAttributeValue_);
+ }
+}
+
+bool TestFreedesktopInterfaceStubDefault::trySetTestReadonlyAttributeAttribute(uint32_t _value) {
+ if (!validateTestReadonlyAttributeAttributeRequestedValue(_value))
+ return false;
+
+ const bool valueChanged = (testReadonlyAttributeAttributeValue_ != _value);
+ testReadonlyAttributeAttributeValue_ = std::move(_value);
+ return valueChanged;
+}
+
+bool TestFreedesktopInterfaceStubDefault::validateTestReadonlyAttributeAttributeRequestedValue(const uint32_t &_value) {
+ return true;
+}
+
+
+const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& TestFreedesktopInterfaceStubDefault::getTestDerivedStructAttributeAttribute() {
+ return testDerivedStructAttributeAttributeValue_;
+}
+
+const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& TestFreedesktopInterfaceStubDefault::getTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+ return getTestDerivedStructAttributeAttribute();
+}
+
+void TestFreedesktopInterfaceStubDefault::setTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+ const bool valueChanged = trySetTestDerivedStructAttributeAttribute(std::move(_value));
+ if (valueChanged && stubAdapter_ != NULL) {
+ stubAdapter_->fireTestDerivedStructAttributeAttributeChanged(testDerivedStructAttributeAttributeValue_);
+ }
+}
+
+bool TestFreedesktopInterfaceStubDefault::trySetTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+ if (!validateTestDerivedStructAttributeAttributeRequestedValue(_value))
+ return false;
+
+ const bool valueChanged = (testDerivedStructAttributeAttributeValue_ != _value);
+ testDerivedStructAttributeAttributeValue_ = std::move(_value);
+ return valueChanged;
+}
+
+bool TestFreedesktopInterfaceStubDefault::validateTestDerivedStructAttributeAttributeRequestedValue(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended &_value) {
+ return true;
+}
+
+void TestFreedesktopInterfaceStubDefault::setTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+ setTestDerivedStructAttributeAttribute(_value);
+}
+
+void TestFreedesktopInterfaceStubDefault::onRemoteTestDerivedStructAttributeAttributeChanged() {
+ // No operation in default
+}
+
+void TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteTestDerivedStructAttributeAttributeChanged() {
+ assert(defaultStub_ !=NULL);
+ defaultStub_->onRemoteTestDerivedStructAttributeAttributeChanged();
+}
+
+bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+ assert(defaultStub_ !=NULL);
+ return defaultStub_->trySetTestDerivedStructAttributeAttribute(std::move(_value));
+}
+
+bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value) {
+ return onRemoteSetTestDerivedStructAttributeAttribute(_value);
+}
+
+const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& TestFreedesktopInterfaceStubDefault::getTestDerivedArrayAttributeAttribute() {
+ return testDerivedArrayAttributeAttributeValue_;
+}
+
+const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& TestFreedesktopInterfaceStubDefault::getTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client) {
+ return getTestDerivedArrayAttributeAttribute();
+}
+
+void TestFreedesktopInterfaceStubDefault::setTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+ const bool valueChanged = trySetTestDerivedArrayAttributeAttribute(std::move(_value));
+ if (valueChanged && stubAdapter_ != NULL) {
+ stubAdapter_->fireTestDerivedArrayAttributeAttributeChanged(testDerivedArrayAttributeAttributeValue_);
+ }
+}
+
+bool TestFreedesktopInterfaceStubDefault::trySetTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+ if (!validateTestDerivedArrayAttributeAttributeRequestedValue(_value))
+ return false;
+
+ const bool valueChanged = (testDerivedArrayAttributeAttributeValue_ != _value);
+ testDerivedArrayAttributeAttributeValue_ = std::move(_value);
+ return valueChanged;
+}
+
+bool TestFreedesktopInterfaceStubDefault::validateTestDerivedArrayAttributeAttributeRequestedValue(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 &_value) {
+ return true;
+}
+
+void TestFreedesktopInterfaceStubDefault::setTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+ setTestDerivedArrayAttributeAttribute(_value);
+}
+
+void TestFreedesktopInterfaceStubDefault::onRemoteTestDerivedArrayAttributeAttributeChanged() {
+ // No operation in default
+}
+
+void TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteTestDerivedArrayAttributeAttributeChanged() {
+ assert(defaultStub_ !=NULL);
+ defaultStub_->onRemoteTestDerivedArrayAttributeAttributeChanged();
+}
+
+bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+ assert(defaultStub_ !=NULL);
+ return defaultStub_->trySetTestDerivedArrayAttributeAttribute(std::move(_value));
+}
+
+bool TestFreedesktopInterfaceStubDefault::RemoteEventHandler::onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value) {
+ return onRemoteSetTestDerivedArrayAttributeAttribute(_value);
+}
+
+
+
+
+
+TestFreedesktopInterfaceStubDefault::RemoteEventHandler::RemoteEventHandler(TestFreedesktopInterfaceStubDefault *_defaultStub)
+ :
+ defaultStub_(_defaultStub) {
+}
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp
new file mode 100644
index 0000000..a45fcd7
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestFreedesktopInterfaceStubDefault.hpp
@@ -0,0 +1,107 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+
+#include <v1_0/commonapi/tests/TestFreedesktopInterfaceStub.hpp>
+#include <sstream>
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+
+/**
+ * Provides a default implementation for TestFreedesktopInterfaceStubRemoteEvent and
+ * TestFreedesktopInterfaceStub. 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 TestFreedesktopInterfaceStubDefault
+ : public virtual TestFreedesktopInterfaceStub {
+public:
+ TestFreedesktopInterfaceStubDefault();
+
+ TestFreedesktopInterfaceStubRemoteEvent* initStubAdapter(const std::shared_ptr<TestFreedesktopInterfaceStubAdapter> &_adapter);
+
+ const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> _client);
+
+ virtual const uint32_t& getTestPredefinedTypeAttributeAttribute();
+ virtual const uint32_t& getTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client);
+ virtual void setTestPredefinedTypeAttributeAttribute(uint32_t _value);
+ virtual void setTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value);
+ virtual const uint32_t& getTestReadonlyAttributeAttribute();
+ virtual const uint32_t& getTestReadonlyAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client);
+ virtual void setTestReadonlyAttributeAttribute(uint32_t _value);
+ virtual const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& getTestDerivedStructAttributeAttribute();
+ virtual const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& getTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client);
+ virtual void setTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value);
+ virtual void setTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value);
+ virtual const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& getTestDerivedArrayAttributeAttribute();
+ virtual const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& getTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client);
+ virtual void setTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value);
+ virtual void setTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value);
+
+
+
+
+protected:
+ virtual bool trySetTestPredefinedTypeAttributeAttribute(uint32_t _value);
+ virtual bool validateTestPredefinedTypeAttributeAttributeRequestedValue(const uint32_t &_value);
+ virtual void onRemoteTestPredefinedTypeAttributeAttributeChanged();
+ virtual bool trySetTestReadonlyAttributeAttribute(uint32_t _value);
+ virtual bool validateTestReadonlyAttributeAttributeRequestedValue(const uint32_t &_value);
+ virtual bool trySetTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value);
+ virtual bool validateTestDerivedStructAttributeAttributeRequestedValue(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended &_value);
+ virtual void onRemoteTestDerivedStructAttributeAttributeChanged();
+ virtual bool trySetTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value);
+ virtual bool validateTestDerivedArrayAttributeAttributeRequestedValue(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 &_value);
+ virtual void onRemoteTestDerivedArrayAttributeAttributeChanged();
+ class RemoteEventHandler: public virtual TestFreedesktopInterfaceStubRemoteEvent {
+ public:
+ RemoteEventHandler(TestFreedesktopInterfaceStubDefault *_defaultStub);
+
+ virtual bool onRemoteSetTestPredefinedTypeAttributeAttribute(uint32_t _value);
+ virtual bool onRemoteSetTestPredefinedTypeAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _value);
+ virtual void onRemoteTestPredefinedTypeAttributeAttributeChanged();
+
+
+ virtual bool onRemoteSetTestDerivedStructAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestStructExtended _value);
+ virtual bool onRemoteSetTestDerivedStructAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestStructExtended _value);
+ virtual void onRemoteTestDerivedStructAttributeAttributeChanged();
+
+ virtual bool onRemoteSetTestDerivedArrayAttributeAttribute(::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value);
+ virtual bool onRemoteSetTestDerivedArrayAttributeAttribute(const std::shared_ptr<CommonAPI::ClientId> _client, ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 _value);
+ virtual void onRemoteTestDerivedArrayAttributeAttributeChanged();
+
+
+ private:
+ TestFreedesktopInterfaceStubDefault *defaultStub_;
+ };
+private:
+ TestFreedesktopInterfaceStubDefault::RemoteEventHandler remoteEventHandler_;
+
+ uint32_t testPredefinedTypeAttributeAttributeValue_;
+ uint32_t testReadonlyAttributeAttributeValue_;
+ ::commonapi::tests::DerivedTypeCollection::TestStructExtended testDerivedStructAttributeAttributeValue_;
+ ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64 testDerivedArrayAttributeAttributeValue_;
+
+ CommonAPI::Version interfaceVersion_;
+};
+
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+#endif // COMMONAPI_TESTS_Test_Freedesktop_Interface_STUB_DEFAULT
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestInterface.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterface.hpp
index fae3886..f651daf 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterface.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterface.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/TestInterfaceProxy.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxy.hpp
index 94da6c8..669f62a 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/TestInterfaceProxyBase.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxyBase.hpp
index 8ede5a7..4fc7e7f 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/TestInterfaceStub.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStub.hpp
index af3f02e..b079d8a 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStub.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -133,15 +133,15 @@ class TestInterfaceStub
: public virtual CommonAPI::Stub<TestInterfaceStubAdapter, TestInterfaceStubRemoteEvent>
{
public:
- typedef std::function<void ()> testEmptyMethodReply_t;
- typedef std::function<void ()> testVoidPredefinedTypeMethodReply_t;
- typedef std::function<void (uint32_t _uint32OutValue, std::string _stringOutValue)> testPredefinedTypeMethodReply_t;
- typedef std::function<void ()> testVoidDerivedTypeMethodReply_t;
- typedef std::function<void (::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 _testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap _testMapOutValue)> testDerivedTypeMethodReply_t;
- typedef std::function<void ()> TestArrayOfPolymorphicStructMethodReply_t;
- typedef std::function<void ()> TestMapOfPolymorphicStructMethodReply_t;
- typedef std::function<void ()> TestStructWithPolymorphicMemberMethodReply_t;
- typedef std::function<void ()> TestStructWithEnumKeyMapMemberReply_t;
+ typedef std::function<void ()>testEmptyMethodReply_t;
+ typedef std::function<void ()>testVoidPredefinedTypeMethodReply_t;
+ typedef std::function<void (uint32_t _uint32OutValue, std::string _stringOutValue)>testPredefinedTypeMethodReply_t;
+ typedef std::function<void ()>testVoidDerivedTypeMethodReply_t;
+ typedef std::function<void (::commonapi::tests::DerivedTypeCollection::TestEnumExtended2 _testEnumExtended2OutValue, ::commonapi::tests::DerivedTypeCollection::TestMap _testMapOutValue)>testDerivedTypeMethodReply_t;
+ typedef std::function<void ()>TestArrayOfPolymorphicStructMethodReply_t;
+ typedef std::function<void ()>TestMapOfPolymorphicStructMethodReply_t;
+ typedef std::function<void ()>TestStructWithPolymorphicMemberMethodReply_t;
+ typedef std::function<void ()>TestStructWithEnumKeyMapMemberReply_t;
virtual ~TestInterfaceStub() {}
virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.cpp
index 0b9532b..e51777c 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -188,8 +188,8 @@ void TestInterfaceStubDefault::testVoidPredefinedTypeMethod(const std::shared_pt
}
void TestInterfaceStubDefault::testPredefinedTypeMethod(const std::shared_ptr<CommonAPI::ClientId> _client, uint32_t _uint32InValue, std::string _stringInValue, testPredefinedTypeMethodReply_t _reply) {
- uint32_t uint32OutValue;
- std::string stringOutValue;
+ uint32_t uint32OutValue = 0;
+ std::string stringOutValue = "";
_reply(uint32OutValue, stringOutValue);
}
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceStubDefault.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.hpp
index 7f00d78..c475a56 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/TestInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/BranchInterface.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.cpp
index fa8200d..3af84f9 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterface.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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,10 +14,6 @@ namespace commonapi {
namespace tests {
namespace managed {
-#ifndef WIN32
-const int32_t BranchInterface::testBranchMethodError::OK;
-const int32_t BranchInterface::testBranchMethodError::NOTOK;
-#endif
} // namespace managed
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.hpp
new file mode 100644
index 0000000..812e409
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterface.hpp
@@ -0,0 +1,81 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/InputStream.hpp>
+#include <CommonAPI/OutputStream.hpp>
+#include <CommonAPI/Types.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+namespace managed {
+
+class BranchInterface {
+public:
+ virtual ~BranchInterface() { }
+
+ static inline const char* getInterface();
+ static inline CommonAPI::Version getInterfaceVersion();
+
+ struct testBranchMethodError : CommonAPI::Enumeration<int32_t> {
+ enum Literal : int32_t {
+ OK = 0,
+ NOTOK = 1
+ };
+
+ testBranchMethodError() = default;
+ testBranchMethodError(const Literal &_value)
+ : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+
+ inline bool operator==(const testBranchMethodError &_other) const { return (value_ == _other.value_); }
+ inline bool operator!=(const testBranchMethodError &_other) const { return (value_ != _other.value_); }
+ inline bool operator<=(const testBranchMethodError &_other) const { return (value_ <= _other.value_); }
+ inline bool operator>=(const testBranchMethodError &_other) const { return (value_ >= _other.value_); }
+ inline bool operator<(const testBranchMethodError &_other) const { return (value_ < _other.value_); }
+ inline bool operator>(const testBranchMethodError &_other) const { return (value_ > _other.value_); }
+
+ inline bool operator==(const Literal &_value) const { return (value_ == static_cast<int32_t>(_value)); }
+ inline bool operator!=(const Literal &_value) const { return (value_ != static_cast<int32_t>(_value)); }
+ inline bool operator<=(const Literal &_value) const { return (value_ <= static_cast<int32_t>(_value)); }
+ inline bool operator>=(const Literal &_value) const { return (value_ >= static_cast<int32_t>(_value)); }
+ inline bool operator<(const Literal &_value) const { return (value_ < static_cast<int32_t>(_value)); }
+ inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
+ };
+};
+
+const char* BranchInterface::getInterface() {
+ return ("commonapi.tests.managed.BranchInterface");
+}
+
+CommonAPI::Version BranchInterface::getInterfaceVersion() {
+ return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace managed
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+namespace CommonAPI {
+}
+
+#endif // COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceProxy.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxy.hpp
index beabc44..12c7ce9 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
index c0bb966..1aea848 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp
index fdec075..a277f1d 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStub.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -82,7 +82,7 @@ class BranchInterfaceStub
: public virtual CommonAPI::Stub<BranchInterfaceStubAdapter, BranchInterfaceStubRemoteEvent>
{
public:
- typedef std::function<void (BranchInterface::testBranchMethodError _error, int32_t _outInt, std::string _outString)> testBranchMethodReply_t;
+ typedef std::function<void (BranchInterface::testBranchMethodError _error, int32_t _outInt, std::string _outString)>testBranchMethodReply_t;
virtual ~BranchInterfaceStub() {}
virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
index 2a16da2..c916b6c 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -32,8 +32,8 @@ BranchInterfaceStubRemoteEvent* BranchInterfaceStubDefault::initStubAdapter(cons
void BranchInterfaceStubDefault::testBranchMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testBranchMethodReply_t _reply) {
BranchInterface::testBranchMethodError error;
- int32_t outInt;
- std::string outString;
+ int32_t outInt = 0;
+ std::string outString = "";
_reply(error, outInt, outString);
}
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
index 0d0eab2..0885835 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/BranchInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/LeafInterface.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.cpp
index ed3c7e0..1e88326 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterface.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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,10 +14,6 @@ namespace commonapi {
namespace tests {
namespace managed {
-#ifndef WIN32
-const int32_t LeafInterface::testLeafMethodError::OK;
-const int32_t LeafInterface::testLeafMethodError::NOTOK;
-#endif
} // namespace managed
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.hpp
new file mode 100644
index 0000000..3072907
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterface.hpp
@@ -0,0 +1,81 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/InputStream.hpp>
+#include <CommonAPI/OutputStream.hpp>
+#include <CommonAPI/Types.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+namespace managed {
+
+class LeafInterface {
+public:
+ virtual ~LeafInterface() { }
+
+ static inline const char* getInterface();
+ static inline CommonAPI::Version getInterfaceVersion();
+
+ struct testLeafMethodError : CommonAPI::Enumeration<int32_t> {
+ enum Literal : int32_t {
+ OK = 0,
+ NOTOK = 1
+ };
+
+ testLeafMethodError() = default;
+ testLeafMethodError(const Literal &_value)
+ : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+
+ inline bool operator==(const testLeafMethodError &_other) const { return (value_ == _other.value_); }
+ inline bool operator!=(const testLeafMethodError &_other) const { return (value_ != _other.value_); }
+ inline bool operator<=(const testLeafMethodError &_other) const { return (value_ <= _other.value_); }
+ inline bool operator>=(const testLeafMethodError &_other) const { return (value_ >= _other.value_); }
+ inline bool operator<(const testLeafMethodError &_other) const { return (value_ < _other.value_); }
+ inline bool operator>(const testLeafMethodError &_other) const { return (value_ > _other.value_); }
+
+ inline bool operator==(const Literal &_value) const { return (value_ == static_cast<int32_t>(_value)); }
+ inline bool operator!=(const Literal &_value) const { return (value_ != static_cast<int32_t>(_value)); }
+ inline bool operator<=(const Literal &_value) const { return (value_ <= static_cast<int32_t>(_value)); }
+ inline bool operator>=(const Literal &_value) const { return (value_ >= static_cast<int32_t>(_value)); }
+ inline bool operator<(const Literal &_value) const { return (value_ < static_cast<int32_t>(_value)); }
+ inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
+ };
+};
+
+const char* LeafInterface::getInterface() {
+ return ("commonapi.tests.managed.LeafInterface");
+}
+
+CommonAPI::Version LeafInterface::getInterfaceVersion() {
+ return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace managed
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+namespace CommonAPI {
+}
+
+#endif // COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceProxy.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxy.hpp
index 3f4fcd9..5e49c09 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
index 4babc5d..7c9fa8f 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp
index e2d5854..fb2336a 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStub.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -82,7 +82,7 @@ class LeafInterfaceStub
: public virtual CommonAPI::Stub<LeafInterfaceStubAdapter, LeafInterfaceStubRemoteEvent>
{
public:
- typedef std::function<void (LeafInterface::testLeafMethodError _error, int32_t _outInt, std::string _outString)> testLeafMethodReply_t;
+ typedef std::function<void (LeafInterface::testLeafMethodError _error, int32_t _outInt, std::string _outString)>testLeafMethodReply_t;
virtual ~LeafInterfaceStub() {}
virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
index 6808e59..4d35c2c 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -32,8 +32,8 @@ LeafInterfaceStubRemoteEvent* LeafInterfaceStubDefault::initStubAdapter(const st
void LeafInterfaceStubDefault::testLeafMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testLeafMethodReply_t _reply) {
LeafInterface::testLeafMethodError error;
- int32_t outInt;
- std::string outString;
+ int32_t outInt = 0;
+ std::string outString = "";
_reply(error, outInt, outString);
}
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
index a188eff..d9b1d07 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/LeafInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/RootInterface.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.cpp
index 4625cdc..7442064 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterface.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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,10 +14,6 @@ namespace commonapi {
namespace tests {
namespace managed {
-#ifndef WIN32
-const int32_t RootInterface::testRootMethodError::OK;
-const int32_t RootInterface::testRootMethodError::NOTOK;
-#endif
} // namespace managed
diff --git a/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.hpp
new file mode 100644
index 0000000..8eada5e
--- /dev/null
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterface.hpp
@@ -0,0 +1,82 @@
+/*
+* This file was generated by the CommonAPI Generators.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
+* 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_
+
+
+#include <set>
+
+
+#if !defined (COMMONAPI_INTERNAL_COMPILATION)
+#define COMMONAPI_INTERNAL_COMPILATION
+#endif
+
+#include <CommonAPI/InputStream.hpp>
+#include <CommonAPI/OutputStream.hpp>
+#include <CommonAPI/Types.hpp>
+
+#undef COMMONAPI_INTERNAL_COMPILATION
+
+namespace v1_0 {
+namespace commonapi {
+namespace tests {
+namespace managed {
+
+class RootInterface {
+public:
+ virtual ~RootInterface() { }
+
+ static inline const char* getInterface();
+ static inline CommonAPI::Version getInterfaceVersion();
+
+ struct testRootMethodError : CommonAPI::Enumeration<int32_t> {
+ enum Literal : int32_t {
+ OK = 0,
+ NOTOK = 1
+ };
+
+ testRootMethodError() = default;
+ testRootMethodError(const Literal &_value)
+ : CommonAPI::Enumeration<int32_t>(static_cast<int32_t>(_value)) {}
+
+ inline bool operator==(const testRootMethodError &_other) const { return (value_ == _other.value_); }
+ inline bool operator!=(const testRootMethodError &_other) const { return (value_ != _other.value_); }
+ inline bool operator<=(const testRootMethodError &_other) const { return (value_ <= _other.value_); }
+ inline bool operator>=(const testRootMethodError &_other) const { return (value_ >= _other.value_); }
+ inline bool operator<(const testRootMethodError &_other) const { return (value_ < _other.value_); }
+ inline bool operator>(const testRootMethodError &_other) const { return (value_ > _other.value_); }
+
+ inline bool operator==(const Literal &_value) const { return (value_ == static_cast<int32_t>(_value)); }
+ inline bool operator!=(const Literal &_value) const { return (value_ != static_cast<int32_t>(_value)); }
+ inline bool operator<=(const Literal &_value) const { return (value_ <= static_cast<int32_t>(_value)); }
+ inline bool operator>=(const Literal &_value) const { return (value_ >= static_cast<int32_t>(_value)); }
+ inline bool operator<(const Literal &_value) const { return (value_ < static_cast<int32_t>(_value)); }
+ inline bool operator>(const Literal &_value) const { return (value_ > static_cast<int32_t>(_value)); }
+ };
+};
+
+const char* RootInterface::getInterface() {
+ return ("commonapi.tests.managed.RootInterface");
+}
+
+CommonAPI::Version RootInterface::getInterfaceVersion() {
+ return CommonAPI::Version(1, 0);
+}
+
+
+} // namespace managed
+} // namespace tests
+} // namespace commonapi
+} // namespace v1_0
+
+namespace CommonAPI {
+}
+
+#endif // COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceProxy.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxy.hpp
index 1c824b2..61f6722 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp
index 6eb0cfc..3c93161 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/RootInterfaceStub.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStub.hpp
index f1d2349..c8912e0 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStub.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -90,7 +90,7 @@ class RootInterfaceStub
: public virtual CommonAPI::Stub<RootInterfaceStubAdapter, RootInterfaceStubRemoteEvent>
{
public:
- typedef std::function<void (RootInterface::testRootMethodError _error, int32_t _outInt, std::string _outString)> testRootMethodReply_t;
+ typedef std::function<void (RootInterface::testRootMethodError _error, int32_t _outInt, std::string _outString)>testRootMethodReply_t;
virtual ~RootInterfaceStub() {}
virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp
index 59bcd88..dfda3aa 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -33,8 +33,8 @@ RootInterfaceStubRemoteEvent* RootInterfaceStubDefault::initStubAdapter(const st
void RootInterfaceStubDefault::testRootMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _inInt, std::string _inString, testRootMethodReply_t _reply) {
RootInterface::testRootMethodError error;
- int32_t outInt;
- std::string outString;
+ int32_t outInt = 0;
+ std::string outString = "";
_reply(error, outInt, outString);
}
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp
index e5935a6..70c1f6d 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/RootInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRoot.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRoot.hpp
index 4884f4a..c55881b 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRoot.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRoot.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootProxy.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxy.hpp
index 0047b37..c79b601 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootProxy.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp
index dbcc3f1..ceb80a9 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootProxyBase.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootStub.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStub.hpp
index d23acf6..2f07c1c 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootStub.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStub.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp
index f1b7b0b..a42a8ac 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp
index d84f20a..55d0741 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp
+++ b/src/test/src-gen/core/v1_0/commonapi/tests/managed/SecondRootStubDefault.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/fake/legacy/service/LegacyInterface.hpp b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterface.hpp
index d0c0a3f..e9efaf6 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterface.hpp
+++ b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterface.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/fake/legacy/service/LegacyInterfaceProxy.hpp b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxy.hpp
index f44a24b..d163090 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceProxy.hpp
+++ b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp
index 48361ec..62d43e5 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp
+++ b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceProxyBase.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/fake/legacy/service/LegacyInterfaceStub.hpp b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStub.hpp
index a3d0151..f38834c 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceStub.hpp
+++ b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStub.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -82,9 +82,9 @@ class LegacyInterfaceStub
: public virtual CommonAPI::Stub<LegacyInterfaceStubAdapter, LegacyInterfaceStubRemoteEvent>
{
public:
- typedef std::function<void (int32_t _val1, int32_t _val2)> TestMethodReply_t;
- typedef std::function<void (std::string _greeting, int32_t _identifier)> OtherTestMethodReply_t;
- typedef std::function<void ()> finishReply_t;
+ typedef std::function<void (int32_t _val1, int32_t _val2)>TestMethodReply_t;
+ typedef std::function<void (std::string _greeting, int32_t _identifier)>OtherTestMethodReply_t;
+ typedef std::function<void ()>finishReply_t;
virtual ~LegacyInterfaceStub() {}
virtual const CommonAPI::Version& getInterfaceVersion(std::shared_ptr<CommonAPI::ClientId> clientId) = 0;
diff --git a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.cpp b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.cpp
index b7165b7..e9e58f0 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.cpp
+++ b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -31,14 +31,14 @@ LegacyInterfaceStubRemoteEvent* LegacyInterfaceStubDefault::initStubAdapter(cons
void LegacyInterfaceStubDefault::TestMethod(const std::shared_ptr<CommonAPI::ClientId> _client, int32_t _input, TestMethodReply_t _reply) {
- int32_t val1;
- int32_t val2;
+ int32_t val1 = 0;
+ int32_t val2 = 0;
_reply(val1, val2);
}
void LegacyInterfaceStubDefault::OtherTestMethod(const std::shared_ptr<CommonAPI::ClientId> _client, OtherTestMethodReply_t _reply) {
- std::string greeting;
- int32_t identifier;
+ std::string greeting = "";
+ int32_t identifier = 0;
_reply(greeting, identifier);
}
diff --git a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp
index cdc0ceb..4326894 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp
+++ b/src/test/src-gen/core/v1_0/fake/legacy/service/LegacyInterfaceStubDefault.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
index 8290e55..ea7cc5f 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
index 1112a85..7d95904 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
index 6cc2a36..3e3fdac 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
index 41c986f..ff1545c 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/ExtendedInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
index 79e680c..ada72a5 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -30,7 +30,7 @@ TestFreedesktopDerivedInterfaceDBusProxy::TestFreedesktopDerivedInterfaceDBusPro
const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
: CommonAPI::DBus::DBusProxy(_address, _connection),
TestFreedesktopInterfaceDBusProxy(_address, _connection)
-, testAttributedFromDerivedInterface_(*this, getAddress().getInterface(), "TestAttributedFromDerivedInterface")
+, testAttributedFromDerivedInterface_(*this, "onTestAttributedFromDerivedInterfaceAttributeChanged", "setTestAttributedFromDerivedInterfaceAttribute", "u", "getTestAttributedFromDerivedInterfaceAttribute")
{
}
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
index bf46a6b..34f0472 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -21,7 +21,6 @@
#include <CommonAPI/DBus/DBusFactory.hpp>
#include <CommonAPI/DBus/DBusProxy.hpp>
#include <CommonAPI/DBus/DBusAttribute.hpp>
-#include <CommonAPI/DBus/DBusFreedesktopAttribute.hpp>
#undef COMMONAPI_INTERNAL_COMPILATION
@@ -49,11 +48,8 @@ public:
virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
private:
- typedef CommonAPI::Variant<
- uint32_t
- > FreedesktopVariant_t;
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<TestAttributedFromDerivedInterfaceAttribute>, FreedesktopVariant_t> testAttributedFromDerivedInterface_;
+ CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestAttributedFromDerivedInterfaceAttribute>> testAttributedFromDerivedInterface_;
};
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
index fdf7019..e301425 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -38,7 +38,16 @@ void TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::deactivateManagedIn
const char* TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData() const {
static const std::string introspectionData =
std::string(TestFreedesktopInterfaceDBusStubAdapterInternal::getMethodsDBusIntrospectionXmlData()) +
- "<property name=\"TestAttributedFromDerivedInterface\" type=\"u\" access=\"readwrite\" />\n"
+ "<method name=\"getTestAttributedFromDerivedInterfaceAttribute\">\n"
+ "<arg name=\"value\" type=\"u\" direction=\"out\" />"
+ "</method>\n"
+ "<method name=\"setTestAttributedFromDerivedInterfaceAttribute\">\n"
+ "<arg name=\"requestedValue\" type=\"u\" direction=\"in\" />\n"
+ "<arg name=\"setValue\" type=\"u\" direction=\"out\" />\n"
+ "</method>\n"
+ "<signal name=\"onTestAttributedFromDerivedInterfaceAttributeChanged\">\n"
+ "<arg name=\"changedValue\" type=\"u\" />\n"
+ "</signal>\n"
;
return introspectionData.c_str();
@@ -49,11 +58,11 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher<
CommonAPI::Version
> TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestFreedesktopDerivedInterfaceInterfaceVersionStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getInterfaceVersion, "uu");
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
- > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestAttributedFromDerivedInterfaceAttribute);
-CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+ > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestAttributedFromDerivedInterfaceAttribute, "u");
+CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
> TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestAttributedFromDerivedInterfaceAttributeStubDispatcher(
@@ -61,14 +70,15 @@ CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
&TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestAttributedFromDerivedInterfaceAttribute,
&TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteTestAttributedFromDerivedInterfaceAttributeChanged
,&TestFreedesktopDerivedInterfaceStubAdapter::fireTestAttributedFromDerivedInterfaceAttributeChanged
+ ,"u"
);
#ifdef WIN32
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
- > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestPredefinedTypeAttributeAttribute);
-CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+ > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestPredefinedTypeAttributeAttribute, "u");
+CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
> TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher(
@@ -76,16 +86,17 @@ CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
&TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestPredefinedTypeAttributeAttribute,
&TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteTestPredefinedTypeAttributeAttributeChanged
,&TestFreedesktopDerivedInterfaceStubAdapter::fireTestPredefinedTypeAttributeAttributeChanged
+ ,"u"
);
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
- > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestReadonlyAttributeAttribute);
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+ > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestReadonlyAttributeAttribute, "u");
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestStructExtended
- > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute);
-CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+ > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestDerivedStructAttributeAttribute, "(sqi)");
+CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestStructExtended
> TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
@@ -93,12 +104,13 @@ CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
&TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
&TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteTestDerivedStructAttributeAttributeChanged
,&TestFreedesktopDerivedInterfaceStubAdapter::fireTestDerivedStructAttributeAttributeChanged
+ ,"(sqi)"
);
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
- > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute);
-CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+ > TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&TestFreedesktopDerivedInterfaceStub::getTestDerivedArrayAttributeAttribute, "at");
+CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
> TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
@@ -106,6 +118,7 @@ CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
&TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
&TestFreedesktopDerivedInterfaceStubRemoteEvent::onRemoteTestDerivedArrayAttributeAttributeChanged
,&TestFreedesktopDerivedInterfaceStubAdapter::fireTestDerivedArrayAttributeAttributeChanged
+ ,"at"
);
#endif
@@ -114,10 +127,11 @@ CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
#endif
void TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::fireTestAttributedFromDerivedInterfaceAttributeChanged(const uint32_t& value) {
- CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>>
- ::sendPropertiesChangedSignal(
+ CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>>
+ ::sendSignal(
*this,
- "TestAttributedFromDerivedInterface",
+ "onTestAttributedFromDerivedInterfaceAttributeChanged",
+ "u",
value
);
}
@@ -142,50 +156,20 @@ TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::TestFreedesktopDerivedIn
TestFreedesktopDerivedInterfaceDBusStubAdapterHelper(_address, _connection, std::dynamic_pointer_cast<TestFreedesktopDerivedInterfaceStub>(_stub), false),
TestFreedesktopInterfaceDBusStubAdapterInternal(_address, _connection, _stub),
stubDispatcherTable_({
+ { { "getTestAttributedFromDerivedInterfaceAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher }
+ , { { "setTestAttributedFromDerivedInterfaceAttribute", "u" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestAttributedFromDerivedInterfaceAttributeStubDispatcher }
#ifdef WIN32
+ ,
+ { { "getTestPredefinedTypeAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher }
+ , { { "setTestPredefinedTypeAttributeAttribute", "u" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher },
+ { { "getTestReadonlyAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher },
+ { { "getTestDerivedStructAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher }
+ , { { "setTestDerivedStructAttributeAttribute", "(sqi)" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher },
+ { { "getTestDerivedArrayAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher }
+ , { { "setTestDerivedArrayAttributeAttribute", "at" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher }
#endif
}),
- stubAttributeTable_({
- {
- "TestAttributedFromDerivedInterface",
- {
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestAttributedFromDerivedInterfaceAttributeStubDispatcher,
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestAttributedFromDerivedInterfaceAttributeStubDispatcher
- }
- }
- #ifdef WIN32
- ,
- {
- "TestPredefinedTypeAttribute",
- {
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher,
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher
- }
- },
- {
- "TestReadonlyAttribute",
- {
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher,
- NULL
- }
- },
- {
- "TestDerivedStructAttribute",
- {
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher,
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher
- }
- },
- {
- "TestDerivedArrayAttribute",
- {
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher,
- &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher
- }
- }
- #endif
- }
- ) {
+ stubAttributeTable_() {
#ifdef WIN32
stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::getTestFreedesktopDerivedInterfaceInterfaceVersionStubDispatcher });
@@ -207,7 +191,7 @@ TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::TestFreedesktopDerivedIn
}
const bool TestFreedesktopDerivedInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
- return true;
+ return false;
}
} // namespace tests
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
index daecd30..05fd337 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopDerivedInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -20,7 +20,6 @@
#include <CommonAPI/DBus/DBusFactory.hpp>
#include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
#include <CommonAPI/DBus/DBusStubAdapter.hpp>
-#include <CommonAPI/DBus/DBusFreedesktopStubAdapterHelper.hpp>
#undef COMMONAPI_INTERNAL_COMPILATION
@@ -79,41 +78,41 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
CommonAPI::Version
> getTestFreedesktopDerivedInterfaceInterfaceVersionStubDispatcher;
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
> getTestAttributedFromDerivedInterfaceAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
> setTestAttributedFromDerivedInterfaceAttributeStubDispatcher;
#ifdef WIN32
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
> getTestPredefinedTypeAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
> setTestPredefinedTypeAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
uint32_t
> getTestReadonlyAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestStructExtended
> getTestDerivedStructAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestStructExtended
> setTestDerivedStructAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
> getTestDerivedArrayAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopDerivedInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
> setTestDerivedArrayAttributeAttributeStubDispatcher;
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
index 8305c98..2fe18ce 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -29,10 +29,10 @@ TestFreedesktopInterfaceDBusProxy::TestFreedesktopInterfaceDBusProxy(
const CommonAPI::DBus::DBusAddress &_address,
const std::shared_ptr<CommonAPI::DBus::DBusProxyConnection> &_connection)
: CommonAPI::DBus::DBusProxy(_address, _connection)
-, testPredefinedTypeAttribute_(*this, getAddress().getInterface(), "TestPredefinedTypeAttribute"),
- testReadonlyAttribute_(*this, getAddress().getInterface(), "TestReadonlyAttribute"),
- testDerivedStructAttribute_(*this, getAddress().getInterface(), "TestDerivedStructAttribute"),
- testDerivedArrayAttribute_(*this, getAddress().getInterface(), "TestDerivedArrayAttribute")
+, testPredefinedTypeAttribute_(*this, "onTestPredefinedTypeAttributeAttributeChanged", "setTestPredefinedTypeAttributeAttribute", "u", "getTestPredefinedTypeAttributeAttribute"),
+ testReadonlyAttribute_(*this, "onTestReadonlyAttributeAttributeChanged", "u", "getTestReadonlyAttributeAttribute"),
+ testDerivedStructAttribute_(*this, "onTestDerivedStructAttributeAttributeChanged", "setTestDerivedStructAttributeAttribute", "(sqi)", "getTestDerivedStructAttributeAttribute"),
+ testDerivedArrayAttribute_(*this, "onTestDerivedArrayAttributeAttributeChanged", "setTestDerivedArrayAttributeAttribute", "at", "getTestDerivedArrayAttributeAttribute")
{
}
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
index c34ced8..d041c8f 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -20,7 +20,6 @@
#include <CommonAPI/DBus/DBusFactory.hpp>
#include <CommonAPI/DBus/DBusProxy.hpp>
#include <CommonAPI/DBus/DBusAttribute.hpp>
-#include <CommonAPI/DBus/DBusFreedesktopAttribute.hpp>
#undef COMMONAPI_INTERNAL_COMPILATION
@@ -51,17 +50,11 @@ public:
virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const;
private:
- typedef CommonAPI::Variant<
- uint32_t,
- uint32_t,
- ::commonapi::tests::DerivedTypeCollection::TestStructExtended,
- ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
- > FreedesktopVariant_t;
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<TestPredefinedTypeAttributeAttribute>, FreedesktopVariant_t> testPredefinedTypeAttribute_;
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopReadonlyAttribute<TestReadonlyAttributeAttribute>, FreedesktopVariant_t> testReadonlyAttribute_;
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<TestDerivedStructAttributeAttribute>, FreedesktopVariant_t> testDerivedStructAttribute_;
- CommonAPI::DBus::DBusFreedesktopObservableAttribute<CommonAPI::DBus::DBusFreedesktopAttribute<TestDerivedArrayAttributeAttribute>, FreedesktopVariant_t> testDerivedArrayAttribute_;
+ CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestPredefinedTypeAttributeAttribute>> testPredefinedTypeAttribute_;
+ CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusReadonlyAttribute<TestReadonlyAttributeAttribute>> testReadonlyAttribute_;
+ CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedStructAttributeAttribute>> testDerivedStructAttribute_;
+ CommonAPI::DBus::DBusObservableAttribute<CommonAPI::DBus::DBusAttribute<TestDerivedArrayAttributeAttribute>> testDerivedArrayAttribute_;
};
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
index 9189b8b..2f1258c 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -40,10 +40,42 @@ const char* TestFreedesktopInterfaceDBusStubAdapterInternal::getMethodsDBusIntro
"<method name=\"getInterfaceVersion\">\n"
"<arg name=\"value\" type=\"uu\" direction=\"out\" />"
"</method>\n"
- "<property name=\"TestPredefinedTypeAttribute\" type=\"u\" access=\"readwrite\" />\n"
- "<property name=\"TestReadonlyAttribute\" type=\"u\" access=\"read\" />\n"
- "<property name=\"TestDerivedStructAttribute\" type=\"(sqi)\" access=\"readwrite\" />\n"
- "<property name=\"TestDerivedArrayAttribute\" type=\"at\" access=\"readwrite\" />\n"
+ "<method name=\"getTestPredefinedTypeAttributeAttribute\">\n"
+ "<arg name=\"value\" type=\"u\" direction=\"out\" />"
+ "</method>\n"
+ "<method name=\"setTestPredefinedTypeAttributeAttribute\">\n"
+ "<arg name=\"requestedValue\" type=\"u\" direction=\"in\" />\n"
+ "<arg name=\"setValue\" type=\"u\" direction=\"out\" />\n"
+ "</method>\n"
+ "<signal name=\"onTestPredefinedTypeAttributeAttributeChanged\">\n"
+ "<arg name=\"changedValue\" type=\"u\" />\n"
+ "</signal>\n"
+ "<method name=\"getTestReadonlyAttributeAttribute\">\n"
+ "<arg name=\"value\" type=\"u\" direction=\"out\" />"
+ "</method>\n"
+ "<signal name=\"onTestReadonlyAttributeAttributeChanged\">\n"
+ "<arg name=\"changedValue\" type=\"u\" />\n"
+ "</signal>\n"
+ "<method name=\"getTestDerivedStructAttributeAttribute\">\n"
+ "<arg name=\"value\" type=\"(sqi)\" direction=\"out\" />"
+ "</method>\n"
+ "<method name=\"setTestDerivedStructAttributeAttribute\">\n"
+ "<arg name=\"requestedValue\" type=\"(sqi)\" direction=\"in\" />\n"
+ "<arg name=\"setValue\" type=\"(sqi)\" direction=\"out\" />\n"
+ "</method>\n"
+ "<signal name=\"onTestDerivedStructAttributeAttributeChanged\">\n"
+ "<arg name=\"changedValue\" type=\"(sqi)\" />\n"
+ "</signal>\n"
+ "<method name=\"getTestDerivedArrayAttributeAttribute\">\n"
+ "<arg name=\"value\" type=\"at\" direction=\"out\" />"
+ "</method>\n"
+ "<method name=\"setTestDerivedArrayAttributeAttribute\">\n"
+ "<arg name=\"requestedValue\" type=\"at\" direction=\"in\" />\n"
+ "<arg name=\"setValue\" type=\"at\" direction=\"out\" />\n"
+ "</method>\n"
+ "<signal name=\"onTestDerivedArrayAttributeAttributeChanged\">\n"
+ "<arg name=\"changedValue\" type=\"at\" />\n"
+ "</signal>\n"
;
return introspectionData.c_str();
@@ -54,11 +86,11 @@ CommonAPI::DBus::DBusGetAttributeStubDispatcher<
CommonAPI::Version
> TestFreedesktopInterfaceDBusStubAdapterInternal::getTestFreedesktopInterfaceInterfaceVersionStubDispatcher(&TestFreedesktopInterfaceStub::getInterfaceVersion, "uu");
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
uint32_t
- > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestPredefinedTypeAttributeAttribute);
-CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+ > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestPredefinedTypeAttributeAttribute, "u");
+CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
uint32_t
> TestFreedesktopInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher(
@@ -66,16 +98,17 @@ CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
&TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestPredefinedTypeAttributeAttribute,
&TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestPredefinedTypeAttributeAttributeChanged
,&TestFreedesktopInterfaceStubAdapter::fireTestPredefinedTypeAttributeAttributeChanged
+ ,"u"
);
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
uint32_t
- > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestReadonlyAttributeAttribute);
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+ > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestReadonlyAttributeAttribute, "u");
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestStructExtended
- > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute);
-CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+ > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestDerivedStructAttributeAttribute, "(sqi)");
+CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestStructExtended
> TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher(
@@ -83,12 +116,13 @@ CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
&TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestDerivedStructAttributeAttribute,
&TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestDerivedStructAttributeAttributeChanged
,&TestFreedesktopInterfaceStubAdapter::fireTestDerivedStructAttributeAttributeChanged
+ ,"(sqi)"
);
-CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
- > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute);
-CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+ > TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher(&TestFreedesktopInterfaceStub::getTestDerivedArrayAttributeAttribute, "at");
+CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
> TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher(
@@ -96,40 +130,45 @@ CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
&TestFreedesktopInterfaceStubRemoteEvent::onRemoteSetTestDerivedArrayAttributeAttribute,
&TestFreedesktopInterfaceStubRemoteEvent::onRemoteTestDerivedArrayAttributeAttributeChanged
,&TestFreedesktopInterfaceStubAdapter::fireTestDerivedArrayAttributeAttributeChanged
+ ,"at"
);
void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestPredefinedTypeAttributeAttributeChanged(const uint32_t& value) {
- CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>>
- ::sendPropertiesChangedSignal(
+ CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>>
+ ::sendSignal(
*this,
- "TestPredefinedTypeAttribute",
+ "onTestPredefinedTypeAttributeAttributeChanged",
+ "u",
value
);
}
void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestReadonlyAttributeAttributeChanged(const uint32_t& value) {
- CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>>
- ::sendPropertiesChangedSignal(
+ CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<uint32_t>>
+ ::sendSignal(
*this,
- "TestReadonlyAttribute",
+ "onTestReadonlyAttributeAttributeChanged",
+ "u",
value
);
}
void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestDerivedStructAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestStructExtended& value) {
- CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestStructExtended>>
- ::sendPropertiesChangedSignal(
+ CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestStructExtended>>
+ ::sendSignal(
*this,
- "TestDerivedStructAttribute",
+ "onTestDerivedStructAttributeAttributeChanged",
+ "(sqi)",
value
);
}
void TestFreedesktopInterfaceDBusStubAdapterInternal::fireTestDerivedArrayAttributeAttributeChanged(const ::commonapi::tests::DerivedTypeCollection::TestArrayUInt64& value) {
- CommonAPI::DBus::DBusStubFreedesktopPropertiesSignalHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestArrayUInt64>>
- ::sendPropertiesChangedSignal(
+ CommonAPI::DBus::DBusStubSignalHelper<CommonAPI::DBus::DBusSerializableArguments<::commonapi::tests::DerivedTypeCollection::TestArrayUInt64>>
+ ::sendSignal(
*this,
- "TestDerivedArrayAttribute",
+ "onTestDerivedArrayAttributeAttributeChanged",
+ "at",
value
);
}
@@ -151,44 +190,21 @@ TestFreedesktopInterfaceDBusStubAdapterInternal::TestFreedesktopInterfaceDBusStu
: CommonAPI::DBus::DBusStubAdapter(_address, _connection,false),
TestFreedesktopInterfaceDBusStubAdapterHelper(_address, _connection, std::dynamic_pointer_cast<TestFreedesktopInterfaceStub>(_stub), false),
stubDispatcherTable_({
+ { { "getTestPredefinedTypeAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher }
+ , { { "setTestPredefinedTypeAttributeAttribute", "u" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher },
+ { { "getTestReadonlyAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher },
+ { { "getTestDerivedStructAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher }
+ , { { "setTestDerivedStructAttributeAttribute", "(sqi)" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher },
+ { { "getTestDerivedArrayAttributeAttribute", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher }
+ , { { "setTestDerivedArrayAttributeAttribute", "at" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher }
}),
- stubAttributeTable_({
- {
- "TestPredefinedTypeAttribute",
- {
- &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestPredefinedTypeAttributeAttributeStubDispatcher,
- &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestPredefinedTypeAttributeAttributeStubDispatcher
- }
- },
- {
- "TestReadonlyAttribute",
- {
- &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestReadonlyAttributeAttributeStubDispatcher,
- NULL
- }
- },
- {
- "TestDerivedStructAttribute",
- {
- &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedStructAttributeAttributeStubDispatcher,
- &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedStructAttributeAttributeStubDispatcher
- }
- },
- {
- "TestDerivedArrayAttribute",
- {
- &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestDerivedArrayAttributeAttributeStubDispatcher,
- &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::setTestDerivedArrayAttributeAttributeStubDispatcher
- }
- }
- }
- ) {
+ stubAttributeTable_() {
stubDispatcherTable_.insert({ { "getInterfaceVersion", "" }, &commonapi::tests::TestFreedesktopInterfaceDBusStubAdapterInternal::getTestFreedesktopInterfaceInterfaceVersionStubDispatcher });
}
const bool TestFreedesktopInterfaceDBusStubAdapterInternal::hasFreedesktopProperties() {
- return true;
+ return false;
}
} // namespace tests
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
index 7695ff3..5c165b3 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestFreedesktopInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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.
@@ -19,7 +19,6 @@
#include <CommonAPI/DBus/DBusFactory.hpp>
#include <CommonAPI/DBus/DBusStubAdapterHelper.hpp>
#include <CommonAPI/DBus/DBusStubAdapter.hpp>
-#include <CommonAPI/DBus/DBusFreedesktopStubAdapterHelper.hpp>
#undef COMMONAPI_INTERNAL_COMPILATION
@@ -61,31 +60,31 @@ static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
CommonAPI::Version
> getTestFreedesktopInterfaceInterfaceVersionStubDispatcher;
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
uint32_t
> getTestPredefinedTypeAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
uint32_t
> setTestPredefinedTypeAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
uint32_t
> getTestReadonlyAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestStructExtended
> getTestDerivedStructAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestStructExtended
> setTestDerivedStructAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusGetFreedesktopAttributeStubDispatcher<
+static CommonAPI::DBus::DBusGetAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
> getTestDerivedArrayAttributeAttributeStubDispatcher;
-static CommonAPI::DBus::DBusSetFreedesktopObservableAttributeStubDispatcher<
+static CommonAPI::DBus::DBusSetObservableAttributeStubDispatcher<
TestFreedesktopInterfaceStub,
::commonapi::tests::DerivedTypeCollection::TestArrayUInt64
> setTestDerivedArrayAttributeAttributeStubDispatcher;
diff --git a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp
index 0854131..b202588 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp
index 52f30b3..8ed6873 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
index c2e343a..c237cd6 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
index 8d42c65..7f7d7b1 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/TestInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
index 9bf65e2..25fa000 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
index 2331979..3738f3d 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
index 29ac294..e833d10 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
index 8fee9be..ab1e41b 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/BranchInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
index 6fb9572..6fe152e 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
index 0534681..0dae7b3 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
index 3fb6774..7e4473e 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
index a6fd68c..e1b739c 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/LeafInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
index d9fa380..c694796 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
index 9e59989..67920ba 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
index eb46efa..06a6667 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
index 21121b9..d5828a3 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/RootInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp
index 87b1a66..ba66245 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp
index 6ef5d20..80053ed 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
index 33dd268..c42347e 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
index fb1714e..ee4b556 100644
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/commonapi/tests/managed/SecondRootDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
index 7cb677e..2d93d6d 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
+++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
index 97b813d..b66df50 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
+++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusProxy.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
index fa73390..7866ba7 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
+++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.cpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
index 13ee475..5041822 100644
--- a/src/test/src-gen/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
+++ b/src/test/src-gen/dbus/v1_0/fake/legacy/service/LegacyInterfaceDBusStubAdapter.hpp
@@ -1,6 +1,6 @@
/*
* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
+* Used org.genivi.commonapi.core 3.1.2.v201506150834.
* 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/v1_0/commonapi/tests/managed/BranchInterface.hpp b/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterface.hpp
deleted file mode 100644
index fc1c1ab..0000000
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/BranchInterface.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
-* 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_
-
-
-
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#endif
-
-#include <CommonAPI/InputStream.hpp>
-#include <CommonAPI/OutputStream.hpp>
-#include <CommonAPI/Types.hpp>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-class BranchInterface {
-public:
- virtual ~BranchInterface() { }
-
- static inline const char* getInterface();
- static inline CommonAPI::Version getInterfaceVersion();
-
- struct testBranchMethodError : CommonAPI::Enumeration<int32_t> {
- testBranchMethodError() = default;
- testBranchMethodError(const int32_t &_value)
- : CommonAPI::Enumeration<int32_t>(_value) {}
- static const int32_t OK = 0;
- static const int32_t NOTOK = 1;
- };
-};
-
-const char* BranchInterface::getInterface() {
- return ("commonapi.tests.managed.BranchInterface");
-}
-
-CommonAPI::Version BranchInterface::getInterfaceVersion() {
- return CommonAPI::Version(1, 0);
-}
-
-
-} // namespace managed
-} // namespace tests
-} // namespace commonapi
-} // namespace v1_0
-
-namespace CommonAPI {
-}
-
-#endif // COMMONAPI_TESTS_MANAGED_BRANCH_INTERFACE_HPP_
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterface.hpp b/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterface.hpp
deleted file mode 100644
index 07cc9ff..0000000
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/LeafInterface.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
-* 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_
-
-
-
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#endif
-
-#include <CommonAPI/InputStream.hpp>
-#include <CommonAPI/OutputStream.hpp>
-#include <CommonAPI/Types.hpp>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-class LeafInterface {
-public:
- virtual ~LeafInterface() { }
-
- static inline const char* getInterface();
- static inline CommonAPI::Version getInterfaceVersion();
-
- struct testLeafMethodError : CommonAPI::Enumeration<int32_t> {
- testLeafMethodError() = default;
- testLeafMethodError(const int32_t &_value)
- : CommonAPI::Enumeration<int32_t>(_value) {}
- static const int32_t OK = 0;
- static const int32_t NOTOK = 1;
- };
-};
-
-const char* LeafInterface::getInterface() {
- return ("commonapi.tests.managed.LeafInterface");
-}
-
-CommonAPI::Version LeafInterface::getInterfaceVersion() {
- return CommonAPI::Version(1, 0);
-}
-
-
-} // namespace managed
-} // namespace tests
-} // namespace commonapi
-} // namespace v1_0
-
-namespace CommonAPI {
-}
-
-#endif // COMMONAPI_TESTS_MANAGED_LEAF_INTERFACE_HPP_
diff --git a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterface.hpp b/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterface.hpp
deleted file mode 100644
index 5542224..0000000
--- a/src/test/src-gen/v1_0/commonapi/tests/managed/RootInterface.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-* This file was generated by the CommonAPI Generators.
-* Used org.genivi.commonapi.core 3.1.1.v201505270851.
-* 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_
-
-
-#include <set>
-
-
-#if !defined (COMMONAPI_INTERNAL_COMPILATION)
-#define COMMONAPI_INTERNAL_COMPILATION
-#endif
-
-#include <CommonAPI/InputStream.hpp>
-#include <CommonAPI/OutputStream.hpp>
-#include <CommonAPI/Types.hpp>
-
-#undef COMMONAPI_INTERNAL_COMPILATION
-
-namespace v1_0 {
-namespace commonapi {
-namespace tests {
-namespace managed {
-
-class RootInterface {
-public:
- virtual ~RootInterface() { }
-
- static inline const char* getInterface();
- static inline CommonAPI::Version getInterfaceVersion();
-
- struct testRootMethodError : CommonAPI::Enumeration<int32_t> {
- testRootMethodError() = default;
- testRootMethodError(const int32_t &_value)
- : CommonAPI::Enumeration<int32_t>(_value) {}
- static const int32_t OK = 0;
- static const int32_t NOTOK = 1;
- };
-};
-
-const char* RootInterface::getInterface() {
- return ("commonapi.tests.managed.RootInterface");
-}
-
-CommonAPI::Version RootInterface::getInterfaceVersion() {
- return CommonAPI::Version(1, 0);
-}
-
-
-} // namespace managed
-} // namespace tests
-} // namespace commonapi
-} // namespace v1_0
-
-namespace CommonAPI {
-}
-
-#endif // COMMONAPI_TESTS_MANAGED_ROOT_INTERFACE_HPP_