Commit 1332b5d6 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Moved tests for multimaps under UnitTests/Containers

parent bfee9434

src/UnitTests/Containers/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -81,3 +81,6 @@ ADD_TEST( StaticArrayTest ${EXECUTABLE_OUTPUT_PATH}/StaticArrayTest${CMAKE_EXECU 
ADD_TEST( VectorTest ${EXECUTABLE_OUTPUT_PATH}/VectorTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( StaticVectorTest ${EXECUTABLE_OUTPUT_PATH}/StaticVectorTest${CMAKE_EXECUTABLE_SUFFIX} )

#ADD_TEST( MultiArrayTest ${EXECUTABLE_OUTPUT_PATH}/MultiArrayTest${CMAKE_EXECUTABLE_SUFFIX} )





ADD_SUBDIRECTORY( Multimaps )

src/UnitTests/Containers/Multimaps/CMakeLists.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
ADD_EXECUTABLE( MultimapTest MultimapTest.cpp )

TARGET_COMPILE_OPTIONS( MultimapTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( MultimapTest

                           ${GTEST_BOTH_LIBRARIES}

                           tnl )



ADD_EXECUTABLE( StaticMultimapTest StaticMultimapTest.cpp )

TARGET_COMPILE_OPTIONS( StaticMultimapTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( StaticMultimapTest

                           ${GTEST_BOTH_LIBRARIES}

                           tnl )



ADD_TEST( MultimapTest ${EXECUTABLE_OUTPUT_PATH}/MultimapTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( StaticMultimapTest ${EXECUTABLE_OUTPUT_PATH}/MultimapTest${CMAKE_EXECUTABLE_SUFFIX} )

src/UnitTests/Meshes/MultimapTest.cpp→src/UnitTests/Containers/Multimaps/MultimapTest.cpp

+1 −1
Original line number Diff line number Diff line 
#include <TNL/Experimental/Multimaps/EllpackIndexMultimap.h>

#include <TNL/Containers/Multimaps/EllpackIndexMultimap.h>



using namespace TNL;

src/UnitTests/Meshes/StaticMultimapTest.cpp→src/UnitTests/Containers/Multimaps/StaticMultimapTest.cpp

+1 −1
Original line number Diff line number Diff line 
#include <TNL/Experimental/Multimaps/StaticEllpackIndexMultimap.h>

#include <TNL/Containers/Multimaps/StaticEllpackIndexMultimap.h>



using namespace TNL;

src/UnitTests/Meshes/CMakeLists.txt

+0 −14
Original line number Diff line number Diff line
@@ -36,25 +36,11 @@ TARGET_LINK_LIBRARIES( MeshEntityTest 
                           ${GTEST_BOTH_LIBRARIES}

                           tnl )



ADD_EXECUTABLE( MultimapTest MultimapTest.cpp )

TARGET_COMPILE_OPTIONS( MultimapTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( MultimapTest

                           ${GTEST_BOTH_LIBRARIES}

                           tnl )



ADD_EXECUTABLE( StaticMultimapTest StaticMultimapTest.cpp )

TARGET_COMPILE_OPTIONS( StaticMultimapTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( StaticMultimapTest

                           ${GTEST_BOTH_LIBRARIES}

                           tnl )





ADD_TEST( BoundaryTagsTest ${EXECUTABLE_OUTPUT_PATH}/BoundaryTagsTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( MeshTest ${EXECUTABLE_OUTPUT_PATH}/MeshTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( MeshOrderingTest ${EXECUTABLE_OUTPUT_PATH}/MeshOrderingTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( MeshEntityTest ${EXECUTABLE_OUTPUT_PATH}/MeshEntityTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( MultimapTest ${EXECUTABLE_OUTPUT_PATH}/MultimapTest${CMAKE_EXECUTABLE_SUFFIX} )

ADD_TEST( StaticMultimapTest ${EXECUTABLE_OUTPUT_PATH}/MultimapTest${CMAKE_EXECUTABLE_SUFFIX} )