Commit a3ba2469 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Tests: forced using a unique file name in each test 

This is necessary to be able to run tests in parallel.
parent 307b6650

src/UnitTests/Containers/ArrayTest.h

+13 −7
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ 
using namespace TNL;

using namespace TNL::Containers;



#ifdef HAVE_CUDA

static const char* TEST_FILE_NAME = "test_ArrayTestCuda.tnl";

#else

static const char* TEST_FILE_NAME = "test_ArrayTest.tnl";

#endif



// minimal custom data structure usable as ValueType in Array

struct MyData

{
@@ -529,11 +535,11 @@ TYPED_TEST( ArrayTest, SaveAndLoad ) 
   v.setSize( 100 );

   for( int i = 0; i < 100; i ++ )

      v.setElement( i, 42 );

   ASSERT_NO_THROW( File( "test-file.tnl", std::ios_base::out ) << v );

   ASSERT_NO_THROW( File( "test-file.tnl", std::ios_base::in ) >> u );

   ASSERT_NO_THROW( File( TEST_FILE_NAME, std::ios_base::out ) << v );

   ASSERT_NO_THROW( File( TEST_FILE_NAME, std::ios_base::in ) >> u );

   EXPECT_EQ( u, v );



   EXPECT_EQ( std::remove( "test-file.tnl" ), 0 );

   EXPECT_EQ( std::remove( TEST_FILE_NAME ), 0 );

}



TYPED_TEST( ArrayTest, LoadViaView )
@@ -544,20 +550,20 @@ TYPED_TEST( ArrayTest, LoadViaView ) 
   v.setSize( 100 );

   for( int i = 0; i < 100; i ++ )

      v.setElement( i, 42 );

   ASSERT_NO_THROW( File( "test-file.tnl", std::ios_base::out ) << v );

   ASSERT_NO_THROW( File( TEST_FILE_NAME, std::ios_base::out ) << v );



   w.setSize( 100 );

   auto u = w.getView();

   ASSERT_NO_THROW( File( "test-file.tnl", std::ios_base::in ) >> u );

   ASSERT_NO_THROW( File( TEST_FILE_NAME, std::ios_base::in ) >> u );

   EXPECT_EQ( u, v );

   EXPECT_EQ( u.getData(), w.getData() );



   ArrayType z( 50 );

   File file;

   ASSERT_NO_THROW( file.open( "test-file.tnl", std::ios_base::in ) );

   ASSERT_NO_THROW( file.open( TEST_FILE_NAME, std::ios_base::in ) );

   EXPECT_THROW( file >> z.getView(), Exceptions::FileDeserializationError );



   EXPECT_EQ( std::remove( "test-file.tnl" ), 0 );

   EXPECT_EQ( std::remove( TEST_FILE_NAME ), 0 );

}



// TODO: test all __cuda_callable__ methods from a CUDA kernel

src/UnitTests/Containers/Multimaps/MultimapTest.cpp

+5 −3
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ using IndexType = int; 
using Device = Devices::Host;

using LocalIndexType = short;



static const char* TEST_FILE_NAME = "test_MultimapTest.tnl";



#ifdef HAVE_GTEST

#include <gtest/gtest.h>
@@ -129,8 +131,8 @@ TEST( MultimapTest, TestSaveAndLoad ) 
         values.setValue( o, i + o );

   }



   map.save( "multimap-test.tnl" );

   map2.load( "multimap-test.tnl" );

   map.save( TEST_FILE_NAME );

   map2.load( TEST_FILE_NAME );



   EXPECT_EQ( map, map2 );

   EXPECT_EQ( map.getKeysRange(), map2.getKeysRange() );
@@ -145,7 +147,7 @@ TEST( MultimapTest, TestSaveAndLoad ) 
      }

   }



   EXPECT_EQ( std::remove( "multimap-test.tnl" ), 0 );

   EXPECT_EQ( std::remove( TEST_FILE_NAME ), 0 );

}

#endif

src/UnitTests/Containers/Multimaps/StaticMultimapTest.cpp

+5 −3
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ using IndexType = int; 
using Device = Devices::Host;

using LocalIndexType = short;



static const char* TEST_FILE_NAME = "test_StaticMultimapTest.tnl";



#ifdef HAVE_GTEST

#include <gtest/gtest.h>
@@ -77,8 +79,8 @@ TEST( MultimapTest, TestSaveAndLoad ) 
         values.setValue( o, i + o );

   }



   map.save( "multimap-test.tnl" );

   map2.load( "multimap-test.tnl" );

   map.save( TEST_FILE_NAME );

   map2.load( TEST_FILE_NAME );



   EXPECT_EQ( map, map2 );

   EXPECT_EQ( map.getKeysRange(), map2.getKeysRange() );
@@ -93,7 +95,7 @@ TEST( MultimapTest, TestSaveAndLoad ) 
      }

   }



   EXPECT_EQ( std::remove( "multimap-test.tnl" ), 0 );

   EXPECT_EQ( std::remove( TEST_FILE_NAME ), 0 );

}

#endif

src/UnitTests/Containers/StaticArrayTest.cpp

+4 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
using namespace TNL;

using namespace TNL::Containers;



static const char* TEST_FILE_NAME = "test_StaticArrayTest.tnl";



// test fixture for typed tests

template< typename Array >
@@ -246,16 +247,16 @@ TYPED_TEST( StaticArrayTest, SaveAndLoad ) 


   ArrayType u1( 7 ), u2;

   File file;

   ASSERT_NO_THROW( file.open( "tnl-static-array-test.tnl", std::ios_base::out ) );

   ASSERT_NO_THROW( file.open( TEST_FILE_NAME, std::ios_base::out ) );

   ASSERT_NO_THROW( u1.save( file ) );

   ASSERT_NO_THROW( file.close() );

   ASSERT_NO_THROW( file.open( "tnl-static-array-test.tnl", std::ios_base::in ) );

   ASSERT_NO_THROW( file.open( TEST_FILE_NAME, std::ios_base::in ) );

   ASSERT_NO_THROW( u2.load( file ) );

   ASSERT_NO_THROW( file.close() );



   EXPECT_EQ( u1, u2 );



   EXPECT_EQ( std::remove( "tnl-static-array-test.tnl" ), 0 );

   EXPECT_EQ( std::remove( TEST_FILE_NAME ), 0 );

}



TYPED_TEST( StaticArrayTest, sort )

src/UnitTests/FileNameTest.cpp

+1 −3
Original line number Diff line number Diff line
@@ -12,14 +12,12 @@ 


#ifdef HAVE_GTEST

#include <gtest/gtest.h>

#endif



#include <TNL/FileName.h>

// #include <TNL/String.h>



using namespace TNL;



#ifdef HAVE_GTEST 

TEST( FileNameTest, Constructor )

{

    FileName fname;