Enabled TimerTest in cmake and moved SaveAndLoadMeshfunctionTest to Functions

src/UnitTests/CMakeLists.txt

@@ -53,9 +53,9 @@ else()
    TARGET_LINK_LIBRARIES( ParallelForTest ${GTEST_BOTH_LIBRARIES} )
 endif()
 
-ADD_EXECUTABLE( SaveAndLoadMeshfunctionTest SaveAndLoadMeshfunctionTest.cpp )
-TARGET_COMPILE_OPTIONS( SaveAndLoadMeshfunctionTest PRIVATE ${CXX_TESTS_FLAGS} )
-TARGET_LINK_LIBRARIES( SaveAndLoadMeshfunctionTest ${GTEST_BOTH_LIBRARIES} )
+ADD_EXECUTABLE( TimerTest TimerTest.cpp )
+TARGET_COMPILE_OPTIONS( TimerTest PRIVATE ${CXX_TESTS_FLAGS} )
+TARGET_LINK_LIBRARIES( TimerTest ${GTEST_BOTH_LIBRARIES} )
 
 ADD_TEST( AssertTest ${EXECUTABLE_OUTPUT_PATH}/AssertTest${CMAKE_EXECUTABLE_SUFFIX} )
 if( BUILD_CUDA )
@@ -66,4 +66,4 @@ ADD_TEST( FileTest ${EXECUTABLE_OUTPUT_PATH}/FileTest${CMAKE_EXECUTABLE_SUFFIX}
 ADD_TEST( StringTest ${EXECUTABLE_OUTPUT_PATH}/StringTest${CMAKE_EXECUTABLE_SUFFIX} )
 ADD_TEST( ObjectTest ${EXECUTABLE_OUTPUT_PATH}/ObjectTest${CMAKE_EXECUTABLE_SUFFIX} )
 ADD_TEST( ParallelForTest ${EXECUTABLE_OUTPUT_PATH}/ParallelForTest${CMAKE_EXECUTABLE_SUFFIX} )
-ADD_TEST( SaveAndLoadMeshfunctionTest ${EXECUTABLE_OUTPUT_PATH}/SaveAndLoadMeshfunctionTest${CMAKE_EXECUTABLE_SUFFIX} )
+ADD_TEST( TimerTest ${EXECUTABLE_OUTPUT_PATH}/TimerTest${CMAKE_EXECUTABLE_SUFFIX} )

src/UnitTests/Functions/CMakeLists.txt

@@ -16,5 +16,10 @@ ELSE(  BUILD_CUDA )
    TARGET_LINK_LIBRARIES( BoundaryMeshFunctionTest ${GTEST_BOTH_LIBRARIES} )
 ENDIF( BUILD_CUDA )
 
+ADD_EXECUTABLE( SaveAndLoadMeshfunctionTest SaveAndLoadMeshfunctionTest.cpp )
+TARGET_COMPILE_OPTIONS( SaveAndLoadMeshfunctionTest PRIVATE ${CXX_TESTS_FLAGS} )
+TARGET_LINK_LIBRARIES( SaveAndLoadMeshfunctionTest ${GTEST_BOTH_LIBRARIES} )
+
 ADD_TEST( MeshFunctionTest ${EXECUTABLE_OUTPUT_PATH}/MeshFunctionTest${CMAKE_EXECUTABLE_SUFFIX} )
 ADD_TEST( BoundaryMeshFunctionTest ${EXECUTABLE_OUTPUT_PATH}/BoundaryMeshFunctionTest${CMAKE_EXECUTABLE_SUFFIX} )
+ADD_TEST( SaveAndLoadMeshfunctionTest ${EXECUTABLE_OUTPUT_PATH}/SaveAndLoadMeshfunctionTest${CMAKE_EXECUTABLE_SUFFIX} )

src/UnitTests/SaveAndLoadMeshfunctionTest.cpp → src/UnitTests/Functions/SaveAndLoadMeshfunctionTest.cpp

@@ -11,7 +11,7 @@
 #ifdef HAVE_GTEST
 #include <gtest/gtest.h>
 
-#include "Functions/Functions.h"
+#include "Functions.h"
 
 #include <iostream>
 
@@ -110,4 +110,4 @@ TEST( CopyEntitiesTest, 3D )
 }
 #endif
 
-#include "main.h"
+#include "../main.h"

src/UnitTests/TimerTest.cpp

 /***************************************************************************
-                          FileNameTest.cpp  -  description
+                          TimerTest.cpp  -  description
                              -------------------
     begin                : Oct 17, 2018
     copyright            : (C) 2018 by Tomas Oberhuber