update the CommonAPI based POC for POI

2 files changed, 18 insertions, 3 deletions

diff --git a/test/poi-service/poi-manager-client/CMakeLists.txt b/test/poi-service/poi-manager-client/CMakeLists.txt
index 101bfb6..573a0ef 100644
--- a/test/poi-service/poi-manager-client/CMakeLists.txt
+++ b/test/poi-service/poi-manager-client/CMakeLists.txt
@@ -62,11 +62,14 @@ add_subdirectory(${FRANCA_DIR}/navigation/poiservice "${CMAKE_CURRENT_BINARY_DIR
 # Path to the generated files
 set(API_VERSION_NAVIGATION_MAJOR 4)
 set(API_VERSION_NAVIGATION "v${API_VERSION_NAVIGATION_MAJOR}")
-set(API_VERSION_POISERVICE_MAJOR 2)
+set(API_VERSION_POISERVICE_MAJOR 3)
 set(API_VERSION_POISERVICE "v${API_VERSION_POISERVICE_MAJOR}")
+set(API_VERSION_POISERVICE_CAM_MAJOR 2)
+set(API_VERSION_POISERVICE_CAM "v${API_VERSION_POISERVICE_CAM_MAJOR}")
 set(PRJ_SRC_GEN_COMMON_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi)
 set(PRJ_SRC_GEN_NAVIGATION_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_NAVIGATION}/org/genivi/navigation) #files shared by the navigation APIs
 set(PRJ_SRC_GEN_POISERVICE_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE}/org/genivi/navigation/poiservice) #files shared by the poiservice APIs
+set(PRJ_SRC_GEN_POISERVICE_CAM_PATH ${COMMONAPI_GEN_DIR}/${API_VERSION_POISERVICE_CAM}/org/genivi/navigation/poiservice) #files shared by the poiservice CAM APIs
 
 # Source Files
 FILE(GLOB PRJ_LOCAL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
@@ -74,6 +77,7 @@ FILE(GLOB PRJ_PROXY_GEN_SRCS
     ${PRJ_SRC_GEN_COMMON_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*Types.cpp ${PRJ_SRC_GEN_COMMON_PATH}/*DBusDeployment.cpp
     ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*Types.cpp ${PRJ_SRC_GEN_NAVIGATION_PATH}/*DBusDeployment.cpp
     ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusProxy.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_PATH}/*DBusDeployment.cpp
+    ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*DBusProxy*.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*Types.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*DBusDeployment.cpp ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}/*StubDefault.cpp
     )
 set(PRJ_SRCS ${PRJ_LOCAL_SRCS} ${PRJ_PROXY_GEN_SRCS})
 
@@ -83,6 +87,7 @@ include_directories(
     ${PRJ_SRC_GEN_COMMON_PATH}
     ${PRJ_SRC_GEN_NAVIGATION_PATH}
     ${PRJ_SRC_GEN_POISERVICE_PATH}
+    ${PRJ_SRC_GEN_POISERVICE_CAM_PATH}
     ${DBUS_INCLUDE_DIRS}
     ${COMMONAPI_INCLUDE_DIRS}
     ${COMMONAPI_DBUS_INCLUDE_DIRS}
diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp
index 6ace120..b655074 100644
--- a/test/poi-service/poi-manager-client/main.cpp
+++ b/test/poi-service/poi-manager-client/main.cpp
@@ -49,9 +49,14 @@
 
 using namespace std;
 using namespace v2::org::genivi::navigation::poiservice;
+using namespace v3::org::genivi::navigation::poiservice;
 using namespace v4::org::genivi::navigation;
 using namespace v4::org::genivi;
 
+#define REGISTER_COUNTER 10
+#define REGISTER_SLEEP 50
+static std::shared_ptr < CommonAPI::Runtime > runtime;
+
 // class  contentManager
 class  contentManager
 {
@@ -584,7 +589,8 @@ int main(int  argc , char**  argv )
     // so we can use std::cout with UTF-8, via Glib::ustring, without exceptions.
     std::locale::global(std::locale(""));
 
-    std::shared_ptr < CommonAPI::Runtime > runtime = CommonAPI::Runtime::get();
+    runtime = CommonAPI::Runtime::get();
+    uint8_t counter=0;
 
     const std::string domain = "local";
     const std::string instance = "POIContentAccessModuleService";
@@ -594,7 +600,11 @@ int main(int  argc , char**  argv )
             runtime->buildProxy<POIContentAccessModuleProxy>(domain,instance);
 
     while (!myProxy->isAvailable()) {
-        usleep(10);
+        if(++counter>REGISTER_COUNTER){
+            std::cout << "unable to build proxy: "<< instance << std::endl;
+            return EXIT_FAILURE;
+        }
+        std::this_thread::sleep_for(std::chrono::milliseconds(REGISTER_SLEEP));
     }
 
     //index used for argument analysis