Test the content-manager-client under progress

2 files changed, 78 insertions, 4 deletions

diff --git a/test/poi-service/README b/test/poi-service/README
index 0059d07..2d16427 100644
--- a/test/poi-service/README
+++ b/test/poi-service/README
@@ -108,3 +108,24 @@ How To Run
 
 ./run 
 
+===============================
+How To for poi-common-manager-client
+===============================
+First you need to build the server
+cd ../../src/poi-service
+cd build
+cmake -DWITH_FRANCA_INTERFACE=ON ../
+make
+cd ..
+Launch the server
+cp ./resource/poi-database-managed.db ~/Desktop
+./bin/poi-manager-server -f ~/Desktop/poi-database-managed.db
+Now build the client
+cd ../../test/poi-service
+cd build
+cmake -DWITH_FRANCA_INTERFACE=ON ../
+make
+cd ../
+Launch the client
+./poi-manager-client -t
+
diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp
index 186472e..f8d0664 100644
--- a/test/poi-service/poi-manager-client/main.cpp
+++ b/test/poi-service/poi-manager-client/main.cpp
@@ -95,7 +95,7 @@ private:
     GtkWidget *mp_popupWindow;
     DBus_CAMcategory m_category;
     categoryId_t m_category_id;
-    poiId_t m_poi_id;
+    std::vector<poiId_t> m_poi_ids;
     DBus_PoiAddedDetails m_poi;
     DBus_geoCoordinate3D m_left_bottom_location,m_right_top_location;
     std::string m_strTest;
@@ -150,6 +150,8 @@ contentManager::contentManager(DBus::Connection &connection)
     poi_attribute.value.content.stringValue = v;
     poi.attributes.push_back(poi_attribute);
 
+    m_poi_ids.clear(); //list empty for the moment
+
     m_poi.set(poi);
 
     // init of data test for location
@@ -163,7 +165,7 @@ contentManager::contentManager(DBus::Connection &connection)
     m_left_bottom_location.set(left_bottom_location);
     m_right_top_location.set(right_top_location);
 
-    // initi of the data test for search string
+    // init of the data test for search string
     m_strTest = SEARCH_STRING;
 
 }
@@ -199,10 +201,12 @@ void contentManager::POIAdded(const std::vector< uint32_t >& pois)
 {
     size_t index;
 
+    m_poi_ids.clear();
     cout << "POI Added"  << endl;
     for(index=0;index<pois.size();index++)
     {
         cout << "Id: " << pois.at(index)  << endl;
+        m_poi_ids.push_back(pois.at(index));
     }
 }
 
@@ -239,12 +243,14 @@ void contentManager::testRemoveCategory()
 
 void contentManager::testCreatePOI()
 {
-
+    std::vector<DBus_PoiAddedDetails::DBus_PoiAddedDetails_t> poiList;
+    poiList.push_back(m_poi.getDBus());
+    addPOIs(m_category_id,poiList);
 }
 
 void contentManager::testRemovePOI()
 {
-
+    removePOIs(m_poi_ids);
 }
 
 void contentManager::testSearch()
@@ -295,6 +301,24 @@ static void onDeleteCategory( GtkWidget *widget,
     clientContentManager->testRemoveCategory();
 }
 
+static void onCreatePoi( GtkWidget *widget,
+                      contentManager *clientContentManager )
+{
+    clientContentManager->testCreatePOI();
+}
+
+static void onDeletePoi( GtkWidget *widget,
+                      contentManager *clientContentManager )
+{
+    clientContentManager->testRemovePOI();
+}
+
+static void onSearch( GtkWidget *widget,
+                      contentManager *clientContentManager )
+{
+    clientContentManager->testSearch();
+}
+
 void populateWindow(GtkWidget *window,contentManager *clientContentManager)
 {
     GtkWidget *button;
@@ -331,6 +355,35 @@ void populateWindow(GtkWidget *window,contentManager *clientContentManager)
 
     gtk_widget_show (box);
 
+    button = gtk_button_new_with_label ("Create POI");
+
+    g_signal_connect (button, "clicked",
+              G_CALLBACK (onCreatePoi), clientContentManager);
+
+    gtk_box_pack_start (GTK_BOX(box), button, TRUE, TRUE, 0);
+
+    gtk_widget_show (button);
+
+    button = gtk_button_new_with_label ("Delete POI");
+
+    g_signal_connect (button, "clicked",
+              G_CALLBACK (onDeletePoi), clientContentManager);
+
+    gtk_box_pack_start(GTK_BOX (box), button, TRUE, TRUE, 0);
+
+    gtk_widget_show (button);
+
+    button = gtk_button_new_with_label ("Search");
+
+    g_signal_connect (button, "clicked",
+              G_CALLBACK (onSearch), clientContentManager);
+
+    gtk_box_pack_start (GTK_BOX(box), button, TRUE, TRUE, 0);
+
+    gtk_widget_show (button);
+
+    gtk_widget_show (box);
+
     gtk_widget_show (window);
 }