Pass Ratio around as an object rather than a pointer.

4 files changed, 24 insertions, 33 deletions

diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc
index 60d708eef..c71031fbc 100644
--- a/test/create_cli_test.cc
+++ b/test/create_cli_test.cc
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE (create_cli_test)
 
 	cc = run ("dcpomatic2_create x --container-ratio 185");
 	BOOST_CHECK (!cc.error);
-	BOOST_CHECK_EQUAL(cc._container_ratio, Ratio::from_id("185"));
+	BOOST_CHECK(cc._container_ratio == Ratio::from_id("185"));
 
 	cc = run ("dcpomatic2_create x --container-ratio XXX");
 	BOOST_CHECK (cc.error);
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index b99d1a572..600dbf56d 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -72,9 +72,9 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	auto g = make_shared<Film>(dir);
 	g->read_metadata ();
 
-	BOOST_CHECK_EQUAL (g->name(), "fred");
-	BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_isdcf_name ("SHR"));
-	BOOST_CHECK_EQUAL (g->container(), Ratio::from_id ("185"));
+	BOOST_CHECK_EQUAL(g->name(), "fred");
+	BOOST_CHECK_EQUAL(g->dcp_content_type(), DCPContentType::from_isdcf_name ("SHR"));
+	BOOST_CHECK(g->container() == Ratio::from_id("185"));
 
 	g->write_metadata ();
 	check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
diff --git a/test/ratio_test.cc b/test/ratio_test.cc
index a21859049..af3d9430a 100644
--- a/test/ratio_test.cc
+++ b/test/ratio_test.cc
@@ -32,44 +32,35 @@
 
 using std::ostream;
 
-BOOST_AUTO_TEST_CASE (ratio_test)
+BOOST_AUTO_TEST_CASE(ratio_test)
 {
-	Ratio const * r = Ratio::from_id ("119");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1290, 1080));
+	auto r = Ratio::from_id("119");
+	BOOST_CHECK(fit_ratio_within(r.ratio(), dcp::Size(2048, 1080)) == dcp::Size(1290, 1080));
 
-	r = Ratio::from_id ("133");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1440, 1080));
+	r = Ratio::from_id("133");
+	BOOST_CHECK(fit_ratio_within(r.ratio(), dcp::Size(2048, 1080)) == dcp::Size(1440, 1080));
 
-	r = Ratio::from_id ("138");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1485, 1080));
+	r = Ratio::from_id("138");
+	BOOST_CHECK(fit_ratio_within(r.ratio(), dcp::Size(2048, 1080)) == dcp::Size(1485, 1080));
 
-	r = Ratio::from_id ("166");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1800, 1080));
+	r = Ratio::from_id("166");
+	BOOST_CHECK(fit_ratio_within(r.ratio(), dcp::Size(2048, 1080)) == dcp::Size(1800, 1080));
 
-	r = Ratio::from_id ("178");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1920, 1080));
+	r = Ratio::from_id("178");
+	BOOST_CHECK(fit_ratio_within(r.ratio(), dcp::Size(2048, 1080)) == dcp::Size(1920, 1080));
 
-	r = Ratio::from_id ("185");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1998, 1080));
+	r = Ratio::from_id("185");
+	BOOST_CHECK(fit_ratio_within(r.ratio(), dcp::Size(2048, 1080)) == dcp::Size(1998, 1080));
 
-	r = Ratio::from_id ("239");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 858));
+	r = Ratio::from_id("239");
+	BOOST_CHECK(fit_ratio_within(r.ratio(), dcp::Size(2048, 1080)) == dcp::Size(2048, 858));
 
-	r = Ratio::from_id ("190");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 1080));
+	r = Ratio::from_id("190");
+	BOOST_CHECK(fit_ratio_within(r.ratio(), dcp::Size(2048, 1080)) == dcp::Size(2048, 1080));
 }
 
 
-BOOST_AUTO_TEST_CASE (ratios_use_same_pointers_test)
+BOOST_AUTO_TEST_CASE(ratio_equivalence_test)
 {
-	auto const test = Ratio::from_id ("119");
-	BOOST_CHECK_EQUAL (test, Ratio::from_id("119"));
+	BOOST_CHECK(Ratio::from_id("119") == Ratio::from_id("119"));
 }
diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc
index c82392f81..31e50bb76 100644
--- a/test/video_content_scale_test.cc
+++ b/test/video_content_scale_test.cc
@@ -123,7 +123,7 @@ BOOST_AUTO_TEST_CASE (scaled_size_legacy_test)
 		/* 640x480 content that the user had asked to be stretched to 1.85:1 */
 		VideoContent vc (0);
 		vc._size = dcp::Size(640, 480);
-		vc._legacy_ratio = Ratio::from_id("185")->ratio();
+		vc._legacy_ratio = Ratio::from_id("185").ratio();
 		BOOST_CHECK_EQUAL(*vc.scaled_size(FLAT), FLAT);
 	}