projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We don't have python f-strings everywhere.
[dcpomatic.git]
/
test
/
rect_test.cc
diff --git
a/test/rect_test.cc
b/test/rect_test.cc
index 832fdad823fca2a9c446164a81a8b16f63930bb8..24df333166f2ee8b1378f89ba1a7ad12760ca729 100644
(file)
--- a/
test/rect_test.cc
+++ b/
test/rect_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,29
+18,34
@@
*/
*/
+
/** @file test/rect_test.cc
/** @file test/rect_test.cc
- * @brief Test Rect class.
+ * @brief Test
dcpomatic::
Rect class.
* @ingroup selfcontained
*/
* @ingroup selfcontained
*/
+
#include "lib/rect.h"
#include <boost/test/unit_test.hpp>
#include <iostream>
#include "lib/rect.h"
#include <boost/test/unit_test.hpp>
#include <iostream>
+
using boost::optional;
using boost::optional;
+
BOOST_AUTO_TEST_CASE (rect_test1)
{
dcpomatic::Rect<int> a (0, 0, 100, 100);
dcpomatic::Rect<int> b (200, 200, 100, 100);
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_CHECK (!c);
}
+
BOOST_AUTO_TEST_CASE (rect_test2)
{
dcpomatic::Rect<int> a (0, 330, 100, 85);
BOOST_AUTO_TEST_CASE (rect_test2)
{
dcpomatic::Rect<int> a (0, 330, 100, 85);
- a.extend (dcpomatic::Rect<int>
(50, 235, 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.x, 0);
BOOST_CHECK_EQUAL (a.y, 235);
BOOST_CHECK_EQUAL (a.width, 150);