Commit 6b2a055b authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Simplified tests for containsValue and containsOnlyValue in ArrayTest

parent 4e217402

src/UnitTests/Containers/ArrayOperationsTest.h

+5 −5
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ TYPED_TEST( ArrayOperationsTest, containsOnlyValue_host ) 
   EXPECT_TRUE( ( ArrayOperations< Devices::Host >::containsOnlyValue( data1, size, 10 ) ) );

   EXPECT_TRUE( ( ArrayOperations< Devices::Host >::containsOnlyValue( data2, size, ( float ) 10 ) ) );



   

   ArrayOperations< Devices::Host >::freeMemory( data1 );

   ArrayOperations< Devices::Host >::freeMemory( data2 );

}
@@ -392,6 +391,7 @@ TYPED_TEST( ArrayOperationsTest, containsValue_cuda ) 
      EXPECT_FALSE( ( ArrayOperations< Devices::Cuda >::containsValue( data1_cuda, size, i ) ) );

      EXPECT_FALSE( ( ArrayOperations< Devices::Cuda >::containsValue( data2_cuda, size, ( float ) i ) ) );

   }



   ArrayOperations< Devices::Host >::freeMemory( data1_host );

   ArrayOperations< Devices::Host >::freeMemory( data2_host );

   ArrayOperations< Devices::Cuda >::freeMemory( data1_cuda );

src/UnitTests/Containers/ArrayTest.h

+9 −9
Original line number Diff line number Diff line
@@ -329,35 +329,35 @@ TYPED_TEST( ArrayTest, elementwiseAccess ) 
TYPED_TEST( ArrayTest, containsValue )

{

   using ArrayType = typename TestFixture::ArrayType;

   using ElementType = typename ArrayType::ElementType;



   ArrayType array;

   array.setSize( 1024 );



   for( int i = 0; i < array.getSize(); i++ )

      array.setElement( i, ( ElementType ) ( i % 10 ) );

      array.setElement( i, i % 10 );



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

      EXPECT_TRUE( ( array.containsValue( ( ElementType ) i ) ) );

      EXPECT_TRUE( array.containsValue( i ) );



   for( int i = 10; i < 20; i++ )

      EXPECT_FALSE( ( array.containsValue( ( ElementType ) i ) ) );

      EXPECT_FALSE( array.containsValue( i ) );

}



TYPED_TEST( ArrayTest, containsOnlyValue )

{

   using ArrayType = typename TestFixture::ArrayType;

   using ElementType = typename ArrayType::ElementType;



   ArrayType array;

   array.setSize( 1024 );



   for( int i = 0; i < array.getSize(); i++ )

      array.setElement( i, ( ElementType ) ( i % 10 ) );

      array.setElement( i, i % 10 );



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

      EXPECT_FALSE( ( array.containsOnlyValue( ( ElementType ) i ) ) );

      EXPECT_FALSE( array.containsOnlyValue( i ) );



   array.setValue( 100 );

   EXPECT_TRUE( ( array.containsOnlyValue( ( ElementType ) 100 ) ) );

   EXPECT_TRUE( array.containsOnlyValue( 100 ) );

}



TYPED_TEST( ArrayTest, comparisonOperator )
@@ -464,7 +464,7 @@ void testArrayAssignmentWithDifferentType() 
   v = u_host;

   EXPECT_EQ( v, u_host );



   // assignment from host to device

   // assignment from device to host

   v_host.setValue( 0 );

   v_host = u;

   EXPECT_EQ( v_host, u );