X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_time_test.cc;h=504e9fd1b1689557bfbcb50095f4a0952112217a;hb=a8d652b787b986ec5552816ec24367d98243f6fa;hp=7263d924cb6d9931270829ec0bee43af57d56b0a;hpb=4946acfd735321e7f0c29ea4b6e371bc9e90a7f6;p=libdcp.git

diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc
index 7263d924..504e9fd1 100644
--- a/test/dcp_time_test.cc
+++ b/test/dcp_time_test.cc
@@ -133,24 +133,24 @@ BOOST_AUTO_TEST_CASE (dcp_time)
 	BOOST_CHECK_EQUAL (a, dcp::Time (1, 23, 45, 12, 250));
 
 	/* Check some disallowed constructions from string */
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:1234", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:1234:66", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23::123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01::45:123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time (":23:45:123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45.1234", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45.1234.66", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45.", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:.123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01::45.123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time (":23:45.123", optional<int>()), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:123", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:123:66", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23:45:", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01:23::123", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time ("01::45:123", 250), dcp::DCPReadError);
-	BOOST_CHECK_THROW (dcp::Time (":23:45:123", 250), dcp::DCPReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:1234", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:1234:66", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23::123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01::45:123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time (":23:45:123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45.1234", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45.1234.66", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45.", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:.123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01::45.123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time (":23:45.123", optional<int>()), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:123", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:123:66", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23:45:", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01:23::123", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time ("01::45:123", 250), dcp::ReadError);
+	BOOST_CHECK_THROW (dcp::Time (":23:45:123", 250), dcp::ReadError);
 
 	/* Check operator< and operator> */
 	BOOST_CHECK (dcp::Time (3, 2, 3, 4, 24) < dcp::Time (3, 2, 3, 5, 24));