From d25522482225397a3bd28819616e2680fd918e16 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?= Date: Thu, 10 Sep 2020 10:52:09 +0300 Subject: [PATCH] tests correction --- tests/math/testpimathmatrix.cpp | 82 +++++++++------------------------ 1 file changed, 21 insertions(+), 61 deletions(-) diff --git a/tests/math/testpimathmatrix.cpp b/tests/math/testpimathmatrix.cpp index 09992b89..d2751587 100644 --- a/tests/math/testpimathmatrix.cpp +++ b/tests/math/testpimathmatrix.cpp @@ -54,106 +54,66 @@ TEST(PIMathMatrix_Test, identity) TEST(PIMathMatrix_Test, matrixRow) { - PIMathMatrix origMatr; - PIMathMatrix matrix; PIMathVector vector; - uint i; - bool b; vector.resize(3, 3.0); - vector.fill(5.0); - matrix = origMatr.matrixRow(vector); - for(i = 0; i < vector.size(); i++) + auto matrix = PIMathMatrix::matrixRow(vector); + for(uint i = 0; i < vector.size(); i++) { - if(matrix[0][i] == 5.0) + if(matrix[0][i] != 3.0) { - b = true; - } - else - { - b = false; - break; + ASSERT_TRUE(false); } } - ASSERT_TRUE(b); + ASSERT_TRUE(true); } TEST(PIMathMatrix_Test, matrixCol) { - PIMathMatrix origMatr; - PIMathMatrix matrix; PIMathVector vector; - uint i; - bool b; vector.resize(3, 3.0); - vector.fill(5.0); - matrix = origMatr.matrixCol(vector); - for(i = 0; i < vector.size(); i++) + auto matrix = PIMathMatrix::matrixCol(vector); + for(uint i = 0; i < vector.size(); i++) { - if(matrix[i][0] == 5.0) + if(matrix[i][0] != 3.0) { - b = true; - } - else - { - b = false; - break; + ASSERT_TRUE(false); } } - ASSERT_TRUE(b); + ASSERT_TRUE(true); } TEST(PIMathMatrix_Test, setCol) { - PIMathMatrix origMatr; - PIMathMatrix matrix; PIMathVector vector; - uint i; - bool b; vector.resize(3, 3.0); - vector.fill(5.0); - matrix = origMatr.matrixCol(vector); + auto matrix = PIMathMatrix::matrixCol(vector); vector.fill(10.0); matrix.setCol(0, vector); - for(i = 0; i < vector.size(); i++) + for(uint i = 0; i < vector.size(); i++) { - if(matrix[i][0] == 10.0) + if(matrix[i][0] != 10.0) { - b = true; - } - else - { - b = false; - break; + ASSERT_TRUE(false); } } - ASSERT_TRUE(b); + ASSERT_TRUE(true); } TEST(PIMathMatrix_Test, setRow) { - PIMathMatrix origMatr; - PIMathMatrix matrix; PIMathVector vector; - uint i; - bool b; vector.resize(3, 3.0); - vector.fill(5.0); - matrix = origMatr.matrixRow(vector); + auto matrix = PIMathMatrix::matrixRow(vector); vector.fill(10.0); matrix.setRow(0, vector); - for(i = 0; i < vector.size(); i++) + for(uint i = 0; i < vector.size(); i++) { - if(matrix[0][i] == 10.0) + if(matrix[0][i] != 10.0) { - b = true; - } - else - { - b = false; - break; + ASSERT_TRUE(false); } } - ASSERT_TRUE(b); + ASSERT_TRUE(true); } TEST(PIMathMatrix_Test, swapCols) @@ -758,4 +718,4 @@ TEST(PIMathMatrix_Test, transposed) b = false; } ASSERT_TRUE(b); -} +} \ No newline at end of file