Commit 982d929a authored by Douglas Serson's avatar Douglas Serson

Merge branch 'fix/unit-tests' into 'master'

fix unit tests with duplicate names See merge request !924
parents 08b211b5 d88af86c
......@@ -47,6 +47,7 @@ v5.0.0
WeightPartitions was used in parallel (!923)
- Removed instance count from beginning of Array storage to improve memory
alignment (!921)
- Fix naming issue of duplicate Unit tests (!924)
**NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731)
......
......@@ -65,7 +65,7 @@ namespace Nektar
}
BOOST_AUTO_TEST_CASE(TestElementAccess)
BOOST_AUTO_TEST_CASE(TestElementAccessBlockMatrix)
{
{
typedef NekMatrix<NekMatrix<NekDouble>, BlockMatrixTag> BlockMatrixType;
......
......@@ -620,7 +620,7 @@ namespace Nektar
BOOST_CHECK_EQUAL(expected_transpose_result, transposed_result);
}
BOOST_AUTO_TEST_CASE(TestMultiplication_1)
BOOST_AUTO_TEST_CASE(TestMultiplicationBlock_1)
{
typedef NekMatrix<double> InnerType;
typedef NekMatrix<InnerType, BlockMatrixTag> BlockType;
......
......@@ -52,7 +52,7 @@ namespace Nektar
typedef DiagonalMatrixFuncs Policy;
BOOST_AUTO_TEST_CASE(TestAdvance)
BOOST_AUTO_TEST_CASE(TestAdvanceDiagonal)
{
UnitTests::RedirectCerrIfNeeded();
typedef DiagonalMatrixFuncs Policy;
......
......@@ -66,7 +66,7 @@ namespace Nektar
BOOST_AUTO_TEST_CASE(TestAdvance)
BOOST_AUTO_TEST_CASE(TestAdvanceFull)
{
UnitTests::RedirectCerrIfNeeded();
typedef FullMatrixFuncs Policy;
......
......@@ -47,7 +47,7 @@ namespace Nektar
{
typedef LowerTriangularMatrixFuncs Policy;
BOOST_AUTO_TEST_CASE(TestMatrixVectorMultiply)
BOOST_AUTO_TEST_CASE(TestMatrixVectorMultiplyLower)
{
{
double matrix_buf[] = {1,
......@@ -66,7 +66,7 @@ namespace Nektar
}
}
BOOST_AUTO_TEST_CASE(Test3x3MatrixVectorMultiply)
BOOST_AUTO_TEST_CASE(Test3x3MatrixVectorMultiplyLower)
{
{
//double matrix_buf[] = {1,
......
......@@ -51,7 +51,7 @@ namespace Nektar
{
typedef LowerTriangularMatrixFuncs Policy;
BOOST_AUTO_TEST_CASE(TestAdvance)
BOOST_AUTO_TEST_CASE(TestAdvanceLowerTriangular)
{
UnitTests::RedirectCerrIfNeeded();
......
......@@ -231,7 +231,7 @@ namespace Nektar
namespace MatrixSubtractionTests
{
BOOST_AUTO_TEST_CASE(TestLhsFullRhsFull)
BOOST_AUTO_TEST_CASE(TestLhsFullRhsFullSubtraction)
{
//double lhs_values[] = {2, 4, 6, 8,
// 10, 12, 14, 16,
......
......@@ -97,7 +97,7 @@ namespace Nektar
BOOST_CHECK_EQUAL(expected_result, result);
}
BOOST_AUTO_TEST_CASE(TestMultiplication_1)
BOOST_AUTO_TEST_CASE(TestMultiplicationScaledBlock_1)
{
typedef NekMatrix<double> InnerType;
typedef NekMatrix<InnerType, BlockMatrixTag> BlockType;
......
......@@ -81,7 +81,7 @@ namespace Nektar
}
BOOST_AUTO_TEST_CASE(TestElementAccess)
BOOST_AUTO_TEST_CASE(TestElementAccessLinearAlgerbra)
{
double buf[] = {1.0, 2.0, 3.0,
4.0, 5.0, 6.0};
......
......@@ -52,7 +52,7 @@ namespace Nektar
typedef SymmetricMatrixFuncs Policy;
BOOST_AUTO_TEST_CASE(TestAdvance)
BOOST_AUTO_TEST_CASE(TestAdvanceSymmetric)
{
UnitTests::RedirectCerrIfNeeded();
{
......
......@@ -48,7 +48,7 @@ namespace Nektar
{
typedef UpperTriangularMatrixFuncs Policy;
BOOST_AUTO_TEST_CASE(TestMatrixVectorMultiply)
BOOST_AUTO_TEST_CASE(TestMatrixVectorMultiplyUpper)
{
{
double matrix_buf[] = {1, 2,
......@@ -67,7 +67,7 @@ namespace Nektar
}
}
BOOST_AUTO_TEST_CASE(Test3x3MatrixVectorMultiply)
BOOST_AUTO_TEST_CASE(Test3x3MatrixVectorMultiplyUpper)
{
{
//double matrix_buf[] = {1, 2, 3,
......
......@@ -52,7 +52,7 @@ namespace Nektar
{
typedef UpperTriangularMatrixFuncs Policy;
BOOST_AUTO_TEST_CASE(TestAdvance)
BOOST_AUTO_TEST_CASE(TestAdvanceUpperTriangular)
{
UnitTests::RedirectCerrIfNeeded();
......
......@@ -66,7 +66,7 @@ namespace Nektar
}
BOOST_AUTO_TEST_CASE(TestElementAccess)
BOOST_AUTO_TEST_CASE(TestElementAccessScaledMatrix)
{
typedef NekMatrix<double> OwnedType;
double d[] = {1.0, 5.0, 9.0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment