Reverting logging code in unittests

This commit is contained in:
Jonathan Thomas
2016-09-08 22:26:14 -05:00
parent a4340b8b0a
commit f00ea5c4e2
13 changed files with 0 additions and 79 deletions

View File

@@ -34,7 +34,6 @@ using namespace openshot;
TEST(Cache_Default_Constructor)
{
cout << "Cache_Default_Constructor" << endl;
// Create cache object
CacheMemory c;
@@ -53,7 +52,6 @@ TEST(Cache_Default_Constructor)
TEST(Cache_Max_Bytes_Constructor)
{
cout << "Cache_Max_Bytes_Constructor" << endl;
// Create cache object (with a max of 5 previous items)
CacheMemory c(250 * 1024);
@@ -93,7 +91,6 @@ TEST(Cache_Max_Bytes_Constructor)
TEST(Cache_Clear)
{
cout << "Cache_Clear" << endl;
// Create cache object
CacheMemory c(250 * 1024);
@@ -118,7 +115,6 @@ TEST(Cache_Clear)
TEST(Cache_Add_Duplicate_Frames)
{
cout << "Cache_Add_Duplicate_Frames" << endl;
// Create cache object
CacheMemory c(250 * 1024);
@@ -136,7 +132,6 @@ TEST(Cache_Add_Duplicate_Frames)
TEST(Cache_Check_If_Frame_Exists)
{
cout << "Cache_Check_If_Frame_Exists" << endl;
// Create cache object
CacheMemory c(250 * 1024);
@@ -161,7 +156,6 @@ TEST(Cache_Check_If_Frame_Exists)
TEST(Cache_GetFrame)
{
cout << "Cache_GetFrame" << endl;
// Create cache object
CacheMemory c(250 * 1024);
@@ -187,7 +181,6 @@ TEST(Cache_GetFrame)
TEST(Cache_GetSmallest)
{
cout << "Cache_GetSmallest" << endl;
// Create cache object (with a max of 10 items)
CacheMemory c(250 * 1024);
@@ -216,7 +209,6 @@ TEST(Cache_GetSmallest)
TEST(Cache_Remove)
{
cout << "Cache_Remove" << endl;
// Create cache object (with a max of 10 items)
CacheMemory c(250 * 1024);
@@ -257,7 +249,6 @@ TEST(Cache_Remove)
TEST(Cache_Set_Max_Bytes)
{
cout << "Cache_Set_Max_Bytes" << endl;
// Create cache object
CacheMemory c;
@@ -283,7 +274,6 @@ TEST(Cache_Set_Max_Bytes)
TEST(Cache_Multiple_Remove)
{
cout << "Cache_Multiple_Remove" << endl;
// Create cache object (using platform /temp/ directory)
CacheMemory c;
@@ -312,7 +302,6 @@ TEST(Cache_Multiple_Remove)
TEST(CacheDisk_Set_Max_Bytes)
{
cout << "CacheDisk_Set_Max_Bytes" << endl;
// Create cache object (using platform /temp/ directory)
CacheDisk c("", "PPM", 1.0, 0.25);
@@ -352,7 +341,6 @@ TEST(CacheDisk_Set_Max_Bytes)
TEST(CacheDisk_Multiple_Remove)
{
cout << "CacheDisk_Multiple_Remove" << endl;
// Create cache object (using platform /temp/ directory)
CacheDisk c("", "PPM", 1.0, 0.25);
@@ -381,7 +369,6 @@ TEST(CacheDisk_Multiple_Remove)
TEST(CacheDisk_JSON)
{
cout << "CacheDisk_JSON" << endl;
// Create cache object (using platform /temp/ directory)
CacheDisk c("", "PPM", 1.0, 0.25);
@@ -419,7 +406,6 @@ TEST(CacheDisk_JSON)
TEST(CacheMemory_JSON)
{
cout << "CacheMemory_JSON" << endl;
// Create memory cache object
CacheMemory c;

View File

@@ -34,7 +34,6 @@ using namespace openshot;
TEST(Clip_Default_Constructor)
{
cout << "Clip_Default_Constructor" << endl;
// Create a empty clip
Clip c1;
@@ -50,7 +49,6 @@ TEST(Clip_Default_Constructor)
TEST(Clip_Constructor)
{
cout << "Clip_Constructor" << endl;
// Create a empty clip
stringstream path;
path << TEST_MEDIA_PATH << "piano.wav";
@@ -69,7 +67,6 @@ TEST(Clip_Constructor)
TEST(Clip_Basic_Gettings_and_Setters)
{
cout << "Clip_Basic_Gettings_and_Setters" << endl;
// Create a empty clip
Clip c1;
@@ -97,7 +94,6 @@ TEST(Clip_Basic_Gettings_and_Setters)
TEST(Clip_Properties)
{
cout << "Clip_Properties" << endl;
// Create a empty clip
Clip c1;
@@ -208,7 +204,6 @@ TEST(Clip_Properties)
TEST(Clip_Effects)
{
cout << "Clip_Effects" << endl;
// Load clip with video
stringstream path;
path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";

View File

@@ -33,7 +33,6 @@ using namespace openshot;
TEST(Color_Default_Constructor)
{
cout << "Color_Default_Constructor" << endl;
// Create an empty color
Color c1;
@@ -44,7 +43,6 @@ TEST(Color_Default_Constructor)
TEST(Color_Animate_Colors)
{
cout << "Color_Animate_Colors" << endl;
// Create an empty color
Color c1;
@@ -66,7 +64,6 @@ TEST(Color_Animate_Colors)
TEST(Color_HEX_Value)
{
cout << "Color_HEX_Value" << endl;
// Color
openshot::Color c;
c.red = openshot::Keyframe(0);
@@ -84,7 +81,6 @@ TEST(Color_HEX_Value)
TEST(Color_HEX_Constructor)
{
cout << "Color_HEX_Constructor" << endl;
// Color
openshot::Color c("#4586db");
c.red.AddPoint(100, 255);
@@ -98,7 +94,6 @@ TEST(Color_HEX_Constructor)
TEST(Color_Distance)
{
cout << "Color_Distance" << endl;
// Color
openshot::Color c1("#040a0c");
openshot::Color c2("#0c0c04");
@@ -111,7 +106,6 @@ TEST(Color_Distance)
TEST(Color_RGBA_Constructor)
{
cout << "Color_RGBA_Constructor" << endl;
// Color
openshot::Color c(69, 134, 219, 255);
c.red.AddPoint(100, 255);

View File

@@ -33,7 +33,6 @@ using namespace openshot;
TEST(Coordinate_Default_Constructor)
{
cout << "Coordinate_Default_Constructor" << endl;
// Create an empty coordinate
Coordinate c1;
@@ -43,7 +42,6 @@ TEST(Coordinate_Default_Constructor)
TEST(Coordinate_X_Y_Constructor)
{
cout << "Coordinate_X_Y_Constructor" << endl;
// Create an empty coordinate
Coordinate c1(2,8);

View File

@@ -34,14 +34,12 @@ using namespace openshot;
TEST(FFmpegReader_Invalid_Path)
{
cout << "FFmpegReader_Invalid_Path" << endl;
// Check invalid path
CHECK_THROW(FFmpegReader(""), InvalidFile);
}
TEST(FFmpegReader_GetFrame_Before_Opening)
{
cout << "FFmpegReader_GetFrame_Before_Opening" << endl;
// Create a reader
stringstream path;
path << TEST_MEDIA_PATH << "piano.wav";
@@ -53,7 +51,6 @@ TEST(FFmpegReader_GetFrame_Before_Opening)
TEST(FFmpegReader_Check_Audio_File)
{
cout << "FFmpegReader_Check_Audio_File" << endl;
// Create a reader
stringstream path;
path << TEST_MEDIA_PATH << "piano.wav";
@@ -84,7 +81,6 @@ TEST(FFmpegReader_Check_Audio_File)
TEST(FFmpegReader_Check_Video_File)
{
cout << "FFmpegReader_Check_Video_File" << endl;
// Create a reader
stringstream path;
path << TEST_MEDIA_PATH << "test.mp4";
@@ -123,7 +119,6 @@ TEST(FFmpegReader_Check_Video_File)
TEST(FFmpegReader_Seek)
{
cout << "FFmpegReader_Seek" << endl;
// Create a reader
stringstream path;
path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";
@@ -181,7 +176,6 @@ TEST(FFmpegReader_Seek)
TEST(FFmpegReader_Multiple_Open_and_Close)
{
cout << "FFmpegReader_Multiple_Open_and_Close" << endl;
// Create a reader
stringstream path;
path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";

View File

@@ -34,7 +34,6 @@ using namespace openshot;
TEST(FFmpegWriter_Test_Webm)
{
cout << "FFmpegWriter_Test_Webm" << endl;
// Reader
stringstream path;
path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";

View File

@@ -33,7 +33,6 @@ using namespace openshot;
TEST(Fraction_Default_Constructor)
{
cout << "Fraction_Default_Constructor" << endl;
// Create a default fraction (should be 1/1)
Fraction f1;
@@ -55,7 +54,6 @@ TEST(Fraction_Default_Constructor)
TEST(Fraction_640_480)
{
cout << "Fraction_640_480" << endl;
// Create fraction
Fraction f1(640, 480);
@@ -77,7 +75,6 @@ TEST(Fraction_640_480)
TEST(Fraction_1280_720)
{
cout << "Fraction_1280_720" << endl;
// Create fraction
Fraction f1(1280, 720);
@@ -99,7 +96,6 @@ TEST(Fraction_1280_720)
TEST(Fraction_reciprocal)
{
cout << "Fraction_reciprocal" << endl;
// Create fraction
Fraction f1(1280, 720);

View File

@@ -34,7 +34,6 @@ using namespace openshot;
TEST(FrameMapper_Get_Valid_Frame)
{
cout << "FrameMapper_Get_Valid_Frame" << endl;
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
@@ -56,7 +55,6 @@ TEST(FrameMapper_Get_Valid_Frame)
TEST(FrameMapper_Invalid_Frame_Too_Small)
{
cout << "FrameMapper_Invalid_Frame_Too_Small" << endl;
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
@@ -70,7 +68,6 @@ TEST(FrameMapper_Invalid_Frame_Too_Small)
TEST(FrameMapper_24_fps_to_30_fps_Pulldown_Classic)
{
cout << "FrameMapper_24_fps_to_30_fps_Pulldown_Classic" << endl;
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
@@ -88,7 +85,6 @@ TEST(FrameMapper_24_fps_to_30_fps_Pulldown_Classic)
TEST(FrameMapper_24_fps_to_30_fps_Pulldown_Advanced)
{
cout << "FrameMapper_24_fps_to_30_fps_Pulldown_Advanced" << endl;
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
@@ -109,7 +105,6 @@ TEST(FrameMapper_24_fps_to_30_fps_Pulldown_Advanced)
TEST(FrameMapper_24_fps_to_30_fps_Pulldown_None)
{
cout << "FrameMapper_24_fps_to_30_fps_Pulldown_None" << endl;
// Create a reader
DummyReader r(Fraction(24,1), 720, 480, 22000, 2, 5.0);
@@ -127,7 +122,6 @@ TEST(FrameMapper_24_fps_to_30_fps_Pulldown_None)
TEST(FrameMapper_30_fps_to_24_fps_Pulldown_Classic)
{
cout << "FrameMapper_30_fps_to_24_fps_Pulldown_Classic" << endl;
// Create a reader
DummyReader r(Fraction(30, 1), 720, 480, 22000, 2, 5.0);
@@ -148,7 +142,6 @@ TEST(FrameMapper_30_fps_to_24_fps_Pulldown_Classic)
TEST(FrameMapper_30_fps_to_24_fps_Pulldown_Advanced)
{
cout << "FrameMapper_30_fps_to_24_fps_Pulldown_Advanced" << endl;
// Create a reader
DummyReader r(Fraction(30, 1), 720, 480, 22000, 2, 5.0);
@@ -169,7 +162,6 @@ TEST(FrameMapper_30_fps_to_24_fps_Pulldown_Advanced)
TEST(FrameMapper_30_fps_to_24_fps_Pulldown_None)
{
cout << "FrameMapper_30_fps_to_24_fps_Pulldown_None" << endl;
// Create a reader
DummyReader r(Fraction(30, 1), 720, 480, 22000, 2, 5.0);
@@ -187,7 +179,6 @@ TEST(FrameMapper_30_fps_to_24_fps_Pulldown_None)
TEST(FrameMapper_resample_audio_48000_to_41000)
{
cout << "FrameMapper_resample_audio_48000_to_41000" << endl;
// Create a reader: 24 fps, 2 channels, 48000 sample rate
stringstream path;
path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";

View File

@@ -35,7 +35,6 @@ using namespace openshot;
#ifdef USE_IMAGEMAGICK
TEST(ImageWriter_Test_Gif)
{
cout << "ImageWriter_Test_Gif" << endl;
// Reader
stringstream path;
path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";

View File

@@ -33,7 +33,6 @@ using namespace openshot;
TEST(Keyframe_GetPoint_With_No_Points)
{
cout << "Keyframe_GetPoint_With_No_Points" << endl;
// Create an empty keyframe
Keyframe k1;
@@ -42,7 +41,6 @@ TEST(Keyframe_GetPoint_With_No_Points)
TEST(Keyframe_GetPoint_With_1_Points)
{
cout << "Keyframe_GetPoint_With_1_Points" << endl;
// Create an empty keyframe
Keyframe k1;
k1.AddPoint(openshot::Point(2,3));
@@ -57,7 +55,6 @@ TEST(Keyframe_GetPoint_With_1_Points)
TEST(Keyframe_AddPoint_With_1_Point)
{
cout << "Keyframe_AddPoint_With_1_Point" << endl;
// Create an empty keyframe
Keyframe k1;
k1.Auto_Handle_Percentage = 0.4f;
@@ -70,7 +67,6 @@ TEST(Keyframe_AddPoint_With_1_Point)
TEST(Keyframe_AddPoint_With_2_Points)
{
cout << "Keyframe_AddPoint_With_2_Points" << endl;
// Create an empty keyframe
Keyframe k1;
k1.Auto_Handle_Percentage = 0.4f;
@@ -85,7 +81,6 @@ TEST(Keyframe_AddPoint_With_2_Points)
TEST(Keyframe_GetValue_For_Bezier_Curve_2_Points)
{
cout << "Keyframe_GetValue_For_Bezier_Curve_2_Points" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.Auto_Handle_Percentage = 0.4f;
@@ -106,7 +101,6 @@ TEST(Keyframe_GetValue_For_Bezier_Curve_2_Points)
TEST(Keyframe_GetValue_For_Bezier_Curve_5_Points_40_Percent_Handle)
{
cout << "Keyframe_GetValue_For_Bezier_Curve_5_Points_40_Percent_Handle" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.Auto_Handle_Percentage = 0.4f;
@@ -131,7 +125,6 @@ TEST(Keyframe_GetValue_For_Bezier_Curve_5_Points_40_Percent_Handle)
TEST(Keyframe_GetValue_For_Bezier_Curve_5_Points_25_Percent_Handle)
{
cout << "Keyframe_GetValue_For_Bezier_Curve_5_Points_25_Percent_Handle" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.Auto_Handle_Percentage = 0.25f;
@@ -156,7 +149,6 @@ TEST(Keyframe_GetValue_For_Bezier_Curve_5_Points_25_Percent_Handle)
TEST(Keyframe_GetValue_For_Linear_Curve_3_Points)
{
cout << "Keyframe_GetValue_For_Linear_Curve_3_Points" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.Auto_Handle_Percentage = 0.4f;
@@ -178,7 +170,6 @@ TEST(Keyframe_GetValue_For_Linear_Curve_3_Points)
TEST(Keyframe_GetValue_For_Constant_Curve_3_Points)
{
cout << "Keyframe_GetValue_For_Constant_Curve_3_Points" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.Auto_Handle_Percentage = 0.4f;
@@ -201,7 +192,6 @@ TEST(Keyframe_GetValue_For_Constant_Curve_3_Points)
TEST(Keyframe_Check_Direction_and_Repeat_Fractions)
{
cout << "Keyframe_Check_Direction_and_Repeat_Fractions" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.AddPoint(1, 500);
@@ -237,7 +227,6 @@ TEST(Keyframe_Check_Direction_and_Repeat_Fractions)
TEST(Keyframe_Get_Closest_Point)
{
cout << "Keyframe_Get_Closest_Point" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.AddPoint(1, 0.0);
@@ -257,7 +246,6 @@ TEST(Keyframe_Get_Closest_Point)
TEST(Keyframe_Scale_Keyframe)
{
cout << "Keyframe_Scale_Keyframe" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.Auto_Handle_Percentage = 0.4f;
@@ -301,7 +289,6 @@ TEST(Keyframe_Scale_Keyframe)
TEST(Keyframe_Flip_Keyframe)
{
cout << "Keyframe_Flip_Keyframe" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.Auto_Handle_Percentage = 0.4f;
@@ -337,7 +324,6 @@ TEST(Keyframe_Flip_Keyframe)
TEST(Keyframe_Remove_Duplicate_Point)
{
cout << "Keyframe_Remove_Duplicate_Point" << endl;
// Create a keyframe curve with 2 points
Keyframe kf;
kf.AddPoint(1, 0.0);

View File

@@ -33,7 +33,6 @@ using namespace openshot;
TEST(Point_Default_Constructor)
{
cout << "Point_Default_Constructor" << endl;
// Create a point with X and Y values
openshot::Point p1(2,9);
@@ -44,7 +43,6 @@ TEST(Point_Default_Constructor)
TEST(Point_Constructor_With_Coordinate)
{
cout << "Point_Constructor_With_Coordinate" << endl;
// Create a point with a coordinate
Coordinate c1(3,7);
openshot::Point p1(c1);
@@ -56,7 +54,6 @@ TEST(Point_Constructor_With_Coordinate)
TEST(Point_Constructor_With_Coordinate_And_LINEAR_Interpolation)
{
cout << "Point_Constructor_With_Coordinate_And_LINEAR_Interpolation" << endl;
// Create a point with a coordinate and interpolation
Coordinate c1(3,9);
InterpolationType interp = LINEAR;
@@ -69,7 +66,6 @@ TEST(Point_Constructor_With_Coordinate_And_LINEAR_Interpolation)
TEST(Point_Constructor_With_Coordinate_And_BEZIER_Interpolation)
{
cout << "Point_Constructor_With_Coordinate_And_BEZIER_Interpolation" << endl;
// Create a point with a coordinate and interpolation
Coordinate c1(3,9);
InterpolationType interp = BEZIER;
@@ -82,7 +78,6 @@ TEST(Point_Constructor_With_Coordinate_And_BEZIER_Interpolation)
TEST(Point_Constructor_With_Coordinate_And_CONSTANT_Interpolation)
{
cout << "Point_Constructor_With_Coordinate_And_CONSTANT_Interpolation" << endl;
// Create a point with a coordinate and interpolation
Coordinate c1(2,8);
InterpolationType interp = CONSTANT;
@@ -95,7 +90,6 @@ TEST(Point_Constructor_With_Coordinate_And_CONSTANT_Interpolation)
TEST(Point_Constructor_With_Coordinate_And_BEZIER_And_AUTO_Handle)
{
cout << "Point_Constructor_With_Coordinate_And_BEZIER_And_AUTO_Handle" << endl;
// Create a point with a coordinate and interpolation
Coordinate c1(3,9);
openshot::Point p1(c1, BEZIER, AUTO);
@@ -108,7 +102,6 @@ TEST(Point_Constructor_With_Coordinate_And_BEZIER_And_AUTO_Handle)
TEST(Point_Constructor_With_Coordinate_And_BEZIER_And_MANUAL_Handle)
{
cout << "Point_Constructor_With_Coordinate_And_BEZIER_And_MANUAL_Handle" << endl;
// Create a point with a coordinate and interpolation
Coordinate c1(3,9);
openshot::Point p1(c1, BEZIER, MANUAL);
@@ -121,7 +114,6 @@ TEST(Point_Constructor_With_Coordinate_And_BEZIER_And_MANUAL_Handle)
TEST(Point_Set_Handles_Auto_No_Value)
{
cout << "Point_Set_Handles_Auto_No_Value" << endl;
// Create a point with X and Y values
openshot::Point p1(2,8);
p1.Initialize_Handles();
@@ -134,7 +126,6 @@ TEST(Point_Set_Handles_Auto_No_Value)
TEST(Point_Set_Handles_Auto_With_Values)
{
cout << "Point_Set_Handles_Auto_With_Values" << endl;
// Create a point with X and Y values
openshot::Point p1(2,8);
p1.Initialize_Handles(4.2);

View File

@@ -35,7 +35,6 @@ using namespace openshot;
// a new derived class, in order to test the base class file info struct.
TEST(ReaderBase_Derived_Class)
{
cout << "ReaderBase_Derived_Class" << endl;
// Create a new derived class from type ReaderBase
class TestReader : public ReaderBase
{

View File

@@ -34,7 +34,6 @@ using namespace openshot;
TEST(Timeline_Constructor)
{
cout << "Timeline_Constructor" << endl;
// Create a default fraction (should be 1/1)
Fraction fps(30000,1000);
Timeline t1(640, 480, fps, 44100, 2, LAYOUT_STEREO);
@@ -53,7 +52,6 @@ TEST(Timeline_Constructor)
TEST(Timeline_Width_and_Height_Functions)
{
cout << "Timeline_Width_and_Height_Functions" << endl;
// Create a default fraction (should be 1/1)
Fraction fps(30000,1000);
Timeline t1(640, 480, fps, 44100, 2, LAYOUT_STEREO);
@@ -79,7 +77,6 @@ TEST(Timeline_Width_and_Height_Functions)
TEST(Timeline_Framerate)
{
cout << "Timeline_Framerate" << endl;
// Create a default fraction (should be 1/1)
Fraction fps(24,1);
Timeline t1(640, 480, fps, 44100, 2, LAYOUT_STEREO);
@@ -90,7 +87,6 @@ TEST(Timeline_Framerate)
TEST(Timeline_Check_Two_Track_Video)
{
cout << "Timeline_Check_Two_Track_Video" << endl;
// Create a reader
stringstream path;
path << TEST_MEDIA_PATH << "test.mp4";
@@ -213,7 +209,6 @@ TEST(Timeline_Check_Two_Track_Video)
TEST(Timeline_Clip_Order)
{
cout << "Timeline_Clip_Order" << endl;
// Create a timeline
Timeline t(640, 480, Fraction(30, 1), 44100, 2, LAYOUT_STEREO);
@@ -310,7 +305,6 @@ TEST(Timeline_Clip_Order)
TEST(Timeline_Effect_Order)
{
cout << "Timeline_Effect_Order" << endl;
// Create a timeline
Timeline t(640, 480, Fraction(30, 1), 44100, 2, LAYOUT_STEREO);
@@ -443,7 +437,6 @@ TEST(Timeline_Effect_Order)
TEST(Timeline_Effect_Blur)
{
cout << "Timeline_Effect_Blur" << endl;
// Create a timeline
Timeline t(640, 480, Fraction(30, 1), 44100, 2, LAYOUT_STEREO);