diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /tests/gtests/testing/testing.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'tests/gtests/testing/testing.h')
-rw-r--r-- | tests/gtests/testing/testing.h | 145 |
1 files changed, 73 insertions, 72 deletions
diff --git a/tests/gtests/testing/testing.h b/tests/gtests/testing/testing.h index 9efdbe22557..67138e4f874 100644 --- a/tests/gtests/testing/testing.h +++ b/tests/gtests/testing/testing.h @@ -12,115 +12,116 @@ EXPECT_NEAR(a[0], b[0], eps); \ EXPECT_NEAR(a[1], b[1], eps); \ EXPECT_NEAR(a[2], b[2], eps); \ - } (void) 0 + } \ + (void)0 #define EXPECT_V4_NEAR(a, b, eps) \ -{ \ - EXPECT_NEAR(a[0], b[0], eps); \ - EXPECT_NEAR(a[1], b[1], eps); \ - EXPECT_NEAR(a[2], b[2], eps); \ - EXPECT_NEAR(a[3], b[3], eps); \ - } (void) 0 + { \ + EXPECT_NEAR(a[0], b[0], eps); \ + EXPECT_NEAR(a[1], b[1], eps); \ + EXPECT_NEAR(a[2], b[2], eps); \ + EXPECT_NEAR(a[3], b[3], eps); \ + } \ + (void)0 #define EXPECT_M3_NEAR(a, b, eps) \ -do { \ - EXPECT_V3_NEAR(a[0], b[0], eps); \ - EXPECT_V3_NEAR(a[1], b[1], eps); \ - EXPECT_V3_NEAR(a[2], b[2], eps); \ -} while(false); + do { \ + EXPECT_V3_NEAR(a[0], b[0], eps); \ + EXPECT_V3_NEAR(a[1], b[1], eps); \ + EXPECT_V3_NEAR(a[2], b[2], eps); \ + } while (false); #define EXPECT_M4_NEAR(a, b, eps) \ -do { \ - EXPECT_V3_NEAR(a[0], b[0], eps); \ - EXPECT_V3_NEAR(a[1], b[1], eps); \ - EXPECT_V3_NEAR(a[2], b[2], eps); \ - EXPECT_V4_NEAR(a[3], b[3], eps); \ -} while(false); + do { \ + EXPECT_V3_NEAR(a[0], b[0], eps); \ + EXPECT_V3_NEAR(a[1], b[1], eps); \ + EXPECT_V3_NEAR(a[2], b[2], eps); \ + EXPECT_V4_NEAR(a[3], b[3], eps); \ + } while (false); #define EXPECT_MATRIX_NEAR(a, b, tolerance) \ -do { \ - bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \ - EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \ - EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \ - if (dims_match) { \ - for (int r = 0; r < a.rows(); ++r) { \ - for (int c = 0; c < a.cols(); ++c) { \ - EXPECT_NEAR(a(r, c), b(r, c), tolerance) \ - << "r=" << r << ", c=" << c << "."; \ + do { \ + bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \ + EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \ + EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \ + if (dims_match) { \ + for (int r = 0; r < a.rows(); ++r) { \ + for (int c = 0; c < a.cols(); ++c) { \ + EXPECT_NEAR(a(r, c), b(r, c), tolerance) << "r=" << r << ", c=" << c << "."; \ + } \ } \ } \ - } \ -} while(false); + } while (false); #define EXPECT_MATRIX_NEAR_ZERO(a, tolerance) \ -do { \ - for (int r = 0; r < a.rows(); ++r) { \ - for (int c = 0; c < a.cols(); ++c) { \ - EXPECT_NEAR(0.0, a(r, c), tolerance) \ - << "r=" << r << ", c=" << c << "."; \ + do { \ + for (int r = 0; r < a.rows(); ++r) { \ + for (int c = 0; c < a.cols(); ++c) { \ + EXPECT_NEAR(0.0, a(r, c), tolerance) << "r=" << r << ", c=" << c << "."; \ + } \ } \ - } \ -} while(false); + } while (false); #define EXPECT_MATRIX_EQ(a, b) \ -do { \ - bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \ - EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \ - EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \ - if (dims_match) { \ - for (int r = 0; r < a.rows(); ++r) { \ - for (int c = 0; c < a.cols(); ++c) { \ - EXPECT_EQ(a(r, c), b(r, c)) \ - << "r=" << r << ", c=" << c << "."; \ + do { \ + bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \ + EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \ + EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \ + if (dims_match) { \ + for (int r = 0; r < a.rows(); ++r) { \ + for (int c = 0; c < a.cols(); ++c) { \ + EXPECT_EQ(a(r, c), b(r, c)) << "r=" << r << ", c=" << c << "."; \ + } \ } \ } \ - } \ -} while(false); + } while (false); // Check that sin(angle(a, b)) < tolerance. #define EXPECT_MATRIX_PROP(a, b, tolerance) \ -do { \ - bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \ - EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \ - EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \ - if (dims_match) { \ - double c = CosinusBetweenMatrices(a, b); \ - if (c * c < 1) { \ - double s = sqrt(1 - c * c); \ - EXPECT_NEAR(0, s, tolerance); \ + do { \ + bool dims_match = (a.rows() == b.rows()) && (a.cols() == b.cols()); \ + EXPECT_EQ(a.rows(), b.rows()) << "Matrix rows don't match."; \ + EXPECT_EQ(a.cols(), b.cols()) << "Matrix cols don't match."; \ + if (dims_match) { \ + double c = CosinusBetweenMatrices(a, b); \ + if (c * c < 1) { \ + double s = sqrt(1 - c * c); \ + EXPECT_NEAR(0, s, tolerance); \ + } \ } \ - } \ -} while(false); + } while (false); #ifdef LIBMV_NUMERIC_NUMERIC_H -template<class TMat> -double CosinusBetweenMatrices(const TMat &a, const TMat &b) { - return (a.array() * b.array()).sum() / - libmv::FrobeniusNorm(a) / libmv::FrobeniusNorm(b); +template<class TMat> double CosinusBetweenMatrices(const TMat &a, const TMat &b) +{ + return (a.array() * b.array()).sum() / libmv::FrobeniusNorm(a) / libmv::FrobeniusNorm(b); } #endif -template <typename T> -inline void EXPECT_EQ_VECTOR(const std::vector<T>& expected, const std::vector<T>& actual) { +template<typename T> +inline void EXPECT_EQ_VECTOR(const std::vector<T> &expected, const std::vector<T> &actual) +{ EXPECT_EQ(expected.size(), actual.size()); if (expected.size() == actual.size()) { - for(size_t i = 0; i < expected.size(); ++i) { + for (size_t i = 0; i < expected.size(); ++i) { EXPECT_EQ(expected[i], actual[i]) << "Element mismatch at index " << i; } } } -template <typename T> -inline void EXPECT_EQ_ARRAY(const T *expected, const T *actual, const size_t N) { - for(size_t i = 0; i < N; ++i) { +template<typename T> +inline void EXPECT_EQ_ARRAY(const T *expected, const T *actual, const size_t N) +{ + for (size_t i = 0; i < N; ++i) { EXPECT_EQ(expected[i], actual[i]) << "Element mismatch at index " << i; } } -template <typename T> -inline void EXPECT_EQ_ARRAY_ND(const T *expected, const T *actual, const size_t N, const size_t D) { - for(size_t i = 0; i < N; ++i) { - for(size_t j = 0; j < D; ++j) { +template<typename T> +inline void EXPECT_EQ_ARRAY_ND(const T *expected, const T *actual, const size_t N, const size_t D) +{ + for (size_t i = 0; i < N; ++i) { + for (size_t j = 0; j < D; ++j) { EXPECT_EQ(expected[i][j], actual[i][j]) << "Element mismatch at index " << i << ", component index " << j; } |