Use REQURE CHECK to abort test if no Frame

Author: musteresel

tests/Frame_Tests.cpp

@@ -45,8 +45,7 @@ TEST(Default_Constructor)
 {
 	// Create a "blank" default Frame
 	std::shared_ptr<Frame> f1(new Frame());
-
-	CHECK(f1 != nullptr);  // Test aborts here if we didn't get a Frame
+	REQUIRE CHECK(f1 != nullptr);
 
 	// Check basic default parameters
 	CHECK_EQUAL(1, f1->GetHeight());
@@ -78,8 +77,7 @@ TEST(Data_Access)
 
 	// Get first frame
 	std::shared_ptr<Frame> f1 = c1.GetFrame(1);
-
-	CHECK(f1 != nullptr);
+	REQUIRE CHECK(f1 != nullptr);
 
 	CHECK_EQUAL(1, f1->number);
 	CHECK_EQUAL(1280, f1->GetWidth());
@@ -91,13 +89,13 @@ TEST(AddImage_QImage)
 {
 	// Create a "blank" default Frame
 	std::shared_ptr<Frame> f1(new Frame());
+	REQUIRE CHECK(f1 != nullptr);
 
 	// Load an image
 	std::stringstream path;
 	path << TEST_MEDIA_PATH << "front.png";
 	std::shared_ptr<QImage> i1(new QImage(QString::fromStdString(path.str()))) ;
 
-	CHECK(f1 != nullptr);  // Test aborts here if we didn't get a Frame
 	CHECK_EQUAL(false, i1->isNull());
 
 	f1->AddImage(i1);