Skip to content
Snippets Groups Projects
Commit c49cbc2a authored by Lukas Cejka's avatar Lukas Cejka Committed by Tomáš Oberhuber
Browse files

Fixed SparseMatrixTest.h:

	Was using EXPECT_STREQ, instead of EXPECT_EQ.
parent aa4daa44
No related branches found
No related tags found
1 merge request!16Matrices
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#include <TNL/Matrices/Ellpack.h> #include <TNL/Matrices/Ellpack.h>
#include <TNL/Matrices/SlicedEllpack.h> #include <TNL/Matrices/SlicedEllpack.h>
#include <TNL/Containers/VectorView.h>
#include <TNL/Math.h>
using CSR_host_float = TNL::Matrices::CSR< float, TNL::Devices::Host, int >; using CSR_host_float = TNL::Matrices::CSR< float, TNL::Devices::Host, int >;
using CSR_host_int = TNL::Matrices::CSR< int, TNL::Devices::Host, int >; using CSR_host_int = TNL::Matrices::CSR< int, TNL::Devices::Host, int >;
...@@ -20,7 +23,7 @@ using CSR_cuda_int = TNL::Matrices::CSR< int, TNL::Devices::Cuda, int >; ...@@ -20,7 +23,7 @@ using CSR_cuda_int = TNL::Matrices::CSR< int, TNL::Devices::Cuda, int >;
#ifdef HAVE_GTEST #ifdef HAVE_GTEST
#include <gtest/gtest.h> #include <gtest/gtest.h>
/*
template< typename MatrixHostFloat, typename MatrixHostInt, typename MatrixCudaFloat, typename MatrixCudaInt > template< typename MatrixHostFloat, typename MatrixHostInt, typename MatrixCudaFloat, typename MatrixCudaInt >
void testGetType() void testGetType()
...@@ -30,13 +33,10 @@ void testGetType() ...@@ -30,13 +33,10 @@ void testGetType()
MatrixCudaFloat mtrxCudaFloat; MatrixCudaFloat mtrxCudaFloat;
MatrixCudaInt mtrxCudaInt; MatrixCudaInt mtrxCudaInt;
//string str = "Matrices::CSR< float, Devices::Host >"; EXPECT_EQ( mtrxHostFloat.getType(), TNL::String( "Matrices::CSR< float, Devices::Host >" ) );
EXPECT_EQ( mtrxHostInt.getType(), TNL::String( "Matrices::CSR< int, Devices::Host >" ) );
EXPECT_STREQ( mtrxHostFloat.getType(), String("Matrices::CSR< float, Devices::Host >") ); EXPECT_EQ( mtrxCudaFloat.getType(), TNL::String( "Matrices::CSR< float, Cuda >" ) );
EXPECT_STREQ( mtrxHostInt.getType(), String("Matrices::CSR< int, Devices::Host >") ); EXPECT_EQ( mtrxCudaInt.getType(), TNL::String( "Matrices::CSR< int, Cuda >" ) );
EXPECT_STREQ( mtrxCudaFloat.getType(), "Matrices::CSR< float, Cuda >" );
EXPECT_STREQ( mtrxCudaInt.getType(), "Matrices::CSR< int, Cuda >" );
} }
TEST( SparseMatrixTest, CSR_GetTypeTest ) TEST( SparseMatrixTest, CSR_GetTypeTest )
...@@ -50,7 +50,7 @@ TEST( SparseMatrixTest, GetTypeTestCuda ) ...@@ -50,7 +50,7 @@ TEST( SparseMatrixTest, GetTypeTestCuda )
testGetType< CSR_host_float, CSR_host_int, CSR_cuda_float, CSR_cuda_int >(); testGetType< CSR_host_float, CSR_host_int, CSR_cuda_float, CSR_cuda_int >();
} }
#endif #endif
*/
#endif #endif
#include "../GtestMissingError.h" #include "../GtestMissingError.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment