From 89b1643e9fbc10fc7263b3f7baa9c756e9d712a2 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 19 Apr 2021 17:25:06 -0400 Subject: [PATCH] Tests: Shorten some crazy long test names --- tests/KeyFrame.cpp | 46 +++++++++++++++++++++++----------------------- tests/Point.cpp | 18 +++++++++--------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/KeyFrame.cpp b/tests/KeyFrame.cpp index b919e8a5f..feb4ccb7f 100644 --- a/tests/KeyFrame.cpp +++ b/tests/KeyFrame.cpp @@ -38,7 +38,7 @@ using namespace openshot; -TEST_CASE( "GetPoint_With_No_Points", "[libopenshot][keyframe]" ) +TEST_CASE( "GetPoint (no Points)", "[libopenshot][keyframe]" ) { // Create an empty keyframe Keyframe k1; @@ -46,7 +46,7 @@ TEST_CASE( "GetPoint_With_No_Points", "[libopenshot][keyframe]" ) CHECK_THROWS_AS(k1.GetPoint(0), OutOfBoundsPoint); } -TEST_CASE( "GetPoint_With_1_Points", "[libopenshot][keyframe]" ) +TEST_CASE( "GetPoint (1 Point)", "[libopenshot][keyframe]" ) { // Create an empty keyframe Keyframe k1; @@ -60,7 +60,7 @@ TEST_CASE( "GetPoint_With_1_Points", "[libopenshot][keyframe]" ) } -TEST_CASE( "AddPoint_With_1_Point", "[libopenshot][keyframe]" ) +TEST_CASE( "AddPoint (1 Point)", "[libopenshot][keyframe]" ) { // Create an empty keyframe Keyframe k1; @@ -71,7 +71,7 @@ TEST_CASE( "AddPoint_With_1_Point", "[libopenshot][keyframe]" ) CHECK_THROWS_AS(k1.GetPoint(1), OutOfBoundsPoint); } -TEST_CASE( "AddPoint_With_2_Points", "[libopenshot][keyframe]" ) +TEST_CASE( "AddPoint (2 Points)", "[libopenshot][keyframe]" ) { // Create an empty keyframe Keyframe k1; @@ -84,7 +84,7 @@ TEST_CASE( "AddPoint_With_2_Points", "[libopenshot][keyframe]" ) CHECK_THROWS_AS(k1.GetPoint(2), OutOfBoundsPoint); } -TEST_CASE( "GetValue_For_Bezier_Curve_2_Points", "[libopenshot][keyframe]" ) +TEST_CASE( "GetValue (Bezier curve, 2 Points)", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -103,7 +103,7 @@ TEST_CASE( "GetValue_For_Bezier_Curve_2_Points", "[libopenshot][keyframe]" ) CHECK(kf.GetLength() == 51); } -TEST_CASE( "GetValue_For_Bezier_Curve_5_Points_40_Percent_Handle", "[libopenshot][keyframe]" ) +TEST_CASE( "GetValue (Bezier, 5 Points, 40% handle)", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -126,7 +126,7 @@ TEST_CASE( "GetValue_For_Bezier_Curve_5_Points_40_Percent_Handle", "[libopenshot CHECK(kf.GetLength() == 201); } -TEST_CASE( "GetValue_For_Bezier_Curve_5_Points_25_Percent_Handle", "[libopenshot][keyframe]" ) +TEST_CASE( "GetValue (Bezier, 5 Points, 25% Handle)", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -149,7 +149,7 @@ TEST_CASE( "GetValue_For_Bezier_Curve_5_Points_25_Percent_Handle", "[libopenshot CHECK(kf.GetLength() == 201); } -TEST_CASE( "GetValue_For_Linear_Curve_3_Points", "[libopenshot][keyframe]" ) +TEST_CASE( "GetValue (Linear, 3 Points)", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -169,7 +169,7 @@ TEST_CASE( "GetValue_For_Linear_Curve_3_Points", "[libopenshot][keyframe]" ) CHECK(kf.GetLength() == 51); } -TEST_CASE( "GetValue_For_Constant_Curve_3_Points", "[libopenshot][keyframe]" ) +TEST_CASE( "GetValue (Constant, 3 Points)", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -190,7 +190,7 @@ TEST_CASE( "GetValue_For_Constant_Curve_3_Points", "[libopenshot][keyframe]" ) CHECK(kf.GetLength() == 51); } -TEST_CASE( "Check_Direction_and_Repeat_Fractions", "[libopenshot][keyframe]" ) +TEST_CASE( "GetDelta and GetRepeatFraction", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -225,7 +225,7 @@ TEST_CASE( "Check_Direction_and_Repeat_Fractions", "[libopenshot][keyframe]" ) } -TEST_CASE( "Get_Closest_Point", "[libopenshot][keyframe]" ) +TEST_CASE( "GetClosestPoint", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -253,7 +253,7 @@ TEST_CASE( "Get_Closest_Point", "[libopenshot][keyframe]" ) } -TEST_CASE( "Get_Previous_Point", "[libopenshot][keyframe]" ) +TEST_CASE( "GetPreviousPoint", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -272,7 +272,7 @@ TEST_CASE( "Get_Previous_Point", "[libopenshot][keyframe]" ) } -TEST_CASE( "Get_Max_Point", "[libopenshot][keyframe]" ) +TEST_CASE( "GetMaxPoint", "[libopenshot][keyframe]" ) { // Create a keyframe curve Keyframe kf; @@ -297,7 +297,7 @@ TEST_CASE( "Get_Max_Point", "[libopenshot][keyframe]" ) CHECK(kf.GetMaxPoint().co.Y == 2.0); } -TEST_CASE( "Scale_Keyframe", "[libopenshot][keyframe]" ) +TEST_CASE( "Keyframe scaling", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -339,7 +339,7 @@ TEST_CASE( "Scale_Keyframe", "[libopenshot][keyframe]" ) } -TEST_CASE( "Flip_Keyframe", "[libopenshot][keyframe]" ) +TEST_CASE( "flip Keyframe", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -373,7 +373,7 @@ TEST_CASE( "Flip_Keyframe", "[libopenshot][keyframe]" ) CHECK(kf.GetValue(100) == Approx(10.0f).margin(0.01)); } -TEST_CASE( "Remove_Duplicate_Point", "[libopenshot][keyframe]" ) +TEST_CASE( "remove duplicate Point", "[libopenshot][keyframe]" ) { // Create a keyframe curve with 2 points Keyframe kf; @@ -386,7 +386,7 @@ TEST_CASE( "Remove_Duplicate_Point", "[libopenshot][keyframe]" ) CHECK(kf.GetPoint(0).co.Y == Approx(2.0).margin(0.01)); } -TEST_CASE( "Large_Number_Values", "[libopenshot][keyframe]" ) +TEST_CASE( "large number values", "[libopenshot][keyframe]" ) { // Large value int64_t const large_value = 30 * 60 * 90; @@ -402,7 +402,7 @@ TEST_CASE( "Large_Number_Values", "[libopenshot][keyframe]" ) CHECK(kf.GetPoint(1).co.Y == Approx(100.0).margin(0.01)); } -TEST_CASE( "Remove_Point", "[libopenshot][keyframe]" ) +TEST_CASE( "remove Point", "[libopenshot][keyframe]" ) { Keyframe kf; kf.AddPoint(openshot::Point(Coordinate(1, 1), CONSTANT)); @@ -415,7 +415,7 @@ TEST_CASE( "Remove_Point", "[libopenshot][keyframe]" ) CHECK_THROWS_AS(kf.RemovePoint(100), OutOfBoundsPoint); } -TEST_CASE( "Constant_Interpolation_First_Segment", "[libopenshot][keyframe]" ) +TEST_CASE( "Constant interp, first segment", "[libopenshot][keyframe]" ) { Keyframe kf; kf.AddPoint(Point(Coordinate(1, 1), CONSTANT)); @@ -428,7 +428,7 @@ TEST_CASE( "Constant_Interpolation_First_Segment", "[libopenshot][keyframe]" ) CHECK(kf.GetInt(4) == 100); } -TEST_CASE( "isIncreasing", "[libopenshot][keyframe]" ) +TEST_CASE( "IsIncreasing", "[libopenshot][keyframe]" ) { // Which cases need to be tested to keep same behaviour as // previously? @@ -477,7 +477,7 @@ TEST_CASE( "GetLength", "[libopenshot][keyframe]" ) CHECK(g.GetLength() == 201); } -TEST_CASE( "Use_Interpolation_of_Segment_End_Point", "[libopenshot][keyframe]" ) +TEST_CASE( "use segment end point interpolation", "[libopenshot][keyframe]" ) { Keyframe f; f.AddPoint(1,0, CONSTANT); @@ -485,7 +485,7 @@ TEST_CASE( "Use_Interpolation_of_Segment_End_Point", "[libopenshot][keyframe]" ) CHECK(f.GetValue(50) == Approx(75.9).margin(0.1)); } -TEST_CASE( "Handle_Large_Segment", "[libopenshot][keyframe]" ) +TEST_CASE( "handle large segment", "[libopenshot][keyframe]" ) { Keyframe kf; kf.AddPoint(1, 0, CONSTANT); @@ -498,7 +498,7 @@ TEST_CASE( "Handle_Large_Segment", "[libopenshot][keyframe]" ) CHECK((double)fr.num / fr.den == Approx(0.5).margin(0.01)); } -TEST_CASE( "Point_Vector_Constructor", "[libopenshot][keyframe]" ) +TEST_CASE( "std::vector constructor", "[libopenshot][keyframe]" ) { std::vector points{Point(1, 10), Point(5, 20), Point(10, 30)}; Keyframe k1(points); diff --git a/tests/Point.cpp b/tests/Point.cpp index 45f493e07..ec208698a 100644 --- a/tests/Point.cpp +++ b/tests/Point.cpp @@ -36,7 +36,7 @@ #include "Coordinate.h" #include "Json.h" -TEST_CASE( "Default_Constructor", "[libopenshot][point]" ) +TEST_CASE( "default constructor", "[libopenshot][point]" ) { openshot::Point p; @@ -50,7 +50,7 @@ TEST_CASE( "Default_Constructor", "[libopenshot][point]" ) CHECK(p.interpolation == openshot::InterpolationType::BEZIER); CHECK(p.handle_type == openshot::HandleType::AUTO); } -TEST_CASE( "XY_Constructor", "[libopenshot][point]" ) +TEST_CASE( "XY constructor", "[libopenshot][point]" ) { // Create a point with X and Y values openshot::Point p1(2,9); @@ -60,7 +60,7 @@ TEST_CASE( "XY_Constructor", "[libopenshot][point]" ) CHECK(p1.interpolation == openshot::InterpolationType::BEZIER); } -TEST_CASE( "Pair_Constructor", "[libopenshot][point]" ) +TEST_CASE( "std::pair constructor", "[libopenshot][point]" ) { // Create a point from a std::pair std::pair coordinates(22, 5); @@ -70,7 +70,7 @@ TEST_CASE( "Pair_Constructor", "[libopenshot][point]" ) CHECK(p1.co.Y == Approx(5.0f).margin(0.00001)); } -TEST_CASE( "Constructor_With_Coordinate", "[libopenshot][point]" ) +TEST_CASE( "constructor from Coordinate", "[libopenshot][point]" ) { // Create a point with a coordinate openshot::Coordinate c1(3,7); @@ -81,7 +81,7 @@ TEST_CASE( "Constructor_With_Coordinate", "[libopenshot][point]" ) CHECK(p1.interpolation == openshot::InterpolationType::BEZIER); } -TEST_CASE( "Constructor_With_Coordinate_And_LINEAR_Interpolation", "[libopenshot][point]" ) +TEST_CASE( "constructor from Coordinate, LINEAR", "[libopenshot][point]" ) { // Create a point with a coordinate and interpolation openshot::Coordinate c1(3,9); @@ -93,7 +93,7 @@ TEST_CASE( "Constructor_With_Coordinate_And_LINEAR_Interpolation", "[libopenshot CHECK(p1.interpolation == openshot::InterpolationType::LINEAR); } -TEST_CASE( "Constructor_With_Coordinate_And_BEZIER_Interpolation", "[libopenshot][point]" ) +TEST_CASE( "constructor from Coordinate, BEZIER", "[libopenshot][point]" ) { // Create a point with a coordinate and interpolation openshot::Coordinate c1(3,9); @@ -105,7 +105,7 @@ TEST_CASE( "Constructor_With_Coordinate_And_BEZIER_Interpolation", "[libopenshot CHECK(p1.interpolation == openshot::InterpolationType::BEZIER); } -TEST_CASE( "Constructor_With_Coordinate_And_CONSTANT_Interpolation", "[libopenshot][point]" ) +TEST_CASE( "constructor from Coordinate, CONSTANT", "[libopenshot][point]" ) { // Create a point with a coordinate and interpolation openshot::Coordinate c1(2,8); @@ -117,7 +117,7 @@ TEST_CASE( "Constructor_With_Coordinate_And_CONSTANT_Interpolation", "[libopensh CHECK(p1.interpolation == openshot::InterpolationType::CONSTANT); } -TEST_CASE( "Constructor_With_Coordinate_And_BEZIER_And_AUTO_Handle", "[libopenshot][point]" ) +TEST_CASE( "constructor from Coordinate, BEZIER+AUTO", "[libopenshot][point]" ) { // Create a point with a coordinate and interpolation openshot::Coordinate c1(3,9); @@ -131,7 +131,7 @@ TEST_CASE( "Constructor_With_Coordinate_And_BEZIER_And_AUTO_Handle", "[libopensh CHECK(p1.handle_type == openshot::HandleType::AUTO); } -TEST_CASE( "Constructor_With_Coordinate_And_BEZIER_And_MANUAL_Handle", "[libopenshot][point]" ) +TEST_CASE( "constructor from Coordinate, BEZIER+MANUAL", "[libopenshot][point]" ) { // Create a point with a coordinate and interpolation openshot::Coordinate c1(3,9);