From 7362ba6fdaf31195e5a0d09507d6c800e8e355ea Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Wed, 12 Aug 2020 09:49:00 +0200
Subject: [PATCH] Added unit test for endsWith() and removed the boost
dependency.
---
CMake/FileUtilities.cmake | 6 ++---
CMake/VirtualFluidsMacros.cmake | 4 +--
CMake/cmake_config_files/TESLA01.config.cmake | 3 ++-
.../Core/StringUtilities/StringUtil.cpp | 1 -
.../Core/StringUtilities/StringUtilTest.cpp | 25 ++++++++++++++++---
5 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/CMake/FileUtilities.cmake b/CMake/FileUtilities.cmake
index 7ee2f714b..2a72a0472 100644
--- a/CMake/FileUtilities.cmake
+++ b/CMake/FileUtilities.cmake
@@ -28,10 +28,10 @@ endmacro(includeTestFiles)
macro(includeFiles targetName file_path)
foreach(file ${file_path})
- message("File: " ${file})
+ #message("File: " ${file})
get_filename_component(package_dir ${file} DIRECTORY)
- message("package_dir: " ${package_dir})
+ #message("package_dir: " ${package_dir})
collectFilesFrom(${file})
if (package_dir)
@@ -105,7 +105,7 @@ macro(buildSourceGroup targetName path)
endif()
endforeach()
- message("SOURCE_GROUP: " ${SOURCE_GROUP})
+ #message("SOURCE_GROUP: " ${SOURCE_GROUP})
if(NOT SOURCE_GROUP)
set(SOURCE_GROUP "general")
diff --git a/CMake/VirtualFluidsMacros.cmake b/CMake/VirtualFluidsMacros.cmake
index ec75ad9d5..8ce300eb6 100644
--- a/CMake/VirtualFluidsMacros.cmake
+++ b/CMake/VirtualFluidsMacros.cmake
@@ -30,7 +30,7 @@ function(vf_add_library)
if (ARG_FILES)
- message ("${ARG_FILES}")
+ #message ("${ARG_FILES}")
set(sourceFiles ${sourceFiles} ${ARG_FILES})
endif()
@@ -51,7 +51,7 @@ function(vf_add_library)
endif()
foreach(X IN LISTS sourceFiles)
- message(STATUS "${X}")
+ #message(STATUS "${X}")
endforeach()
if (ARG_EXCLUDE)
diff --git a/CMake/cmake_config_files/TESLA01.config.cmake b/CMake/cmake_config_files/TESLA01.config.cmake
index 46a0ed2b7..d27c94b31 100644
--- a/CMake/cmake_config_files/TESLA01.config.cmake
+++ b/CMake/cmake_config_files/TESLA01.config.cmake
@@ -1,9 +1,10 @@
#Don't change:
SET(METIS_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/metis/metis-5.1.0 CACHE PATH "METIS ROOT")
-SET(GMOCK_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/googletest CACHE PATH "GMOCK ROOT")
+#SET(GMOCK_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/googletest CACHE PATH "GMOCK ROOT")
SET(JSONCPP_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/jsoncpp CACHE PATH "JSONCPP ROOT")
SET(FFTW_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/fftw/fftw-3.3.7 CACHE PATH "JSONCPP ROOT")
+SET(GMOCK_ROOT C:\\Libraries\\googletest-release-1.10.0 CACHE PATH "GMOCK ROOT")
#SET TO CORRECT PATH:
SET(BOOST_ROOT "C:\\Libraries\\boost_1_65_1" CACHE PATH "BOOST_ROOT")
diff --git a/src/basics/Core/StringUtilities/StringUtil.cpp b/src/basics/Core/StringUtilities/StringUtil.cpp
index f222ec39c..515c2e26f 100644
--- a/src/basics/Core/StringUtilities/StringUtil.cpp
+++ b/src/basics/Core/StringUtilities/StringUtil.cpp
@@ -176,5 +176,4 @@ bool StringUtil::endsWith(const std::string &input, const std::string &end)
} else {
return false;
}
- //return boost::algorithm::ends_with(input, end);
}
\ No newline at end of file
diff --git a/src/basics/Core/StringUtilities/StringUtilTest.cpp b/src/basics/Core/StringUtilities/StringUtilTest.cpp
index 0b6a2d0b2..2de06ac57 100644
--- a/src/basics/Core/StringUtilities/StringUtilTest.cpp
+++ b/src/basics/Core/StringUtilities/StringUtilTest.cpp
@@ -4,8 +4,27 @@
#include <gmock/gmock.h>
-TEST(TestTest, failing)
+#include "StringUtil.h"
+
+int main(int argc, char *argv[])
+{
+ testing::InitGoogleTest(&argc, argv);
+ testing::InitGoogleMock(&argc, argv);
+ return RUN_ALL_TESTS();
+}
+
+TEST(StringUtilTest, endsWith_shouldReturnTrue)
{
-
- ASSERT_TRUE(false);
+ const std::string input {"input_string"};
+ const std::string ends_with {"string"};
+
+ ASSERT_TRUE(StringUtil::endsWith(input, ends_with));
+}
+
+TEST(StringUtilTest, endsWith_shouldReturnFalse)
+{
+ const std::string input {"input_string"};
+ const std::string ends_with {"string_"};
+
+ ASSERT_FALSE(StringUtil::endsWith(input, ends_with));
}
\ No newline at end of file
--
GitLab