add simple test

diff --git a/projects/GDE_API_CPP/api/CMakeLists.txt b/projects/GDE_API_CPP/api/CMakeLists.txt
index 48e3fb45f1214ed915be50236ba59143ba87e6ea..525cf7629f90417f6d6ad218228fb8a472aa176f 100644 (file)
--- a/projects/GDE_API_CPP/api/CMakeLists.txt
+++ b/projects/GDE_API_CPP/api/CMakeLists.txt
@@ -9,3 +9,4 @@ FIND_PACKAGE(POCO REQUIRED)
 INCLUDE_DIRECTORIES(${Poco_INCLUDE_DIRS})
 
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(tests)

diff --git a/projects/GDE_API_CPP/api/src/CommandResultTO.cpp b/projects/GDE_API_CPP/api/src/CommandResultTO.cpp
index 011bd62cd32e8c02f60f2258397cf37a3dca97a0..a225786f7309341e97477f3f9cfdd3bc35cc90c1 100644 (file)
--- a/projects/GDE_API_CPP/api/src/CommandResultTO.cpp
+++ b/projects/GDE_API_CPP/api/src/CommandResultTO.cpp
@@ -9,6 +9,7 @@ gde::CommandResultTO::CommandResultTO(const CommandResultTO& cto)
 gde::CommandResultTO
 gde::CommandResultTO::fromJson(std::string json)
 {
+  std::cout << "CommandResultTO: " << json << std::endl;
   Poco::JSON::Object::Ptr object = JsonFormatter::parse(json);
   int code = JsonFormatter::extract<int>(object, "code");
   std::string message = JsonFormatter::extract<std::string>(object, "message");

diff --git a/projects/GDE_API_CPP/api/src/CommandTO.cpp b/projects/GDE_API_CPP/api/src/CommandTO.cpp
index 92d19b947f035f7b1363f495f8e23a261acb8eb7..6b5ea898330582ea218083f091381d0b4245bbb3 100644 (file)
--- a/projects/GDE_API_CPP/api/src/CommandTO.cpp
+++ b/projects/GDE_API_CPP/api/src/CommandTO.cpp
@@ -63,7 +63,10 @@ gde::CommandTO::fromJson(std::string json)
   std::string data = JsonFormatter::extract<std::string>(object, "data");
 
   ParametersMap parameters;
-  Poco::JSON::Object::Ptr objParameters = JsonFormatter::extract<Poco::JSON::Object::Ptr>(object, "parameters");
+  //Poco::JSON::Object::Ptr objParameters = JsonFormatter::extract<Poco::JSON::Object::Ptr>(object, "parameters");
+  Poco::Dynamic::Var varParameters = object->get("parameters");
+  Poco::JSON::Object::Ptr objParameters = varParameters.extract<Poco::JSON::Object::Ptr>();
+
   for (Poco::JSON::Object::ConstIterator itr = objParameters->begin(); itr != objParameters->end(); ++itr) {
     std::string paramName = itr->first;
     std::string paramValue = itr->second;

diff --git a/projects/GDE_API_CPP/api/src/HttpConnection.cpp b/projects/GDE_API_CPP/api/src/HttpConnection.cpp
index 5a2e16dcca8a8bf94b73366099f5c970d044c802..9054e03872ece5d1de8f20e76fc0e8d09bcc7d38 100644 (file)
--- a/projects/GDE_API_CPP/api/src/HttpConnection.cpp
+++ b/projects/GDE_API_CPP/api/src/HttpConnection.cpp
@@ -47,7 +47,10 @@ gde::HttpConnection::_processRequest(const HTTPRequest& request,
   std::string message = "";
   std::string data = "";
 
+  std::cout << "processRequest: body = " << requestBody << std::endl;
+
   try {
+    std::cout << "Sending request...\n";
     std::ostream& os = _session.sendRequest((HTTPRequest&)request);
     // Send request body, if any
     if (!requestBody.empty()) {
@@ -55,6 +58,7 @@ gde::HttpConnection::_processRequest(const HTTPRequest& request,
       Poco::StreamCopier::copyStream((std::istream&)iss, os);
     }
 
+    std::cout << "Getting response...\n";
     // Get response
     HTTPResponse response;
     std::istream& rs = _session.receiveResponse(response);
@@ -62,6 +66,7 @@ gde::HttpConnection::_processRequest(const HTTPRequest& request,
     std::ostringstream responseBody;
     Poco::StreamCopier::copyStream(rs, responseBody);
     // responseBody contains a CommandResultTO in json format
+    std::cout << "Returning result...\n";
     return CommandResultTO::fromJson(responseBody.str());
   } catch (Poco::Exception& e) {
     std::cerr << e.displayText() << std::endl;

diff --git a/projects/GDE_API_CPP/api/src/JsonFormatter.cpp b/projects/GDE_API_CPP/api/src/JsonFormatter.cpp
index 2bee2a529a3dddc14d77d0821de881ce76141ecc..f04337576446881c7e05c90b5fd022be28fed1d2 100644 (file)
--- a/projects/GDE_API_CPP/api/src/JsonFormatter.cpp
+++ b/projects/GDE_API_CPP/api/src/JsonFormatter.cpp
@@ -28,3 +28,7 @@ gde::JsonFormatter::stringify(const Poco::JSON::Object& object) {
   object.stringify(jsonStream);
   return jsonStream.str();
 }
+
+// Declare methods for the supported template type parameters
+template int gde::JsonFormatter::extract<int>(Poco::JSON::Object::Ptr object, const std::string& varName);
+template std::string gde::JsonFormatter::extract<std::string>(Poco::JSON::Object::Ptr object, const std::string& varName);

diff --git a/projects/GDE_API_CPP/api/src/User.hpp b/projects/GDE_API_CPP/api/src/User.hpp
index 131508b09b5ede355c82b9dcc33e973720ef77ac..577f4e2393c92275e9afcfee0bf0d2968180bf74 100644 (file)
--- a/projects/GDE_API_CPP/api/src/User.hpp
+++ b/projects/GDE_API_CPP/api/src/User.hpp
@@ -9,6 +9,8 @@ namespace gde {
     friend class UserService;
 
   public:
+    ~User() {}
+
     inline int getId() const { return _id; }
     inline void setId(int id) { this->_id = id; }
 
@@ -21,7 +23,6 @@ namespace gde {
   private:
     User(int id=-1, std::string name="", std::string password="")
       : _id(id), _name(name), _password(password) {}
-    ~User() {}
     User(const User&); // non copyable
     User& operator=(const User&); // non copyable
 

diff --git a/projects/GDE_API_CPP/api/src/UserService.cpp b/projects/GDE_API_CPP/api/src/UserService.cpp
index 2465ed90e6b8c835d0eb6bc250382121e4db44f7..20fc079851edfed8e2128569df704f5b967243b5 100644 (file)
--- a/projects/GDE_API_CPP/api/src/UserService.cpp
+++ b/projects/GDE_API_CPP/api/src/UserService.cpp
@@ -20,8 +20,9 @@ enum {
   FIND_USER
 };
 
+std::string gde::UserService::_servletName = "http://localhost:8080/GDE-war/UserService";
+
 gde::UserService::UserService()
-  : _servletName("/UserService")
 {
 }
 
@@ -29,7 +30,7 @@ gde::UserService::~UserService()
 {
 }
 
-gde::User
+const gde::User
 gde::UserService::createUser(std::string name, std::string password)
 {
   // build JSON string for CommandTO data
@@ -37,6 +38,7 @@ gde::UserService::createUser(std::string name, std::string password)
   obj.set("name", Poco::Dynamic::Var(name));
   obj.set("password", Poco::Dynamic::Var(password));
   std::string data = JsonFormatter::stringify(obj);
+  std::cout << "createUser: command = " << data << std::endl;
 
   CommandTO cto(CREATE_USER, data);
   CommandResultTO crto = gde::HttpConnection(Poco::URI(_servletName)).doPost(cto);

diff --git a/projects/GDE_API_CPP/api/src/UserService.hpp b/projects/GDE_API_CPP/api/src/UserService.hpp
index 33ca6b8a39fde6bfc4f33bc8e926e7b83748c056..0a143bbd30910161f2e0b17d2da11f1f2c813f3a 100644 (file)
--- a/projects/GDE_API_CPP/api/src/UserService.hpp
+++ b/projects/GDE_API_CPP/api/src/UserService.hpp
@@ -10,7 +10,7 @@ namespace gde {
   class UserService {
 
   public:
-    User createUser(std::string name, std::string password);
+    static const User createUser(std::string name, std::string password);
 
     void createUser();
     void deleteUser();
@@ -29,7 +29,7 @@ namespace gde {
     UserService& operator=(const UserService&); // non copyable
 
   private:
-    std::string _servletName;
+    static std::string _servletName;
   };
 
 };

diff --git a/projects/GDE_API_CPP/api/tests/CMakeLists.txt b/projects/GDE_API_CPP/api/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cd80d75
--- /dev/null
+++ b/projects/GDE_API_CPP/api/tests/CMakeLists.txt
@@ -0,0 +1,20 @@
+
+INCLUDE_DIRECTORIES(
+  ${Poco_INCLUDE_DIRS}
+  ${PROJECT_SOURCE_DIR}/src
+)
+
+LINK_DIRECTORIES(
+  ${Poco_LIBRARY_DIRS}
+#  ${CMAKE_INSTALL_DIR/lib}
+)
+
+SET(_link_LIBRARIES
+  #PocoNet
+  #PocoJSON
+  GdeApiCpp
+)
+
+ADD_EXECUTABLE(simple_test simple_test.cpp)
+TARGET_LINK_LIBRARIES(simple_test ${_link_LIBRARIES})
+INSTALL(TARGETS simple_test EXPORT ${PROJECT_NAME}TargetGroup DESTINATION tests)

diff --git a/projects/GDE_API_CPP/api/tests/simple_test.cpp b/projects/GDE_API_CPP/api/tests/simple_test.cpp
new file mode 100644 (file)
index 0000000..c913b8b
--- /dev/null
+++ b/projects/GDE_API_CPP/api/tests/simple_test.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+
+#include <UserService.hpp>
+#include <User.hpp>
+
+int
+main()
+{
+  const gde::User& user = gde::UserService::createUser("toto", "toto_passwd");
+
+  std::cout << "Name: " << user.getName() << std::endl;
+  std::cout << "Password: " << user.getPassword() << std::endl;
+
+}