Naming consistency

This commit is contained in:
Godzil
2020-02-17 17:57:55 +00:00
parent aeb4669162
commit 4a9379c0b2

View File

@@ -10,7 +10,7 @@
#include <math.h> #include <math.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
TEST(TuplesTests, Tuple_With_w_equal_1_and_is_point) TEST(TupleTest, Tuple_With_w_equal_1_and_is_point)
{ {
Tuple a = Tuple(4.3, -4.2, 3.1, 1.0); Tuple a = Tuple(4.3, -4.2, 3.1, 1.0);
@@ -22,7 +22,7 @@ TEST(TuplesTests, Tuple_With_w_equal_1_and_is_point)
ASSERT_FALSE(a.isVector()); ASSERT_FALSE(a.isVector());
} }
TEST(TuplesTests, Tuple_With_w_equal_0_and_is_vector) TEST(TupleTest, Tuple_With_w_equal_0_and_is_vector)
{ {
Tuple a = Tuple(4.3, -4.2, 3.1, 0.0); Tuple a = Tuple(4.3, -4.2, 3.1, 0.0);
@@ -34,21 +34,21 @@ TEST(TuplesTests, Tuple_With_w_equal_0_and_is_vector)
ASSERT_TRUE(a.isVector()); ASSERT_TRUE(a.isVector());
} }
TEST(TuplesTests, Point_create_tuples_with_w_equal_1) TEST(TupleTest, Point_create_tuples_with_w_equal_1)
{ {
Tuple a = Point(4, -4, 3); Tuple a = Point(4, -4, 3);
ASSERT_EQ(a, Tuple(4, -4, 3, 1)); ASSERT_EQ(a, Tuple(4, -4, 3, 1));
} }
TEST(TuplesTests, Vector_create_tuples_with_w_equal_0) TEST(TupleTest, Vector_create_tuples_with_w_equal_0)
{ {
Tuple a = Vector(4, -4, 3); Tuple a = Vector(4, -4, 3);
ASSERT_EQ(a, Tuple(4, -4, 3, 0)); ASSERT_EQ(a, Tuple(4, -4, 3, 0));
} }
TEST(TuplesTests, Adding_two_tuples) TEST(TupleTest, Adding_two_tuples)
{ {
Tuple a1 = Tuple(3, -2, 5, 1); Tuple a1 = Tuple(3, -2, 5, 1);
Tuple a2 = Tuple(-2, 3, 1, 0); Tuple a2 = Tuple(-2, 3, 1, 0);
@@ -56,7 +56,7 @@ TEST(TuplesTests, Adding_two_tuples)
ASSERT_EQ(a1 + a2, Tuple(1, 1, 6, 1)); ASSERT_EQ(a1 + a2, Tuple(1, 1, 6, 1));
} }
TEST(TuplesTests, Substracting_two_points) TEST(TupleTest, Substracting_two_points)
{ {
Point p1 = Point(3, 2, 1); Point p1 = Point(3, 2, 1);
Point p2 = Point(5, 6, 7); Point p2 = Point(5, 6, 7);
@@ -64,7 +64,7 @@ TEST(TuplesTests, Substracting_two_points)
ASSERT_EQ(p1 - p2, Vector(-2, -4, -6)); ASSERT_EQ(p1 - p2, Vector(-2, -4, -6));
} }
TEST(TuplesTests, Substracting_a_vector_from_a_point) TEST(TupleTest, Substracting_a_vector_from_a_point)
{ {
Point p = Point(3, 2, 1); Point p = Point(3, 2, 1);
Vector v = Vector(5, 6, 7); Vector v = Vector(5, 6, 7);
@@ -72,7 +72,7 @@ TEST(TuplesTests, Substracting_a_vector_from_a_point)
ASSERT_EQ(p - v, Point(-2, -4, -6)); ASSERT_EQ(p - v, Point(-2, -4, -6));
} }
TEST(TuplesTests, Substracting_two_vectors) TEST(TupleTest, Substracting_two_vectors)
{ {
Vector v1 = Vector(3, 2, 1); Vector v1 = Vector(3, 2, 1);
Vector v2 = Vector(5, 6, 7); Vector v2 = Vector(5, 6, 7);
@@ -80,7 +80,7 @@ TEST(TuplesTests, Substracting_two_vectors)
ASSERT_EQ(v1 - v2, Vector(-2, -4, -6)); ASSERT_EQ(v1 - v2, Vector(-2, -4, -6));
} }
TEST(TuplesTests, Substracting_a_vector_from_zero_vector) TEST(TupleTest, Substracting_a_vector_from_zero_vector)
{ {
Vector zero = Vector(0, 0, 0); Vector zero = Vector(0, 0, 0);
Vector v = Vector(1, -2, 3); Vector v = Vector(1, -2, 3);
@@ -88,84 +88,84 @@ TEST(TuplesTests, Substracting_a_vector_from_zero_vector)
ASSERT_EQ(zero - v, Vector(-1, 2, -3)); ASSERT_EQ(zero - v, Vector(-1, 2, -3));
} }
TEST(TuplesTests, Negating_a_tuple) TEST(TupleTest, Negating_a_tuple)
{ {
Tuple a = Tuple(1, -2, 3, -4); Tuple a = Tuple(1, -2, 3, -4);
ASSERT_EQ(-a, Tuple(-1, 2, -3, 4)); ASSERT_EQ(-a, Tuple(-1, 2, -3, 4));
} }
TEST(TuplesTests, Multiplying_a_tuple_by_a_scalar) TEST(TupleTest, Multiplying_a_tuple_by_a_scalar)
{ {
Tuple a = Tuple(1, -2, 3, -4); Tuple a = Tuple(1, -2, 3, -4);
ASSERT_EQ(a * 3.5, Tuple(3.5, -7, 10.5, -14)); ASSERT_EQ(a * 3.5, Tuple(3.5, -7, 10.5, -14));
} }
TEST(TuplesTests, Multiplying_a_tuple_by_a_fraction) TEST(TupleTest, Multiplying_a_tuple_by_a_fraction)
{ {
Tuple a = Tuple(1, -2, 3, -4); Tuple a = Tuple(1, -2, 3, -4);
ASSERT_EQ(a * 0.5, Tuple(0.5, -1, 1.5, -2)); ASSERT_EQ(a * 0.5, Tuple(0.5, -1, 1.5, -2));
} }
TEST(TuplesTests, Dividing_a_tuple_by_a_scalar) TEST(TupleTest, Dividing_a_tuple_by_a_scalar)
{ {
Tuple a = Tuple(1, -2, 3, -4); Tuple a = Tuple(1, -2, 3, -4);
ASSERT_EQ(a / 2, Tuple(0.5, -1, 1.5, -2)); ASSERT_EQ(a / 2, Tuple(0.5, -1, 1.5, -2));
} }
TEST(TuplesTests, Computing_the_magnitude_of_vector_1_0_0) TEST(TupleTest, Computing_the_magnitude_of_vector_1_0_0)
{ {
Vector v = Vector(1, 0, 0); Vector v = Vector(1, 0, 0);
ASSERT_EQ(v.magnitude(), 1); ASSERT_EQ(v.magnitude(), 1);
} }
TEST(TuplesTests, Computing_the_magnitude_of_vector_0_1_0) TEST(TupleTest, Computing_the_magnitude_of_vector_0_1_0)
{ {
Vector v = Vector(0, 1, 0); Vector v = Vector(0, 1, 0);
ASSERT_EQ(v.magnitude(), 1); ASSERT_EQ(v.magnitude(), 1);
} }
TEST(TuplesTests, Computing_the_magnitude_of_vector_0_0_1) TEST(TupleTest, Computing_the_magnitude_of_vector_0_0_1)
{ {
Vector v = Vector(0, 0, 1); Vector v = Vector(0, 0, 1);
ASSERT_EQ(v.magnitude(), 1); ASSERT_EQ(v.magnitude(), 1);
} }
TEST(TuplesTests, Computing_the_magnitude_of_vector_1_2_3) TEST(TupleTest, Computing_the_magnitude_of_vector_1_2_3)
{ {
Vector v = Vector(1, 2, 3); Vector v = Vector(1, 2, 3);
ASSERT_EQ(v.magnitude(), sqrt(14)); ASSERT_EQ(v.magnitude(), sqrt(14));
} }
TEST(TuplesTests, Computing_the_magnitude_of_vector_n1_n2_n3) TEST(TupleTest, Computing_the_magnitude_of_vector_n1_n2_n3)
{ {
Vector v = Vector(-1, -2, -3); Vector v = Vector(-1, -2, -3);
ASSERT_EQ(v.magnitude(), sqrt(14)); ASSERT_EQ(v.magnitude(), sqrt(14));
} }
TEST(TuplesTests, Nomilise_vector_4_0_0_give_1_0_0) TEST(TupleTest, Nomilise_vector_4_0_0_give_1_0_0)
{ {
Vector v = Vector(4, 0, 0); Vector v = Vector(4, 0, 0);
ASSERT_EQ(v.normalise(), Vector(1, 0, 0)); ASSERT_EQ(v.normalise(), Vector(1, 0, 0));
} }
TEST(TuplesTests, Nomilise_vector_1_2_3) TEST(TupleTest, Nomilise_vector_1_2_3)
{ {
Vector v = Vector(1, 2, 3); Vector v = Vector(1, 2, 3);
ASSERT_EQ(v.normalise(), Vector(1 / sqrt(14), 2 / sqrt(14), 3 / sqrt(14))); ASSERT_EQ(v.normalise(), Vector(1 / sqrt(14), 2 / sqrt(14), 3 / sqrt(14)));
} }
TEST(TuplesTests, Dot_product_of_two_tuples) TEST(TupleTest, Dot_product_of_two_tuples)
{ {
Vector a = Vector(1, 2, 3); Vector a = Vector(1, 2, 3);
Vector b = Vector(2, 3, 4); Vector b = Vector(2, 3, 4);
@@ -173,7 +173,7 @@ TEST(TuplesTests, Dot_product_of_two_tuples)
ASSERT_EQ(a.dot(b), 20); ASSERT_EQ(a.dot(b), 20);
} }
TEST(TuplesTests, Cross_product_of_two_vector) TEST(TupleTest, Cross_product_of_two_vector)
{ {
Vector a = Vector(1, 2, 3); Vector a = Vector(1, 2, 3);
Vector b = Vector(2, 3, 4); Vector b = Vector(2, 3, 4);
@@ -182,7 +182,7 @@ TEST(TuplesTests, Cross_product_of_two_vector)
ASSERT_EQ(b.cross(a), Vector(1, -2, 1)); ASSERT_EQ(b.cross(a), Vector(1, -2, 1));
} }
TEST(TuplesTests, Reflecting_a_vector_approaching_at_45) TEST(TupleTest, Reflecting_a_vector_approaching_at_45)
{ {
Vector v = Vector(1, -1, 0); /* Vector */ Vector v = Vector(1, -1, 0); /* Vector */
Vector n = Vector(0, 1, 0); /* Normal */ Vector n = Vector(0, 1, 0); /* Normal */
@@ -192,7 +192,7 @@ TEST(TuplesTests, Reflecting_a_vector_approaching_at_45)
ASSERT_EQ(r, Vector(1, 1, 0)); ASSERT_EQ(r, Vector(1, 1, 0));
} }
TEST(TuplesTests, Reflecting_a_vector_off_a_slanted_surface) TEST(TupleTest, Reflecting_a_vector_off_a_slanted_surface)
{ {
Vector v = Vector(0, -1, 0); /* Vector */ Vector v = Vector(0, -1, 0); /* Vector */
Vector n = Vector(sqrt(2)/2, sqrt(2)/2, 0); /* Normal */ Vector n = Vector(sqrt(2)/2, sqrt(2)/2, 0); /* Normal */