Commit 80c57392 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Preparation of tests for Vector-of-StaticVectors and StaticVector-of-StaticVectors

parent ef9b11e4

src/UnitTests/Containers/CMakeLists.txt

+16 −4
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ ADD_EXECUTABLE( VectorVerticalOperationsTest VectorVerticalOperationsTest.cpp ) 
TARGET_COMPILE_OPTIONS( VectorVerticalOperationsTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( VectorVerticalOperationsTest ${GTEST_BOTH_LIBRARIES} )



# FIXME

#ADD_EXECUTABLE( VectorOfStaticVectorsTest VectorOfStaticVectorsTest.cpp )

#TARGET_COMPILE_OPTIONS( VectorOfStaticVectorsTest PRIVATE ${CXX_TESTS_FLAGS} )

#TARGET_LINK_LIBRARIES( VectorOfStaticVectorsTest ${GTEST_BOTH_LIBRARIES} )



IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( ArrayTestCuda ArrayTest.cu

                        OPTIONS ${CXX_TESTS_FLAGS} )
@@ -54,6 +59,10 @@ IF( BUILD_CUDA ) 


   CUDA_ADD_EXECUTABLE( VectorVerticalOperationsTestCuda VectorVerticalOperationsTest.cu OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( VectorVerticalOperationsTestCuda ${GTEST_BOTH_LIBRARIES} )



   # FIXME

#   CUDA_ADD_EXECUTABLE( VectorOfStaticVectorsTestCuda VectorOfStaticVectorsTest.cu OPTIONS ${CXX_TESTS_FLAGS} )

#   TARGET_LINK_LIBRARIES( VectorOfStaticVectorsTestCuda ${GTEST_BOTH_LIBRARIES} )

ENDIF( BUILD_CUDA )



ADD_EXECUTABLE( StaticArrayTest StaticArrayTest.cpp )
@@ -68,9 +77,10 @@ ADD_EXECUTABLE( StaticVectorOperationsTest StaticVectorOperationsTest.cpp ) 
TARGET_COMPILE_OPTIONS( StaticVectorOperationsTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( StaticVectorOperationsTest ${GTEST_BOTH_LIBRARIES} )



ADD_EXECUTABLE( VectorOfStaticVectorsTest VectorOfStaticVectorsTest.cpp )

TARGET_COMPILE_OPTIONS( VectorOfStaticVectorsTest PRIVATE ${CXX_TESTS_FLAGS} )

TARGET_LINK_LIBRARIES( VectorOfStaticVectorsTest ${GTEST_BOTH_LIBRARIES} )

# FIXME

#ADD_EXECUTABLE( StaticVectorOfStaticVectorsTest StaticVectorOfStaticVectorsTest.cpp )

#TARGET_COMPILE_OPTIONS( StaticVectorOfStaticVectorsTest PRIVATE ${CXX_TESTS_FLAGS} )

#TARGET_LINK_LIBRARIES( StaticVectorOfStaticVectorsTest ${GTEST_BOTH_LIBRARIES} )





ADD_TEST( ArrayTest ${EXECUTABLE_OUTPUT_PATH}/ArrayTest${CMAKE_EXECUTABLE_SUFFIX} )
@@ -81,6 +91,7 @@ ADD_TEST( VectorEvaluateAndReduceTest ${EXECUTABLE_OUTPUT_PATH}/VectorEvaluateAn 
ADD_TEST( VectorBinaryOperationsTest ${EXECUTABLE_OUTPUT_PATH}/VectorBinaryOperationsTest${CMAKE_EXECUTABLE_SUFFIX} )

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

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

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

IF( BUILD_CUDA )

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

   ADD_TEST( ArrayViewTestCuda ${EXECUTABLE_OUTPUT_PATH}/ArrayViewTestCuda${CMAKE_EXECUTABLE_SUFFIX} )
@@ -90,11 +101,12 @@ IF( BUILD_CUDA ) 
   ADD_TEST( VectorBinaryOperationsTestCuda ${EXECUTABLE_OUTPUT_PATH}/VectorBinaryOperationsTestCuda${CMAKE_EXECUTABLE_SUFFIX} )

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

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

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

ENDIF()

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

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

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

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

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





ADD_SUBDIRECTORY( Multimaps )

src/UnitTests/Containers/StaticVectorOfStaticVectorsTest.cpp

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#define STATIC_VECTOR

#define VECTOR_OF_STATIC_VECTORS

#include "VectorBinaryOperationsTest.h"

#include "VectorUnaryOperationsTest.h"

#include "VectorVerticalOperationsTest.h"

#include "../main.h"

src/UnitTests/Containers/VectorBinaryOperationsTest.h

+22 −12
Original line number Diff line number Diff line
@@ -179,6 +179,15 @@ protected: 
   #endif

   >;

#elif defined(STATIC_VECTOR)

   #ifdef VECTOR_OF_STATIC_VECTORS

      using VectorPairs = ::testing::Types<

         Pair< StaticVector< 1, StaticVector< 3, double > >,  StaticVector< 1, StaticVector< 3, double > > >,

         Pair< StaticVector< 2, StaticVector< 3, double > >,  StaticVector< 2, StaticVector< 3, double > > >,

         Pair< StaticVector< 3, StaticVector< 3, double > >,  StaticVector< 3, StaticVector< 3, double > > >,

         Pair< StaticVector< 4, StaticVector< 3, double > >,  StaticVector< 4, StaticVector< 3, double > > >,

         Pair< StaticVector< 5, StaticVector< 3, double > >,  StaticVector< 5, StaticVector< 3, double > > >

      >;

   #else

      using VectorPairs = ::testing::Types<

         Pair< StaticVector< 1, int >,     StaticVector< 1, int >    >,

         Pair< StaticVector< 1, double >,  StaticVector< 1, double > >,
@@ -191,6 +200,7 @@ protected: 
         Pair< StaticVector< 5, int >,     StaticVector< 5, int >    >,

         Pair< StaticVector< 5, double >,  StaticVector< 5, double > >

      >;

   #endif

#else

   #ifdef VECTOR_OF_STATIC_VECTORS

      using VectorPairs = ::testing::Types<

src/UnitTests/Containers/VectorOfStaticVectorsTest.cpp

+3 −3
Original line number Diff line number Diff line 
#define VECTOR_OF_STATIC_VECTORS

//#include "VectorBinaryOperationsTest.h"

//#include "VectorUnaryOperationsTest.h"

//#include "VectorVerticalOperationsTest.h"

#include "VectorBinaryOperationsTest.h"

#include "VectorUnaryOperationsTest.h"

#include "VectorVerticalOperationsTest.h"

#include "../main.h"

src/UnitTests/Containers/VectorUnaryOperationsTest.h

+23 −13
Original line number Diff line number Diff line
@@ -84,6 +84,15 @@ protected: 
   #endif

   >;

#elif defined(STATIC_VECTOR)

   #ifdef VECTOR_OF_STATIC_VECTORS

      using VectorTypes = ::testing::Types<

         StaticVector< 1, StaticVector< 3, double > >,

         StaticVector< 2, StaticVector< 3, double > >,

         StaticVector< 3, StaticVector< 3, double > >,

         StaticVector< 4, StaticVector< 3, double > >,

         StaticVector< 5, StaticVector< 3, double > >

      >;

   #else

      using VectorTypes = ::testing::Types<

         StaticVector< 1, int >,

         StaticVector< 1, double >,
@@ -96,6 +105,7 @@ protected: 
         StaticVector< 5, int >,

         StaticVector< 5, double >

      >;

   #endif

#else

   #ifdef VECTOR_OF_STATIC_VECTORS

      using VectorTypes = ::testing::Types<
@@ -312,7 +322,7 @@ TYPED_TEST( VectorUnaryOperationsTest, abs ) 
   EXPECT_EQ( abs(V1), V1 );

   // unary expression

   EXPECT_EQ( abs(-V1), V1 );

   // unary expression

   // binary expression

   EXPECT_EQ( abs(-V1-V1), V2 );

}