X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftorture_test.cc;h=27b4b5d144cd5194c3fa06abb2bb94bfdaea12b2;hb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;hp=764491c0a63ea5d31af368d41411b660b8f56934;hpb=7534e2cd4b44d29f932834ba14f28f0b4c6b6d60;p=dcpomatic.git

diff --git a/test/torture_test.cc b/test/torture_test.cc
index 764491c0a..27b4b5d14 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -90,9 +90,9 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 	dcp.read ();
 
 	list<shared_ptr<dcp::CPL> > cpls = dcp.cpls ();
-	BOOST_REQUIRE_EQUAL (cpls.size(), 1);
+	BOOST_REQUIRE_EQUAL (cpls.size(), 1U);
 	list<shared_ptr<dcp::Reel> > reels = cpls.front()->reels ();
-	BOOST_REQUIRE_EQUAL (reels.size(), 1);
+	BOOST_REQUIRE_EQUAL (reels.size(), 1U);
 
 	/* Check sound */
 
@@ -118,49 +118,57 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
 	int stair = 12;
 
-	fr = sound_reader->get_frame (1);
-	for (int i = 0; i < fr->samples(); ++i) {
-		for (int j = 0; j < 6; ++j) {
-			if (j == 2) {
-				BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
-				++stair;
-			} else {
-				BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+	BOOST_TEST_CONTEXT("First staircase, frame #1") {
+		fr = sound_reader->get_frame (1);
+		for (int i = 0; i < fr->samples(); ++i) {
+			for (int j = 0; j < 6; ++j) {
+				if (j == 2) {
+					BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
+					++stair;
+				} else {
+					BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+				}
 			}
 		}
 	}
 
-	fr = sound_reader->get_frame (2);
-	for (int i = 0; i < fr->samples(); ++i) {
-		for (int j = 0; j < 6; ++j) {
-			if (j == 2) {
-				BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
-				++stair;
-			} else {
-				BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+	BOOST_TEST_CONTEXT("First staircase, frame #2") {
+		fr = sound_reader->get_frame (2);
+		for (int i = 0; i < fr->samples(); ++i) {
+			for (int j = 0; j < 6; ++j) {
+				if (j == 2) {
+					BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
+					++stair;
+				} else {
+					BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+				}
 			}
 		}
 	}
 
-	fr = sound_reader->get_frame (3);
-	for (int i = 0; i < fr->samples(); ++i) {
-		for (int j = 0; j < 6; ++j) {
-			if (j == 2 && i < (4753 - (2000 * 2))) {
-				BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
-				++stair;
-			} else {
-				BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+	BOOST_TEST_CONTEXT("First staircase, frame #3") {
+		fr = sound_reader->get_frame (3);
+		for (int i = 0; i < fr->samples(); ++i) {
+			for (int j = 0; j < 6; ++j) {
+				if (j == 2 && i < (4753 - (2000 * 2))) {
+					BOOST_CHECK_EQUAL ((fr->get(j, i) + 128) >> 8, stair * 2);
+					++stair;
+				} else {
+					BOOST_CHECK_EQUAL (fr->get(j, i), 0);
+				}
 			}
 		}
 	}
 
 	/* Then some silence */
 
-	for (int i = 4; i < 24; ++i) {
-		fr = sound_reader->get_frame (i);
-		for (int j = 0; j < fr->samples(); ++j) {
-			for (int k = 0; k < 6; ++k) {
-				BOOST_CHECK_EQUAL (fr->get(k, j), 0);
+	BOOST_TEST_CONTEXT("Silence") {
+		for (int i = 4; i < 24; ++i) {
+			fr = sound_reader->get_frame (i);
+			for (int j = 0; j < fr->samples(); ++j) {
+				for (int k = 0; k < 6; ++k) {
+					BOOST_CHECK_EQUAL (fr->get(k, j), 0);
+				}
 			}
 		}
 	}