From e4e5b2e506f1eb42987d3dac9835391d6a207857 Mon Sep 17 00:00:00 2001
From: Lukas Cejka <lukas.ostatek@gmail.com>
Date: Sat, 3 Nov 2018 23:54:20 +0100
Subject: [PATCH] Fixed SparseMatrixTest.h: Was using EXPECT_STREQ,
instead of EXPECT_EQ.
---
src/UnitTests/Matrices/SparseMatrixTest.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/UnitTests/Matrices/SparseMatrixTest.h b/src/UnitTests/Matrices/SparseMatrixTest.h
index 9865fb8698..bcb24a25af 100644
--- a/src/UnitTests/Matrices/SparseMatrixTest.h
+++ b/src/UnitTests/Matrices/SparseMatrixTest.h
@@ -12,6 +12,9 @@
#include <TNL/Matrices/Ellpack.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_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 >;
#ifdef HAVE_GTEST
#include <gtest/gtest.h>
-/*
+
template< typename MatrixHostFloat, typename MatrixHostInt, typename MatrixCudaFloat, typename MatrixCudaInt >
void testGetType()
@@ -30,13 +33,10 @@ void testGetType()
MatrixCudaFloat mtrxCudaFloat;
MatrixCudaInt mtrxCudaInt;
- //string str = "Matrices::CSR< float, Devices::Host >";
-
- EXPECT_STREQ( mtrxHostFloat.getType(), String("Matrices::CSR< float, Devices::Host >") );
- EXPECT_STREQ( mtrxHostInt.getType(), String("Matrices::CSR< int, Devices::Host >") );
- EXPECT_STREQ( mtrxCudaFloat.getType(), "Matrices::CSR< float, Cuda >" );
- EXPECT_STREQ( mtrxCudaInt.getType(), "Matrices::CSR< int, Cuda >" );
-
+ EXPECT_EQ( mtrxHostFloat.getType(), TNL::String( "Matrices::CSR< float, Devices::Host >" ) );
+ EXPECT_EQ( mtrxHostInt.getType(), TNL::String( "Matrices::CSR< int, Devices::Host >" ) );
+ EXPECT_EQ( mtrxCudaFloat.getType(), TNL::String( "Matrices::CSR< float, Cuda >" ) );
+ EXPECT_EQ( mtrxCudaInt.getType(), TNL::String( "Matrices::CSR< int, Cuda >" ) );
}
TEST( SparseMatrixTest, CSR_GetTypeTest )
@@ -50,7 +50,7 @@ TEST( SparseMatrixTest, GetTypeTestCuda )
testGetType< CSR_host_float, CSR_host_int, CSR_cuda_float, CSR_cuda_int >();
}
#endif
-*/
+
#endif
#include "../GtestMissingError.h"
--
GitLab