Merge pull request #10 from oatpp/fix_tests

Fix tests

Author: lganzzzo

CMakeLists.txt

@@ -72,11 +72,11 @@ target_link_libraries(crud-exe crud-lib)
 
 add_executable(crud-test
         test/tests.cpp
-        test/app/DatabaseTestClient.hpp 
+        test/app/TestClient.hpp
         test/app/TestDatabaseComponent.hpp
-        test/app/TestComponent.hpp 
-        test/DatabaseTest.hpp 
-        test/DatabaseTest.cpp)
+        test/app/TestComponent.hpp
+        test/UserControllerTest.hpp
+        test/UserControllerTest.cpp)
 target_link_libraries(crud-test crud-lib)
 
 enable_testing()

src/service/UserService.cpp

@@ -8,8 +8,6 @@ oatpp::Object<UserDto> UserService::createUser(const oatpp::Object<UserDto>& dto
 
   auto userId = oatpp::sqlite::Utils::getLastInsertRowId(dbResult->getConnection());
 
-  OATPP_LOGD("AAA", "new userId=%d", userId);
-
   return getUserById((v_int32) userId);
 
 }

test/DatabaseTest.cpp

@@ -0,0 +1,83 @@
+#include "UserControllerTest.hpp"
+
+#include "oatpp/web/client/HttpRequestExecutor.hpp"
+#include "oatpp-test/web/ClientServerTestRunner.hpp"
+
+#include "controller/UserController.hpp"
+
+#include "app/TestClient.hpp"
+#include "app/TestComponent.hpp"
+
+#include <cstdio>
+
+void UserControllerTest::onRun() {
+
+  /* Remove test database file before running the test */
+  OATPP_LOGI(TAG, "DB-File='%s'", TESTDATABASE_FILE);
+  std::remove(TESTDATABASE_FILE);
+
+  /* Register test components */
+  TestComponent component;
+
+  /* Create client-server test runner */
+  oatpp::test::web::ClientServerTestRunner runner;
+
+  /* Add UserController endpoints to the router of the test server */
+  runner.addController(std::make_shared<UserController>());
+
+  /* Run test */
+  runner.run([this, &runner] {
+
+    /* Get client connection provider for Api Client */
+    OATPP_COMPONENT(std::shared_ptr<oatpp::network::ClientConnectionProvider>, clientConnectionProvider);
+
+    /* Get object mapper component */
+    OATPP_COMPONENT(std::shared_ptr<oatpp::data::mapping::ObjectMapper>, objectMapper);
+
+    /* Create http request executor for Api Client */
+    auto requestExecutor = oatpp::web::client::HttpRequestExecutor::createShared(clientConnectionProvider);
+
+    /* Create Test API client */
+    auto client = TestClient::createShared(requestExecutor, objectMapper);
+
+    auto dto = UserDto::createShared();
+
+    dto->userName = "jondoe";
+    dto->email = "[email protected]";
+    dto->password = "1234";
+
+    /* Call server API */
+    auto addedUserResponse = client->addUser(dto);
+
+    /* Assert that server responds with 200 */
+    OATPP_ASSERT(addedUserResponse->getStatusCode() == 200);
+
+    /* Read response body as MessageDto */
+    auto addedUserDto = addedUserResponse->readBodyToDto<oatpp::Object<UserDto>>(objectMapper.get());
+
+    int addedUserId = addedUserDto->id;
+
+    /* Assert that user has been added */
+    auto newUserResponse = client->getUser(addedUserId);
+
+    OATPP_ASSERT(newUserResponse->getStatusCode() == 200);
+
+    auto newUserDto = newUserResponse->readBodyToDto<oatpp::Object<UserDto>>(objectMapper.get());
+
+    OATPP_ASSERT(newUserDto->id == addedUserId);
+
+    /* Delete newly added users */
+    auto deletedUserResponse = client->deleteUser(addedUserId);
+
+    OATPP_ASSERT(deletedUserResponse->getStatusCode() == 200);
+
+  }, std::chrono::minutes(10) /* test timeout */);
+
+  /* wait all server threads finished */
+  std::this_thread::sleep_for(std::chrono::seconds(1));
+
+  /* stop db connection pool */
+  OATPP_COMPONENT(std::shared_ptr<oatpp::provider::Provider<oatpp::sqlite::Connection>>, dbConnectionProvider);
+  dbConnectionProvider->stop();
+
+}

test/DatabaseTest.hpp

@@ -0,0 +1,14 @@
+#ifndef UserControllerTest_hpp
+#define UserControllerTest_hpp
+
+#include "oatpp-test/UnitTest.hpp"
+
+class UserControllerTest : public oatpp::test::UnitTest {
+public:
+    UserControllerTest() : oatpp::test::UnitTest("TEST[UserControllerTest]")
+    {}
+
+    void onRun() override;
+};
+
+#endif // UserControllerTest_hpp

test/UserControllerTest.cpp

@@ -0,0 +1,37 @@
+#ifndef DatabaseTestClient_hpp
+#define DatabaseTestClient_hpp
+
+#include "oatpp/web/client/ApiClient.hpp"
+#include "oatpp/core/macro/codegen.hpp"
+
+#include "dto/UserDto.hpp"
+
+/* Begin Api Client code generation */
+#include OATPP_CODEGEN_BEGIN(ApiClient)
+
+/**
+ * Test API client.
+ * Use this client to call application APIs.
+ */
+class TestClient : public oatpp::web::client::ApiClient {
+
+  API_CLIENT_INIT(TestClient)
+
+  /*****************************************************************
+   * UserController
+   *****************************************************************/
+
+  API_CALL("POST", "/users", addUser, BODY_DTO(Object<UserDto>, userDto))
+  API_CALL("GET", "/users/{userId}", getUser, PATH(Int32, userId))
+  API_CALL("DELETE", "/users/{userId}", deleteUser, PATH(Int32, userId))
+
+  /*****************************************************************/
+
+  // TODO - add more client API calls here
+
+};
+
+/* End Api Client code generation */
+#include OATPP_CODEGEN_END(ApiClient)
+
+#endif // DatabaseTestClient_hpp

test/UserControllerTest.hpp

@@ -19,52 +19,52 @@
 class TestComponent {
 public:
 
-    TestDatabaseComponent databaseComponent;
-
-    /**
-     * Create oatpp virtual network interface for test networking
-     */
-    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::virtual_::Interface>, virtualInterface)([] {
-        return oatpp::network::virtual_::Interface::obtainShared("virtualhost");
-        }());
-
-    /**
-     * Create server ConnectionProvider of oatpp virtual connections for test
-     */
-    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)([] {
-        OATPP_COMPONENT(std::shared_ptr<oatpp::network::virtual_::Interface>, interface);
-        return oatpp::network::virtual_::server::ConnectionProvider::createShared(interface);
-        }());
-
-    /**
-     * Create client ConnectionProvider of oatpp virtual connections for test
-     */
-    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ClientConnectionProvider>, clientConnectionProvider)([] {
-        OATPP_COMPONENT(std::shared_ptr<oatpp::network::virtual_::Interface>, interface);
-        return oatpp::network::virtual_::client::ConnectionProvider::createShared(interface);
-        }());
-
-    /**
-     *  Create Router component
-     */
-    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, httpRouter)([] {
-        return oatpp::web::server::HttpRouter::createShared();
-        }());
-
-    /**
-     *  Create ConnectionHandler component which uses Router component to route requests
-     */
-    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, serverConnectionHandler)([] {
-        OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router); // get Router component
-        return oatpp::web::server::HttpConnectionHandler::createShared(router);
-        }());
-
-    /**
-     *  Create ObjectMapper component to serialize/deserialize DTOs in Contoller's API
-     */
-    OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::data::mapping::ObjectMapper>, apiObjectMapper)([] {
-        return oatpp::parser::json::mapping::ObjectMapper::createShared();
-        }());
+  TestDatabaseComponent databaseComponent;
+
+  /**
+   * Create oatpp virtual network interface for test networking
+   */
+  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::virtual_::Interface>, virtualInterface)([] {
+    return oatpp::network::virtual_::Interface::obtainShared("virtualhost");
+  }());
+
+  /**
+   * Create server ConnectionProvider of oatpp virtual connections for test
+   */
+  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ServerConnectionProvider>, serverConnectionProvider)([] {
+    OATPP_COMPONENT(std::shared_ptr<oatpp::network::virtual_::Interface>, interface);
+    return oatpp::network::virtual_::server::ConnectionProvider::createShared(interface);
+  }());
+
+  /**
+   * Create client ConnectionProvider of oatpp virtual connections for test
+   */
+  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ClientConnectionProvider>, clientConnectionProvider)([] {
+    OATPP_COMPONENT(std::shared_ptr<oatpp::network::virtual_::Interface>, interface);
+    return oatpp::network::virtual_::client::ConnectionProvider::createShared(interface);
+  }());
+
+  /**
+   *  Create Router component
+   */
+  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, httpRouter)([] {
+      return oatpp::web::server::HttpRouter::createShared();
+      }());
+
+  /**
+   *  Create ConnectionHandler component which uses Router component to route requests
+   */
+  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::network::ConnectionHandler>, serverConnectionHandler)([] {
+    OATPP_COMPONENT(std::shared_ptr<oatpp::web::server::HttpRouter>, router); // get Router component
+    return oatpp::web::server::HttpConnectionHandler::createShared(router);
+  }());
+
+  /**
+   *  Create ObjectMapper component to serialize/deserialize DTOs in Contoller's API
+   */
+  OATPP_CREATE_COMPONENT(std::shared_ptr<oatpp::data::mapping::ObjectMapper>, apiObjectMapper)([] {
+    return oatpp::parser::json::mapping::ObjectMapper::createShared();
+  }());
 
 };