Browse Source

Fixing test names

Sam Jaffe 7 years ago
parent
commit
fb348c502c
1 changed files with 25 additions and 25 deletions
  1. 25 25
      matrix_test.cpp

+ 25 - 25
matrix_test.cpp

@@ -13,32 +13,32 @@
 using matr2i = math::matrix::matrix<int, 2, 2>;
 using matr2 = math::matrix::matrix<double, 2, 2>;
 
-TEST(Matrix, _matrix_equals) {
+TEST(Matrix, Equality) {
   using math::matrix::identity;
   EXPECT_THAT((identity<int, 2>()), matr2i({{{1,0},{0,1}}}));
 }
 
-TEST(Matrix, _matrix_sum) {
+TEST(Matrix, AdditionSumsAllElements) {
   auto iden = math::matrix::identity<int, 2>();
   auto result = matr2i({{{2,0},{0,2}}});
   EXPECT_THAT(iden + iden, result);
 }
 
-TEST(Matrix, _matrix_default_zero) {
+TEST(Matrix, DefaultConstructorIsZeros) {
   auto zero = matr2i({{{0,0},{0,0}}});
   EXPECT_THAT(matr2i{}, zero);
 }
 
-TEST(Matrix, _matrix_subtract) {
+TEST(Matrix, SubtractionDiffsAllElements) {
   auto zero = matr2i({{{0,0},{0,0}}});
   auto iden = math::matrix::identity<int, 2>();
   EXPECT_THAT(iden-iden, zero);
 }
 
-//  TEST(Matrix, _matrix_negate) {
-//    auto iden = math::matrix::identity<int, 2>();
-//    EXPECT_THAT(-iden, matr2i({{{-1,0},{0,-1}}}));
-//  }
+TEST(Matrix, NegationAltersAllElements) {
+  auto iden = math::matrix::identity<int, 2>();
+  EXPECT_THAT(-iden, matr2i({{{-1,0},{0,-1}}}));
+}
 
 TEST(Matrix, _matrix_scaling) {
   auto iden = math::matrix::identity<double, 2>();
@@ -47,14 +47,14 @@ TEST(Matrix, _matrix_scaling) {
   EXPECT_THAT(iden/2.0, matr2({{{0.5,0.0},{0.0,0.5}}}));
 }
 
-TEST(Matrix, _matrix_multiplication_same_dim) {
+TEST(Matrix, MultiplyingSameSizeMatricesProducesSameSize) {
   auto A = matr2i({{{1,2},{2,3}}});
   auto B = matr2i({{{1,0},{1,1}}});
   EXPECT_THAT(A*B, matr2i({{{3,2},{5,3}}}));
   EXPECT_THAT(B*A, matr2i({{{1,2},{3,5}}}));
 }
 
-TEST(Matrix, _matrix_multiplication_diff_dim) {
+TEST(Matrix, MultiplyingDifferentSizeMatricesChangesSize) {
   using matr2x2i = math::matrix::matrix<int, 2, 2>;
   using matr2x3i = math::matrix::matrix<int, 2, 3>;
   using matr3x2i = math::matrix::matrix<int, 3, 2>;
@@ -65,27 +65,27 @@ TEST(Matrix, _matrix_multiplication_diff_dim) {
   EXPECT_THAT(B*A, matr2x2i({{{0,1},{2,1}}}));
 }
 
-TEST(Matrix, _matrix_vector_multiplication) {
+TEST(Matrix, VectorMultiplicationProducesVector) {
   using vec2i = math::vector::vector<int, 2>;
   auto A = matr2i({{{1,0},{1,2}}});
   auto x = vec2i({1,2});
   EXPECT_THAT(A*x, vec2i({1,5}));
 }
 
-//  TEST(Matrix, _matrix_composition) {
-//    using namespace math::matrix;
-//    using vec4 = math::vector::vector<double, 4>;
-//    using vec3 = math::vector::vector<double, 3>;
-//    auto rot = rotation<4>(math::degree{90}, rotate::X_AXIS);
-//    auto mov = translation(vec3{2.0, 2.5, 1.5}});
-//    auto scl = scalar(vec3{2.0, math::vector::fill}});
-//    vec4 epsilon{0.00001, math::vector::fill};
-//    TS_ASSERT_DELTA((mov * scl * rot * vec4{1,2,3,1}}),
-//                     (vec4{4.0,-1.5,-4.5,1.0}}),
-//                    epsilon);
-//  }
+//TEST(Matrix, Composition) {
+//  using namespace math::matrix;
+//  using vec4 = math::vector::vector<double, 4>;
+//  using vec3 = math::vector::vector<double, 3>;
+//  auto rot = rotation<4>(math::degree{90}, rotate::X_AXIS);
+//  auto mov = translation(vec3({2.0, 2.5, 1.5}));
+//  auto scl = scalar(vec3(2.0, math::vector::fill));
+//  vec4 epsilon{0.00001, math::vector::fill};
+//  TS_ASSERT_DELTA((mov * scl * rot * vec4({1,2,3,1})),
+//                  (vec4({4.0,-1.5,-4.5,1.0})),
+//                  epsilon);
+//}
 
-TEST(Matrix, _matrix_from_vector) {
+TEST(Matrix, MatrixConstructableFromVector) {
   using vec3 = math::vector::vector<double, 3>;
   vec3 v = vec3({1,2,3});
   math::matrix::matrix<double, 3, 1> m{v};
@@ -94,7 +94,7 @@ TEST(Matrix, _matrix_from_vector) {
   EXPECT_THAT(m(2,0), v[2]);
 }
 
-TEST(Matrix, _assign_row) {
+TEST(Matrix, CanAlterEntireRowInOneExpression) {
   matr2i A = math::matrix::identity<int, 2>();
   matr2i const B = 2 * A;
   A[0] = B[0];