From 05e935f55239e48dcf32b86e5e084093e1a1bd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A8=D0=B8=D1=88=D0=BE=D0=B2=20=D0=9C=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC=20=D0=94=D0=B5=D0=BD=D0=B8=D1=81=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=87?= <shishov@EC.LOCAL>
Date: Thu, 10 Sep 2020 16:56:04 +0300
Subject: [PATCH] overall PIMathMatrix tests correction

---
 tests/math/testpimathmatrix.cpp  | 11 ++++---
 tests/math/testpimathmatrixt.cpp | 50 +++++++++-----------------------
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/tests/math/testpimathmatrix.cpp b/tests/math/testpimathmatrix.cpp
index a5e319f1..4f76af1f 100644
--- a/tests/math/testpimathmatrix.cpp
+++ b/tests/math/testpimathmatrix.cpp
@@ -576,14 +576,14 @@ TEST(PIMathMatrix_Test, hermitian) {
     ASSERT_TRUE(true);
 }
 
-TEST(PIMathMatrixT_Test, matrixMultiplication)
+TEST(PIMathMatrix_Test, matrixMultiplication)
 {
     PIMathMatrix<double> matrix1(2, 2, 1.5);
     PIMathMatrix<double> matrix2(2, 2, 2.5);
     ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 * matrix2, 7.5, 2));
 }
 
-TEST(PIMathMatrixT_Test, matrixAndVectorMultiplication)
+TEST(PIMathMatrix_Test, matrixAndVectorMultiplication)
 {
     PIMathMatrix<double> matrix1(2, 2, 1.5);
     PIMathVector<double> vector;
@@ -596,7 +596,7 @@ TEST(PIMathMatrixT_Test, matrixAndVectorMultiplication)
     ASSERT_TRUE(true);
 }
 
-TEST(PIMathMatrixT_Test, vectorAndMatrixMultiplication)
+TEST(PIMathMatrix_Test, vectorAndMatrixMultiplication)
 {
     PIMathMatrix<double> matrix1(2, 2, 1.5);
     PIMathVector<double> vector;
@@ -609,13 +609,13 @@ TEST(PIMathMatrixT_Test, vectorAndMatrixMultiplication)
     ASSERT_TRUE(true);
 }
 
-TEST(PIMathMatrixT_Test, valAndMatrixMultiplication)
+TEST(PIMathMatrix_Test, valAndMatrixMultiplication)
 {
     PIMathMatrix<double> matrix1(3, 3, 1.5);
     ASSERT_TRUE(cmpSquareMatrixWithValue(25.0*matrix1, 37.5, 3));
 }
 
-TEST(PIMathMatrixT_Test, hermitian)
+TEST(PIMathMatrix_Test, hermitian)
 {
     complex<double> val;
     complex<double> res;
@@ -634,4 +634,3 @@ TEST(PIMathMatrixT_Test, hermitian)
     }
     ASSERT_TRUE(true);
 }
-
diff --git a/tests/math/testpimathmatrixt.cpp b/tests/math/testpimathmatrixt.cpp
index 0017f00f..e6979625 100644
--- a/tests/math/testpimathmatrixt.cpp
+++ b/tests/math/testpimathmatrixt.cpp
@@ -238,8 +238,7 @@ TEST(PIMathMatrixT_Test, operator_Assignment) {
     PIMathMatrixT<rows, cols, double> matrix1;
     auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(6.72);
     matrix1 = matrix2;
-    b = cmpSquareMatrixWithValue(matrix1, 6.72, rows);
-    ASSERT_TRUE(b);
+    ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 6.72, rows));
 }
 
 TEST(PIMathMatrixT_Test, operator_EqualTrue) {
@@ -310,65 +309,44 @@ TEST(PIMathMatrixT_Test, operator_Subtraction_Assignment) {
     auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(1.0);
     auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(6.72);
     matrix1 -= matrix2;
-    b = cmpSquareMatrixWithValue(matrix1, -5.72, rows);
-    ASSERT_TRUE(b);
+    ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, -5.72, rows));
 }
 
 TEST(PIMathMatrixT_Test, operator_Multiplication_Assignment) {
     auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72);
     matrix1 *= 2.0;
-    b = cmpSquareMatrixWithValue(matrix1, 13.44, rows);
-    ASSERT_TRUE(b);
+    ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 13.44, rows));
 }
 
 TEST(PIMathMatrixT_Test, operator_Division_Assignment) {
     auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72);
     matrix1 /= 2.0;
-    b = cmpSquareMatrixWithValue(matrix1, 3.36, rows);
-    ASSERT_TRUE(b);
+    ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 3.36, rows));
 }
 
 TEST(PIMathMatrixT_Test, operator_Addition)
 {
-    PIMathMatrixT<rows, cols, double> matrix1;
-    PIMathMatrixT<rows, cols, double> matrix2;
-    bool b;
-    matrix1.fill(6.72);
-    matrix2.fill(8.28);
-    b = cmpSquareMatrixWithValue(matrix1 + matrix2, 15.0, rows);
-    ASSERT_TRUE(b);
+    auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72);
+    auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(8.28);
+    ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 + matrix2, 15.0, rows));
 }
 
 TEST(PIMathMatrixT_Test, operator_Subtraction)
 {
-    PIMathMatrixT<rows, cols, double> matrix1;
-    PIMathMatrixT<rows, cols, double> matrix2;
-    bool b;
-    matrix1.fill(6.0);
-    matrix2.fill(5.0);
-    b = cmpSquareMatrixWithValue(matrix1 - matrix2, 1.0, rows);
-    ASSERT_TRUE(b);
+    auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.0);
+    auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(5.0);
+    ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 - matrix2, 1.0, rows));
 }
 
 TEST(PIMathMatrixT_Test, operator_Multiplication)
 {
-    PIMathMatrixT<rows, cols, double> matrix1;
-    PIMathMatrixT<rows, cols, double> matrix2;
-    bool b;
-    matrix1.fill(6.72);
-    matrix2 = matrix1*4.0;
-    b = cmpSquareMatrixWithValue(matrix2, 26.88, rows);
-    ASSERT_TRUE(b);
+    auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72);
+    ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 * 4.0, 26.88, rows));
 }
 TEST(PIMathMatrixT_Test, operator_Division)
 {
-    PIMathMatrixT<rows, cols, double> matrix1;
-    PIMathMatrixT<rows, cols, double> matrix2;
-    bool b;
-    matrix1.fill(6.72);
-    matrix2 = matrix1/4.0;
-    b = cmpSquareMatrixWithValue(matrix2, 1.68, rows);
-    ASSERT_TRUE(b);
+    auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72);
+    ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 / 4.0, 1.68, rows));
 }
 
 TEST(PIMathMatrixT_Test, determinantIfSquare) {