From 5db35de96759a49a9caac08f59c2a49169659499 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Tue, 22 Mar 2016 22:03:08 +0000 Subject: [PATCH] Improve Version tests This also updates the DLL version extraction test to use the new API DLL name introduced in 939ca1f1ddbe9813e2ba9f73e98eaaef4068d6b9. --- CMakeLists.txt | 2 +- src/tests/backend/helpers/{test_version.h => version_test.h} | 5 +++-- src/tests/main.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename src/tests/backend/helpers/{test_version.h => version_test.h} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f92c891..dfa9192a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,7 +242,7 @@ set (LOOT_TESTS_HEADERS "${CMAKE_SOURCE_DIR}/src/tests/base_game_test.h" "${CMAKE_SOURCE_DIR}/src/tests/backend/helpers/git_helper_test.h" "${CMAKE_SOURCE_DIR}/src/tests/backend/helpers/helpers_test.h" "${CMAKE_SOURCE_DIR}/src/tests/backend/helpers/language_test.h" - "${CMAKE_SOURCE_DIR}/src/tests/backend/helpers/test_version.h" + "${CMAKE_SOURCE_DIR}/src/tests/backend/helpers/version_test.h" "${CMAKE_SOURCE_DIR}/src/tests/backend/helpers/test_yaml_set_helpers.h" "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_condition_grammar.h" "${CMAKE_SOURCE_DIR}/src/tests/backend/metadata/test_conditional_metadata.h" diff --git a/src/tests/backend/helpers/test_version.h b/src/tests/backend/helpers/version_test.h similarity index 99% rename from src/tests/backend/helpers/test_version.h rename to src/tests/backend/helpers/version_test.h index 3e8deeab..6f540899 100644 --- a/src/tests/backend/helpers/test_version.h +++ b/src/tests/backend/helpers/version_test.h @@ -27,14 +27,15 @@ along with LOOT. If not, see #include "backend/globals.h" #include "backend/helpers/version.h" -#include "tests/fixtures.h" + +#include namespace loot { namespace test { #ifdef _WIN32 TEST(Version, shouldExtractVersionFromApiDll) { // Use the API DLL built. - Version version(boost::filesystem::path("loot32.dll")); + Version version(boost::filesystem::path("loot_api.dll")); std::string expected( std::to_string(g_version_major) + "." + std::to_string(g_version_minor) + "." + diff --git a/src/tests/main.cpp b/src/tests/main.cpp index baf09f0d..cd471d52 100644 --- a/src/tests/main.cpp +++ b/src/tests/main.cpp @@ -48,7 +48,7 @@ #include "backend/helpers/git_helper_test.h" #include "backend/helpers/helpers_test.h" #include "backend/helpers/language_test.h" -#include "backend/helpers/test_version.h" +#include "backend/helpers/version_test.h" #include "backend/helpers/test_yaml_set_helpers.h" #include "backend/metadata/test_condition_grammar.h" #include "backend/metadata/test_conditional_metadata.h"