Fix parameters when running tests with valgrind.

[libdcp.git] / test / colour_test.cc

diff --git a/test/colour_test.cc b/test/colour_test.cc
index 5efccead429f5b0e08b5d86ce82adf432ef79cb9..d1ca62a1c9aa01f7c97d4a929eaf2d96b2c44701 100644 (file)
--- a/test/colour_test.cc
+++ b/test/colour_test.cc
@@ -1,29 +1,50 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
 
-*/
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
-#include <boost/test/unit_test.hpp>
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
+*/
 
 #include "util.h"
+#include "exceptions.h"
+#include <boost/test/unit_test.hpp>
 
-/* Check that dcp::Colour works */
+/** Check that dcp::Colour works */
 BOOST_AUTO_TEST_CASE (colour)
 {
+       dcp::Colour z;
+
+       BOOST_CHECK_EQUAL (z.r, 0);
+       BOOST_CHECK_EQUAL (z.g, 0);
+       BOOST_CHECK_EQUAL (z.b, 0);
+       BOOST_CHECK_EQUAL (z.to_argb_string(), "FF000000");
+
        dcp::Colour c ("FFFF0000");
 
        BOOST_CHECK_EQUAL (c.r, 255);
@@ -31,17 +52,21 @@ BOOST_AUTO_TEST_CASE (colour)
        BOOST_CHECK_EQUAL (c.b, 0);
        BOOST_CHECK_EQUAL (c.to_argb_string(), "FFFF0000");
 
-       c = dcp::Colour ("FF00FF00");
+       dcp::Colour d = dcp::Colour ("FF00FF00");
 
-       BOOST_CHECK_EQUAL (c.r, 0);
-       BOOST_CHECK_EQUAL (c.g, 255);
-       BOOST_CHECK_EQUAL (c.b, 0);
-       BOOST_CHECK_EQUAL (c.to_argb_string(), "FF00FF00");
+       BOOST_CHECK_EQUAL (d.r, 0);
+       BOOST_CHECK_EQUAL (d.g, 255);
+       BOOST_CHECK_EQUAL (d.b, 0);
+       BOOST_CHECK_EQUAL (d.to_argb_string(), "FF00FF00");
 
-       c = dcp::Colour ("FF0000FF");
+       dcp::Colour e = dcp::Colour ("FF0000FF");
 
-       BOOST_CHECK_EQUAL (c.r, 0);
-       BOOST_CHECK_EQUAL (c.g, 0);
-       BOOST_CHECK_EQUAL (c.b, 255);
-       BOOST_CHECK_EQUAL (c.to_argb_string(), "FF0000FF");
+       BOOST_CHECK_EQUAL (e.r, 0);
+       BOOST_CHECK_EQUAL (e.g, 0);
+       BOOST_CHECK_EQUAL (e.b, 255);
+       BOOST_CHECK_EQUAL (e.to_argb_string(), "FF0000FF");
+
+       BOOST_CHECK (c != d);
+
+       BOOST_CHECK_THROW (dcp::Colour ("001234"), dcp::XMLError);
 }