More tests.

diff --git a/src/types.cc b/src/types.cc
index c97fb7b402d3188857fea48d9b523c8585e13bd6..c519a03d8a21e6c0d8cc2501f5b49e945421b843 100644 (file)
--- a/src/types.cc
+++ b/src/types.cc
@@ -82,7 +82,7 @@ Colour::Colour (int r_, int g_, int b_)
 Colour::Colour (string argb_hex)
 {
        int alpha;
-       if (sscanf (argb_hex.c_str(), "%2x%2x%2x%2x", &alpha, &r, &g, &b) < 4) {
+       if (sscanf (argb_hex.c_str(), "%2x%2x%2x%2x", &alpha, &r, &g, &b) != 4) {
                boost::throw_exception (XMLError ("could not parse colour string"));
        }
 }

diff --git a/test/colour_test.cc b/test/colour_test.cc
index 5efccead429f5b0e08b5d86ce82adf432ef79cb9..f2be8ead3e164feee5ed51997573a235fa603092 100644 (file)
--- a/test/colour_test.cc
+++ b/test/colour_test.cc
@@ -17,13 +17,22 @@
 
 */
 
+#include "util.h"
+#include "exceptions.h"
 #include <boost/test/unit_test.hpp>
 
-#include "util.h"
+using std::stringstream;
 
 /* 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 +40,25 @@ 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);
+
+       stringstream s;
+       s << c;
+       BOOST_CHECK_EQUAL (s.str(), "(255, 0, 0)");
 }

diff --git a/test/effect_test.cc b/test/effect_test.cc
new file mode 100644 (file)
index 0000000..cd1a6c3
--- /dev/null
+++ b/test/effect_test.cc
@@ -0,0 +1,37 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#include "types.h"
+#include "exceptions.h"
+#include <boost/test/unit_test.hpp>
+
+/** Very simple tests of Effect-related stuff */
+BOOST_AUTO_TEST_CASE (effect_test)
+{
+       BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::NONE), "none");
+       BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::BORDER), "border");
+       BOOST_CHECK_EQUAL (dcp::effect_to_string (dcp::SHADOW), "shadow");
+
+       BOOST_CHECK_THROW (dcp::effect_to_string ((dcp::Effect) 42), dcp::MiscError);
+
+       BOOST_CHECK_EQUAL (dcp::string_to_effect ("none"), dcp::NONE);
+       BOOST_CHECK_EQUAL (dcp::string_to_effect ("border"), dcp::BORDER);
+       BOOST_CHECK_EQUAL (dcp::string_to_effect ("shadow"), dcp::SHADOW);
+       BOOST_CHECK_THROW (dcp::string_to_effect ("fish"), dcp::DCPReadError);
+}

diff --git a/test/wscript b/test/wscript
index 2bdf6a3d527b79ca8a4300c9a5c917ca91645505..13890b61af347ee2607fd07413b533fa00ffc8c9 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -31,6 +31,7 @@ def build(bld):
                  dcp_test.cc
                  dcp_time_test.cc
                  decryption_test.cc
+                 effect_test.cc
                  encryption_test.cc
                  fraction_test.cc
                  frame_info_test.cc