From 2293604e11963052a9335bab69d978de4b0bb297 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Sat, 3 Jun 2017 21:16:23 +0100 Subject: [PATCH] Fix tests' build. --- test/simulation/CMakeLists.txt | 4 ++-- test/simulation/test_index_response.cpp | 18 +++++++++--------- test/unit/CMakeLists.txt | 2 +- test/unit/test_settings_bag.cpp | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/simulation/CMakeLists.txt b/test/simulation/CMakeLists.txt index 4d1a053..df90082 100644 --- a/test/simulation/CMakeLists.txt +++ b/test/simulation/CMakeLists.txt @@ -1,4 +1,4 @@ -project(tawashi_simulation CXX) +project(kamokan_simulation CXX) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -16,7 +16,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${TAWASHI_GEN_INCLUDE_DIR} ) target_link_libraries(${PROJECT_NAME} - PRIVATE tawashi_implem + PRIVATE tawashi PRIVATE duckhandy ) diff --git a/test/simulation/test_index_response.cpp b/test/simulation/test_index_response.cpp index b23394f..248fde4 100644 --- a/test/simulation/test_index_response.cpp +++ b/test/simulation/test_index_response.cpp @@ -1,18 +1,18 @@ /* Copyright 2017, Michele Santullo - * This file is part of "tawashi". + * This file is part of "kamokan". * - * "tawashi" is free software: you can redistribute it and/or modify + * "kamokan" is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * "tawashi" is distributed in the hope that it will be useful, + * "kamokan" is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with "tawashi". If not, see . + * along with "kamokan". If not, see . */ #include "catch.hpp" @@ -99,17 +99,17 @@ TEST_CASE ("Index response", "[index][response]") { }; SafeStackObject fake_env(env_raw, "/"); - std::string tawashi_settings( - "[tawashi]\n" + std::string kamokan_settings( + "[kamokan]\n" " host_name = 127.0.0.1\n" - " website_root = /home/michele/dev/code/cpp/tawashi/html\n" + " website_root = /home/michele/dev/code/cpp/kamokan/html\n" " logging_level = debug\n" " langmap_dir = /usr/share/source-highlight\n" " host_path = /\n" " host_port =\n" ); - SafeStackObject ini(std::move(tawashi_settings)); - SafeStackObject settings(ini); + SafeStackObject ini(std::move(kamokan_settings)); + SafeStackObject settings(ini, "kamokan"); std::stringstream response_stream; diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index ec19c8c..c9c9e7f 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${GLIB_INCLUDE_DIRS} ) target_link_libraries(${PROJECT_NAME} - PRIVATE tawashi_implem + PRIVATE tawashi PRIVATE duckhandy PRIVATE ${GLIB_LIBRARIES} ) diff --git a/test/unit/test_settings_bag.cpp b/test/unit/test_settings_bag.cpp index 611d0b8..0b1a405 100644 --- a/test/unit/test_settings_bag.cpp +++ b/test/unit/test_settings_bag.cpp @@ -50,7 +50,7 @@ TEST_CASE ("Add and retrieve values from SettingsBag", "[settings][ini]") { auto ini = SafeStackObject(std::istream_iterator(ss), std::istream_iterator()); CHECK(ini->parse_success()); REQUIRE(ini->parsed_characters() == raw_ini_char_count); - SettingsBag settings(ini); + SettingsBag settings(ini, "tawashi"); CHECK(settings["redis_server"] == "127.0.0.1"); CHECK(settings["empty"].empty());