X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fratio_test.cc;h=1e8d5433358db19dca2015ca2ff22735b61e4171;hb=8aec035b6ec6d8a119aef8748d571a65c3de386b;hp=c941248bf01fa485302d070c54b6a48ea7bb261a;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55;p=dcpomatic.git

diff --git a/test/ratio_test.cc b/test/ratio_test.cc
index c941248bf..1e8d54333 100644
--- a/test/ratio_test.cc
+++ b/test/ratio_test.cc
@@ -1,24 +1,26 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 /** @file  test/ratio_test.cc
- *  @brief Test Ratio and fit_ratio_within().
+ *  @brief Test Ratio class and fit_ratio_within().
+ *  @ingroup selfcontained
  */
 
 #include <iostream>
@@ -26,20 +28,10 @@
 #include <dcp/util.h>
 #include "lib/ratio.h"
 #include "lib/util.h"
+#include "test.h"
 
 using std::ostream;
 
-namespace dcp {
-	
-ostream&
-operator<< (ostream& s, dcp::Size const & t)
-{
-	s << t.width << "x" << t.height;
-	return s;
-}
-
-}
-
 BOOST_AUTO_TEST_CASE (ratio_test)
 {
 	Ratio::setup_ratios ();
@@ -52,10 +44,6 @@ BOOST_AUTO_TEST_CASE (ratio_test)
 	BOOST_CHECK (r);
 	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1440, 1080));
 
-	r = Ratio::from_id ("137");
-	BOOST_CHECK (r);
-	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1480, 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));
@@ -76,8 +64,7 @@ BOOST_AUTO_TEST_CASE (ratio_test)
 	BOOST_CHECK (r);
 	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 858));
 
-	r = Ratio::from_id ("full-frame");
+	r = Ratio::from_id ("190");
 	BOOST_CHECK (r);
 	BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 1080));
 }
-