projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a specific path dependency from a test.
[dcpomatic.git]
/
test
/
ratio_test.cc
diff --git
a/test/ratio_test.cc
b/test/ratio_test.cc
index 84e80861b14cf3f0abb8daae63a781edbf884513..a21859049823cb9cc07db48ed223b4d0c53a8623 100644
(file)
--- a/
test/ratio_test.cc
+++ b/
test/ratio_test.cc
@@
-1,24
+1,26
@@
/*
/*
- Copyright (C) 2012-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
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.
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
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
*/
/** @file test/ratio_test.cc
- * @brief Test Ratio and fit_ratio_within().
+ * @brief Test Ratio class and fit_ratio_within().
+ * @ingroup selfcontained
*/
#include <iostream>
*/
#include <iostream>
@@
-26,13
+28,12
@@
#include <dcp/util.h>
#include "lib/ratio.h"
#include "lib/util.h"
#include <dcp/util.h>
#include "lib/ratio.h"
#include "lib/util.h"
+#include "test.h"
using std::ostream;
BOOST_AUTO_TEST_CASE (ratio_test)
{
using std::ostream;
BOOST_AUTO_TEST_CASE (ratio_test)
{
- Ratio::setup_ratios ();
-
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));
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));
@@
-41,10
+42,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));
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));
r = Ratio::from_id ("138");
BOOST_CHECK (r);
BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (1485, 1080));
@@
-65,8
+62,14
@@
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));
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));
}
BOOST_CHECK (r);
BOOST_CHECK_EQUAL (fit_ratio_within (r->ratio(), dcp::Size (2048, 1080)), dcp::Size (2048, 1080));
}
+
+BOOST_AUTO_TEST_CASE (ratios_use_same_pointers_test)
+{
+ auto const test = Ratio::from_id ("119");
+ BOOST_CHECK_EQUAL (test, Ratio::from_id("119"));
+}