X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frect_test.cc;h=24df333166f2ee8b1378f89ba1a7ad12760ca729;hb=3b96087f2e5bff2ef9a72285dbaa76d082d48e5a;hp=b2f70cf8947e9301f58977aa595e7f8e0c879b03;hpb=d2e8a683eed6fb82d4d255fffaf571ff27057132;p=dcpomatic.git

diff --git a/test/rect_test.cc b/test/rect_test.cc
index b2f70cf89..24df33316 100644
--- a/test/rect_test.cc
+++ b/test/rect_test.cc
@@ -1,32 +1,53 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-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/rect_test.cc
+ *  @brief Test dcpomatic::Rect class.
+ *  @ingroup selfcontained
+ */
+
+
 #include "lib/rect.h"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
+
 using boost::optional;
 
-BOOST_AUTO_TEST_CASE (rect_test)
+
+BOOST_AUTO_TEST_CASE (rect_test1)
 {
 	dcpomatic::Rect<int> a (0, 0, 100, 100);
 	dcpomatic::Rect<int> b (200, 200, 100, 100);
-	optional<dcpomatic::Rect<int> > c = a.intersection (b);
+	auto c = a.intersection (b);
 	BOOST_CHECK (!c);
 }
+
+
+BOOST_AUTO_TEST_CASE (rect_test2)
+{
+	dcpomatic::Rect<int> a (0, 330, 100, 85);
+	a.extend (dcpomatic::Rect<int>(50, 235, 100, 85));
+	BOOST_CHECK_EQUAL (a.x, 0);
+	BOOST_CHECK_EQUAL (a.y, 235);
+	BOOST_CHECK_EQUAL (a.width, 150);
+	BOOST_CHECK_EQUAL (a.height, 180);
+}