Split test file up a bit.

8 files changed, 781 insertions, 641 deletions

diff --git a/test/certificates_test.cc b/test/certificates_test.cc
new file mode 100644
index 00000000..92c6555d
--- /dev/null
+++ b/test/certificates_test.cc
@@ -0,0 +1,44 @@
+/*
+    Copyright (C) 2012 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.
+
+*/
+
+BOOST_AUTO_TEST_CASE (certificates)
+{
+	libdcp::CertificateChain c;
+
+	c.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("test/data/crypt/ca.self-signed.pem")));
+	c.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("test/data/crypt/intermediate.signed.pem")));
+	c.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("test/data/crypt/leaf.signed.pem")));
+	
+	BOOST_CHECK_EQUAL (
+		c.root()->issuer(),
+		"/O=example.org/OU=example.org/CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION/dnQualifier=rTeK7x+nopFkyphflooz6p2ZM7A="
+		);
+	
+	BOOST_CHECK_EQUAL (
+		libdcp::Certificate::name_for_xml (c.root()->issuer()),
+		"dnQualifier=rTeK7x\\+nopFkyphflooz6p2ZM7A=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
+		);
+
+	BOOST_CHECK_EQUAL (c.root()->serial(), "5");
+
+	BOOST_CHECK_EQUAL (
+		libdcp::Certificate::name_for_xml (c.root()->subject()),
+		"dnQualifier=rTeK7x\\+nopFkyphflooz6p2ZM7A=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
+		);
+}
diff --git a/test/color_test.cc b/test/color_test.cc
new file mode 100644
index 00000000..cd66f09b
--- /dev/null
+++ b/test/color_test.cc
@@ -0,0 +1,43 @@
+/*
+    Copyright (C) 2012-2013 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.
+
+*/
+
+/* Check that libdcp::Color works */
+BOOST_AUTO_TEST_CASE (color)
+{
+	libdcp::Color c ("FFFF0000");
+
+	BOOST_CHECK_EQUAL (c.r, 255);
+	BOOST_CHECK_EQUAL (c.g, 0);
+	BOOST_CHECK_EQUAL (c.b, 0);
+	BOOST_CHECK_EQUAL (c.to_argb_string(), "FFFF0000");
+
+	c = libdcp::Color ("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");
+
+	c = libdcp::Color ("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");
+}
diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc
new file mode 100644
index 00000000..35f569cf
--- /dev/null
+++ b/test/dcp_time_test.cc
@@ -0,0 +1,56 @@
+/*
+    Copyright (C) 2013 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.
+
+*/
+
+/** Check that libdcp::Time works */
+BOOST_AUTO_TEST_CASE (dcp_time)
+{
+	libdcp::Time t (977143, 24);
+
+	BOOST_CHECK_EQUAL (t.t, 73);
+	BOOST_CHECK_EQUAL (t.s, 34);
+	BOOST_CHECK_EQUAL (t.m, 18);
+	BOOST_CHECK_EQUAL (t.h, 11);
+	BOOST_CHECK_EQUAL (t.to_string(), "11:18:34:73");
+	BOOST_CHECK_EQUAL (t.to_ticks(), 1017923);
+
+	libdcp::Time a (3, 2, 3, 4);
+	libdcp::Time b (2, 3, 4, 5);
+
+	libdcp::Time r = a - b;
+	BOOST_CHECK_EQUAL (r.h, 0);
+	BOOST_CHECK_EQUAL (r.m, 58);
+	BOOST_CHECK_EQUAL (r.s, 58);
+	BOOST_CHECK_EQUAL (r.t, 249);
+	BOOST_CHECK_EQUAL (r.to_string(), "0:58:58:249");
+	BOOST_CHECK_EQUAL (r.to_ticks(), 88699);
+
+	a = libdcp::Time (1, 58, 56, 240);
+	b = libdcp::Time (1, 7, 12, 120);
+	r = a + b;
+	BOOST_CHECK_EQUAL (r.h, 3);
+	BOOST_CHECK_EQUAL (r.m, 6);
+	BOOST_CHECK_EQUAL (r.s, 9);
+	BOOST_CHECK_EQUAL (r.t, 110);
+	BOOST_CHECK_EQUAL (r.to_string(), "3:6:9:110");
+	BOOST_CHECK_EQUAL (r.to_ticks(), 279335);
+
+	a = libdcp::Time (24, 12, 6, 3);
+	b = libdcp::Time (16, 8, 4, 2);
+	BOOST_CHECK_CLOSE (a / b, 1.5, 1e-5);
+}
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
new file mode 100644
index 00000000..04036276
--- /dev/null
+++ b/test/encryption_test.cc
@@ -0,0 +1,95 @@
+/*
+    Copyright (C) 2013 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.
+
+*/
+
+/* Load a certificate chain from build/test/data/.pem and then build
+   an encrypted DCP and a KDM using it.
+*/
+BOOST_AUTO_TEST_CASE (encryption)
+{
+	Kumu::libdcp_test = true;
+
+	libdcp::MXFMetadata mxf_metadata;
+	mxf_metadata.company_name = "OpenDCP";
+	mxf_metadata.product_name = "OpenDCP";
+	mxf_metadata.product_version = "0.0.25";
+
+	libdcp::XMLMetadata xml_metadata;
+	xml_metadata.issuer = "OpenDCP 0.0.25";
+	xml_metadata.creator = "OpenDCP 0.0.25";
+	xml_metadata.issue_date = "2012-07-17T04:45:18+00:00";
+	
+	boost::filesystem::remove_all ("build/test/bar");
+	boost::filesystem::create_directories ("build/test/bar");
+	libdcp::DCP d ("build/test/DCP/bar");
+
+	libdcp::CertificateChain chain;
+	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/data/ca.self-signed.pem")));
+	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/data/intermediate.signed.pem")));
+	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/data/leaf.signed.pem")));
+
+	shared_ptr<libdcp::Encryption> crypt (
+		new libdcp::Encryption (
+			chain,
+			"test/data/signer.key"
+			)
+		);
+
+	shared_ptr<libdcp::CPL> cpl (new libdcp::CPL ("build/test/bar", "A Test DCP", libdcp::FEATURE, 24, 24));
+	
+	shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset (
+							 j2c,
+							 "build/test/bar",
+							 "video.mxf",
+							 &d.Progress,
+							 24,
+							 24,
+							 true,
+							 libdcp::Size (32, 32),
+							 mxf_metadata
+							 ));
+
+	shared_ptr<libdcp::SoundAsset> ms (new libdcp::SoundAsset (
+						   wav,
+						   "build/test/bar",
+						   "audio.mxf",
+						   &(d.Progress),
+						   24,
+						   24,
+						   2,
+						   true,
+						   mxf_metadata
+						   ));
+	
+	cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (mp, ms, shared_ptr<libdcp::SubtitleAsset> ())));
+	d.add_cpl (cpl);
+
+	d.write_xml (xml_metadata, crypt);
+
+	shared_ptr<xmlpp::Document> kdm = cpl->make_kdm (
+		crypt->certificates,
+		crypt->signer_key,
+		crypt->certificates.leaf(),
+		boost::posix_time::time_from_string ("2013-01-01 00:00:00"),
+		boost::posix_time::time_from_string ("2013-01-08 00:00:00"),
+		mxf_metadata,
+		xml_metadata
+		);
+
+	kdm->write_to_file_formatted ("build/test/bar.kdm.xml", "UTF-8");
+}
diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
new file mode 100644
index 00000000..026073a3
--- /dev/null
+++ b/test/read_dcp_test.cc
@@ -0,0 +1,33 @@
+/*
+    Copyright (C) 2013 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.
+
+*/
+
+/* Read DCP that is in git and make sure that basic stuff is read in correctly */
+BOOST_AUTO_TEST_CASE (read_dcp)
+{
+	libdcp::DCP d ("test/ref/DCP/foo");
+	d.read ();
+
+	list<shared_ptr<const libdcp::CPL> > cpls = d.cpls ();
+	BOOST_CHECK_EQUAL (cpls.size(), 1);
+
+	BOOST_CHECK_EQUAL (cpls.front()->name(), "A Test DCP");
+	BOOST_CHECK_EQUAL (cpls.front()->content_kind(), libdcp::FEATURE);
+	BOOST_CHECK_EQUAL (cpls.front()->frames_per_second(), 24);
+	BOOST_CHECK_EQUAL (cpls.front()->length(), 24);
+}
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
new file mode 100644
index 00000000..751bf357
--- /dev/null
+++ b/test/recovery_test.cc
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2012-2013 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.
+
+*/
+
+/* Check that recovery from a partially-written MXF works */
+BOOST_AUTO_TEST_CASE (recovery)
+{
+	Kumu::libdcp_test = true;
+
+	string const picture = "test/data/32x32_red_square.j2c";
+	int const size = boost::filesystem::file_size (picture);
+	uint8_t* data = new uint8_t[size];
+	{
+		FILE* f = fopen (picture.c_str(), "rb");
+		BOOST_CHECK (f);
+		fread (data, 1, size, f);
+		fclose (f);
+	}
+
+#ifdef LIBDCP_POSIX
+	/* XXX: fix this posix-only stuff */
+	Kumu::ResetTestRNG ();
+#endif	
+	
+	boost::filesystem::remove_all ("build/test/baz");
+	boost::filesystem::create_directories ("build/test/baz");
+	shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/baz", "video1.mxf", 24, libdcp::Size (32, 32)));
+	shared_ptr<libdcp::MonoPictureAssetWriter> writer = mp->start_write (false);
+
+	int written_size = 0;
+	for (int i = 0; i < 24; ++i) {
+		libdcp::FrameInfo info = writer->write (data, size);
+		written_size = info.size;
+	}
+
+	writer->finalize ();
+	writer.reset ();
+
+	boost::filesystem::copy_file ("build/test/baz/video1.mxf", "build/test/baz/video2.mxf");
+	boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + 353 * 11);
+
+	{
+		FILE* f = fopen ("build/test/baz/video2.mxf", "r+");
+		rewind (f);
+		char zeros[256];
+		memset (zeros, 0, 256);
+		fwrite (zeros, 1, 256, f);
+		fclose (f);
+	}
+
+#ifdef LIBDCP_POSIX	
+	Kumu::ResetTestRNG ();
+#endif	
+
+	mp.reset (new libdcp::MonoPictureAsset ("build/test/baz", "video2.mxf", 24, libdcp::Size (32, 32)));
+	writer = mp->start_write (true);
+
+	writer->write (data, size);
+
+	for (int i = 1; i < 4; ++i) {
+		writer->fake_write (written_size);
+	}
+
+	for (int i = 4; i < 24; ++i) {
+		writer->write (data, size);
+	}
+	
+	writer->finalize ();
+}
diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc
new file mode 100644
index 00000000..64a3f6bd
--- /dev/null
+++ b/test/subtitle_tests.cc
@@ -0,0 +1,419 @@
+/*
+    Copyright (C) 2012-2013 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.
+
+*/
+
+/* Load a subtitle asset from XML and check that it is read correctly */
+BOOST_AUTO_TEST_CASE (subtitles1)
+{
+	libdcp::SubtitleAsset subs ("test/data", "subs1.xml");
+
+	BOOST_CHECK_EQUAL (subs.language(), "French");
+
+	list<shared_ptr<libdcp::Subtitle> > s = subs.subtitles_at (libdcp::Time (0, 0, 6, 1));
+	BOOST_CHECK_EQUAL (s.size(), 1);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   39,
+				   libdcp::Time (0, 0, 5, 198),
+				   libdcp::Time (0, 0, 7, 115),
+				   15,
+				   libdcp::BOTTOM,
+				   "My jacket was Idi Amin's",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 1),
+				   libdcp::Time (0, 0, 0, 1)
+				   ));
+							 
+	s = subs.subtitles_at (libdcp::Time (0, 0, 7, 190));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   39,
+				   libdcp::Time (0, 0, 7, 177),
+				   libdcp::Time (0, 0, 11, 31),
+				   21,
+				   libdcp::BOTTOM,
+				   "My corset was H.M. The Queen's",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 1),
+				   libdcp::Time (0, 0, 0, 1)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   39,
+				   libdcp::Time (0, 0, 7, 177),
+				   libdcp::Time (0, 0, 11, 31),
+				   15,
+				   libdcp::BOTTOM,
+				   "My large wonderbra",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 1),
+				   libdcp::Time (0, 0, 0, 1)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 0, 11, 95));
+	BOOST_CHECK_EQUAL (s.size(), 1);
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   39,
+				   libdcp::Time (0, 0, 11, 94),
+				   libdcp::Time (0, 0, 13, 63),
+				   15,
+				   libdcp::BOTTOM,
+				   "Once belonged to the Shah",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 1),
+				   libdcp::Time (0, 0, 0, 1)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 0, 14, 42));
+	BOOST_CHECK_EQUAL (s.size(), 1);
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   39,
+				   libdcp::Time (0, 0, 13, 104),
+				   libdcp::Time (0, 0, 15, 177),
+				   15,
+				   libdcp::BOTTOM,
+				   "And these are Roy Hattersley's jeans",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 1),
+				   libdcp::Time (0, 0, 0, 1)
+				   ));
+}
+
+/** And similarly for another one */
+BOOST_AUTO_TEST_CASE (subtitles2)
+{
+	libdcp::SubtitleAsset subs ("test/data", "subs2.xml");
+
+	list<shared_ptr<libdcp::Subtitle> > s = subs.subtitles_at (libdcp::Time (0, 0, 42, 100));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 0, 41, 62),
+				   libdcp::Time (0, 0, 43, 52),
+				   89,
+				   libdcp::TOP,
+				   "At afternoon tea with John Peel",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 0, 41, 62),
+				   libdcp::Time (0, 0, 43, 52),
+				   95,
+				   libdcp::TOP,
+				   "I enquired if his accent was real",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 0, 50, 50));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 0, 50, 42),
+				   libdcp::Time (0, 0, 52, 21),
+				   89,
+				   libdcp::TOP,
+				   "He said \"out of the house",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 0, 50, 42),
+				   libdcp::Time (0, 0, 52, 21),
+				   95,
+				   libdcp::TOP,
+				   "I'm incredibly scouse",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 1, 2, 300));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 2, 208),
+				   libdcp::Time (0, 1, 4, 10),
+				   89,
+				   libdcp::TOP,
+				   "At home it depends how I feel.\"",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 2, 208),
+				   libdcp::Time (0, 1, 4, 10),
+				   95,
+				   libdcp::TOP,
+				   "I spent a long weekend in Brighton",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 1, 15, 50));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 15, 42),
+				   libdcp::Time (0, 1, 16, 42),
+				   89,
+				   libdcp::TOP,
+				   "With the legendary Miss Enid Blyton",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 15, 42),
+				   libdcp::Time (0, 1, 16, 42),
+				   95,
+				   libdcp::TOP,
+				   "She said \"you be Noddy",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 1, 27, 200));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 27, 115),
+				   libdcp::Time (0, 1, 28, 208),
+				   89,
+				   libdcp::TOP,
+				   "That curious creature the Sphinx",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 27, 115),
+				   libdcp::Time (0, 1, 28, 208),
+				   95,
+				   libdcp::TOP,
+				   "Is smarter than anyone thinks",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 1, 42, 300));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 42, 229),
+				   libdcp::Time (0, 1, 45, 62),
+				   89,
+				   libdcp::TOP,
+				   "It sits there and smirks",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 42, 229),
+				   libdcp::Time (0, 1, 45, 62),
+				   95,
+				   libdcp::TOP,
+				   "And you don't think it works",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 1, 45, 200));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 45, 146),
+				   libdcp::Time (0, 1, 47, 94),
+				   89,
+				   libdcp::TOP,
+				   "Then when you're not looking, it winks.",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 45, 146),
+				   libdcp::Time (0, 1, 47, 94),
+				   95,
+				   libdcp::TOP,
+				   "When it snows you will find Sister Sledge",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 1, 47, 249));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 47, 146),
+				   libdcp::Time (0, 1, 48, 167),
+				   89,
+				   libdcp::TOP,
+				   "Out mooning, at night, on the ledge",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   false,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 1, 47, 146),
+				   libdcp::Time (0, 1, 48, 167),
+				   95,
+				   libdcp::TOP,
+				   "One storey down",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	s = subs.subtitles_at (libdcp::Time (0, 2, 6, 210));
+	BOOST_CHECK_EQUAL (s.size(), 2);
+	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 2, 5, 208),
+				   libdcp::Time (0, 2, 7, 31),
+				   89,
+				   libdcp::TOP,
+				   "HELLO",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
+				   "Arial",
+				   true,
+				   libdcp::Color (255, 255, 255),
+				   42,
+				   libdcp::Time (0, 2, 5, 208),
+				   libdcp::Time (0, 2, 7, 31),
+				   95,
+				   libdcp::TOP,
+				   "WORLD",
+				   libdcp::BORDER,
+				   libdcp::Color (0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0),
+				   libdcp::Time (0, 0, 0, 0)
+				   ));
+
+	
+	
+}
diff --git a/test/tests.cc b/test/tests.cc
index 328ab018..1a29857a 100644
--- a/test/tests.cc
+++ b/test/tests.cc
@@ -46,7 +46,6 @@ using std::vector;
 using std::list;
 using boost::shared_ptr;
 
-
 struct TestConfig
 {
 	TestConfig()
@@ -57,7 +56,6 @@ struct TestConfig
 
 BOOST_GLOBAL_FIXTURE (TestConfig);
 
-
 static string
 j2c (int)
 {
@@ -72,555 +70,11 @@ wav (libdcp::Channel)
 
 #include "dcp_test.cc"
 #include "error_test.cc"
-
-BOOST_AUTO_TEST_CASE (read_dcp)
-{
-	libdcp::DCP d ("test/ref/DCP/foo");
-	d.read ();
-
-	list<shared_ptr<const libdcp::CPL> > cpls = d.cpls ();
-	BOOST_CHECK_EQUAL (cpls.size(), 1);
-
-	BOOST_CHECK_EQUAL (cpls.front()->name(), "A Test DCP");
-	BOOST_CHECK_EQUAL (cpls.front()->content_kind(), libdcp::FEATURE);
-	BOOST_CHECK_EQUAL (cpls.front()->frames_per_second(), 24);
-	BOOST_CHECK_EQUAL (cpls.front()->length(), 24);
-}
-	
-BOOST_AUTO_TEST_CASE (subtitles1)
-{
-	libdcp::SubtitleAsset subs ("test/data", "subs1.xml");
-
-	BOOST_CHECK_EQUAL (subs.language(), "French");
-
-	list<shared_ptr<libdcp::Subtitle> > s = subs.subtitles_at (libdcp::Time (0, 0, 6, 1));
-	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   39,
-				   libdcp::Time (0, 0, 5, 198),
-				   libdcp::Time (0, 0, 7, 115),
-				   15,
-				   libdcp::BOTTOM,
-				   "My jacket was Idi Amin's",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 1),
-				   libdcp::Time (0, 0, 0, 1)
-				   ));
-							 
-	s = subs.subtitles_at (libdcp::Time (0, 0, 7, 190));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   39,
-				   libdcp::Time (0, 0, 7, 177),
-				   libdcp::Time (0, 0, 11, 31),
-				   21,
-				   libdcp::BOTTOM,
-				   "My corset was H.M. The Queen's",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 1),
-				   libdcp::Time (0, 0, 0, 1)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   39,
-				   libdcp::Time (0, 0, 7, 177),
-				   libdcp::Time (0, 0, 11, 31),
-				   15,
-				   libdcp::BOTTOM,
-				   "My large wonderbra",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 1),
-				   libdcp::Time (0, 0, 0, 1)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 0, 11, 95));
-	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   39,
-				   libdcp::Time (0, 0, 11, 94),
-				   libdcp::Time (0, 0, 13, 63),
-				   15,
-				   libdcp::BOTTOM,
-				   "Once belonged to the Shah",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 1),
-				   libdcp::Time (0, 0, 0, 1)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 0, 14, 42));
-	BOOST_CHECK_EQUAL (s.size(), 1);
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   39,
-				   libdcp::Time (0, 0, 13, 104),
-				   libdcp::Time (0, 0, 15, 177),
-				   15,
-				   libdcp::BOTTOM,
-				   "And these are Roy Hattersley's jeans",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 1),
-				   libdcp::Time (0, 0, 0, 1)
-				   ));
-}
-
-BOOST_AUTO_TEST_CASE (subtitles2)
-{
-	libdcp::SubtitleAsset subs ("test/data", "subs2.xml");
-
-	list<shared_ptr<libdcp::Subtitle> > s = subs.subtitles_at (libdcp::Time (0, 0, 42, 100));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 0, 41, 62),
-				   libdcp::Time (0, 0, 43, 52),
-				   89,
-				   libdcp::TOP,
-				   "At afternoon tea with John Peel",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 0, 41, 62),
-				   libdcp::Time (0, 0, 43, 52),
-				   95,
-				   libdcp::TOP,
-				   "I enquired if his accent was real",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 0, 50, 50));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 0, 50, 42),
-				   libdcp::Time (0, 0, 52, 21),
-				   89,
-				   libdcp::TOP,
-				   "He said \"out of the house",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 0, 50, 42),
-				   libdcp::Time (0, 0, 52, 21),
-				   95,
-				   libdcp::TOP,
-				   "I'm incredibly scouse",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 1, 2, 300));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 2, 208),
-				   libdcp::Time (0, 1, 4, 10),
-				   89,
-				   libdcp::TOP,
-				   "At home it depends how I feel.\"",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 2, 208),
-				   libdcp::Time (0, 1, 4, 10),
-				   95,
-				   libdcp::TOP,
-				   "I spent a long weekend in Brighton",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 1, 15, 50));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 15, 42),
-				   libdcp::Time (0, 1, 16, 42),
-				   89,
-				   libdcp::TOP,
-				   "With the legendary Miss Enid Blyton",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 15, 42),
-				   libdcp::Time (0, 1, 16, 42),
-				   95,
-				   libdcp::TOP,
-				   "She said \"you be Noddy",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 1, 27, 200));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 27, 115),
-				   libdcp::Time (0, 1, 28, 208),
-				   89,
-				   libdcp::TOP,
-				   "That curious creature the Sphinx",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 27, 115),
-				   libdcp::Time (0, 1, 28, 208),
-				   95,
-				   libdcp::TOP,
-				   "Is smarter than anyone thinks",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 1, 42, 300));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 42, 229),
-				   libdcp::Time (0, 1, 45, 62),
-				   89,
-				   libdcp::TOP,
-				   "It sits there and smirks",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 42, 229),
-				   libdcp::Time (0, 1, 45, 62),
-				   95,
-				   libdcp::TOP,
-				   "And you don't think it works",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 1, 45, 200));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 45, 146),
-				   libdcp::Time (0, 1, 47, 94),
-				   89,
-				   libdcp::TOP,
-				   "Then when you're not looking, it winks.",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 45, 146),
-				   libdcp::Time (0, 1, 47, 94),
-				   95,
-				   libdcp::TOP,
-				   "When it snows you will find Sister Sledge",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 1, 47, 249));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 47, 146),
-				   libdcp::Time (0, 1, 48, 167),
-				   89,
-				   libdcp::TOP,
-				   "Out mooning, at night, on the ledge",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   false,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 1, 47, 146),
-				   libdcp::Time (0, 1, 48, 167),
-				   95,
-				   libdcp::TOP,
-				   "One storey down",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	s = subs.subtitles_at (libdcp::Time (0, 2, 6, 210));
-	BOOST_CHECK_EQUAL (s.size(), 2);
-	BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 2, 5, 208),
-				   libdcp::Time (0, 2, 7, 31),
-				   89,
-				   libdcp::TOP,
-				   "HELLO",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-	BOOST_CHECK_EQUAL (*(s.back().get()), libdcp::Subtitle (
-				   "Arial",
-				   true,
-				   libdcp::Color (255, 255, 255),
-				   42,
-				   libdcp::Time (0, 2, 5, 208),
-				   libdcp::Time (0, 2, 7, 31),
-				   95,
-				   libdcp::TOP,
-				   "WORLD",
-				   libdcp::BORDER,
-				   libdcp::Color (0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0),
-				   libdcp::Time (0, 0, 0, 0)
-				   ));
-
-	
-	
-}
-
-BOOST_AUTO_TEST_CASE (dcp_time)
-{
-	libdcp::Time t (977143, 24);
-
-	BOOST_CHECK_EQUAL (t.t, 73);
-	BOOST_CHECK_EQUAL (t.s, 34);
-	BOOST_CHECK_EQUAL (t.m, 18);
-	BOOST_CHECK_EQUAL (t.h, 11);
-	BOOST_CHECK_EQUAL (t.to_string(), "11:18:34:73");
-	BOOST_CHECK_EQUAL (t.to_ticks(), 1017923);
-
-	libdcp::Time a (3, 2, 3, 4);
-	libdcp::Time b (2, 3, 4, 5);
-
-	libdcp::Time r = a - b;
-	BOOST_CHECK_EQUAL (r.h, 0);
-	BOOST_CHECK_EQUAL (r.m, 58);
-	BOOST_CHECK_EQUAL (r.s, 58);
-	BOOST_CHECK_EQUAL (r.t, 249);
-	BOOST_CHECK_EQUAL (r.to_string(), "0:58:58:249");
-	BOOST_CHECK_EQUAL (r.to_ticks(), 88699);
-
-	a = libdcp::Time (1, 58, 56, 240);
-	b = libdcp::Time (1, 7, 12, 120);
-	r = a + b;
-	BOOST_CHECK_EQUAL (r.h, 3);
-	BOOST_CHECK_EQUAL (r.m, 6);
-	BOOST_CHECK_EQUAL (r.s, 9);
-	BOOST_CHECK_EQUAL (r.t, 110);
-	BOOST_CHECK_EQUAL (r.to_string(), "3:6:9:110");
-	BOOST_CHECK_EQUAL (r.to_ticks(), 279335);
-
-	a = libdcp::Time (24, 12, 6, 3);
-	b = libdcp::Time (16, 8, 4, 2);
-	BOOST_CHECK_CLOSE (a / b, 1.5, 1e-5);
-}
-
-BOOST_AUTO_TEST_CASE (color)
-{
-	libdcp::Color c ("FFFF0000");
-
-	BOOST_CHECK_EQUAL (c.r, 255);
-	BOOST_CHECK_EQUAL (c.g, 0);
-	BOOST_CHECK_EQUAL (c.b, 0);
-	BOOST_CHECK_EQUAL (c.to_argb_string(), "FFFF0000");
-
-	c = libdcp::Color ("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");
-
-	c = libdcp::Color ("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_AUTO_TEST_CASE (encryption)
-{
-	Kumu::libdcp_test = true;
-
-	libdcp::MXFMetadata mxf_metadata;
-	mxf_metadata.company_name = "OpenDCP";
-	mxf_metadata.product_name = "OpenDCP";
-	mxf_metadata.product_version = "0.0.25";
-
-	libdcp::XMLMetadata xml_metadata;
-	xml_metadata.issuer = "OpenDCP 0.0.25";
-	xml_metadata.creator = "OpenDCP 0.0.25";
-	xml_metadata.issue_date = "2012-07-17T04:45:18+00:00";
-	
-	boost::filesystem::remove_all ("build/test/bar");
-	boost::filesystem::create_directories ("build/test/bar");
-	libdcp::DCP d ("build/test/DCP/bar");
-
-	libdcp::CertificateChain chain;
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/data/ca.self-signed.pem")));
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/data/intermediate.signed.pem")));
-	chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/data/leaf.signed.pem")));
-
-	shared_ptr<libdcp::Encryption> crypt (
-		new libdcp::Encryption (
-			chain,
-			"test/data/signer.key"
-			)
-		);
-
-	shared_ptr<libdcp::CPL> cpl (new libdcp::CPL ("build/test/bar", "A Test DCP", libdcp::FEATURE, 24, 24));
-	
-	shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset (
-							 j2c,
-							 "build/test/bar",
-							 "video.mxf",
-							 &d.Progress,
-							 24,
-							 24,
-							 true,
-							 libdcp::Size (32, 32),
-							 mxf_metadata
-							 ));
-
-	shared_ptr<libdcp::SoundAsset> ms (new libdcp::SoundAsset (
-						   wav,
-						   "build/test/bar",
-						   "audio.mxf",
-						   &(d.Progress),
-						   24,
-						   24,
-						   2,
-						   true,
-						   mxf_metadata
-						   ));
-	
-	cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (mp, ms, shared_ptr<libdcp::SubtitleAsset> ())));
-	d.add_cpl (cpl);
-
-	d.write_xml (xml_metadata, crypt);
-
-	shared_ptr<xmlpp::Document> kdm = cpl->make_kdm (
-		crypt->certificates,
-		crypt->signer_key,
-		crypt->certificates.leaf(),
-		boost::posix_time::time_from_string ("2013-01-01 00:00:00"),
-		boost::posix_time::time_from_string ("2013-01-08 00:00:00"),
-		mxf_metadata,
-		xml_metadata
-		);
-
-	kdm->write_to_file_formatted ("build/test/bar.kdm.xml", "UTF-8");
-}
+#include "read_dcp_test.cc"
+#include "subtitle_tests.cc"
+#include "dcp_time_test.cc"
+#include "color_test.cc"
+#include "recovery_test.cc"
 
 BOOST_AUTO_TEST_CASE (crypt_chain)
 {
@@ -629,93 +83,5 @@ BOOST_AUTO_TEST_CASE (crypt_chain)
 	libdcp::make_crypt_chain ("build/test/crypt");
 }
 
-BOOST_AUTO_TEST_CASE (certificates)
-{
-	libdcp::CertificateChain c;
-
-	c.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("test/data/crypt/ca.self-signed.pem")));
-	c.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("test/data/crypt/intermediate.signed.pem")));
-	c.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("test/data/crypt/leaf.signed.pem")));
-	
-	BOOST_CHECK_EQUAL (
-		c.root()->issuer(),
-		"/O=example.org/OU=example.org/CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION/dnQualifier=rTeK7x+nopFkyphflooz6p2ZM7A="
-		);
-	
-	BOOST_CHECK_EQUAL (
-		libdcp::Certificate::name_for_xml (c.root()->issuer()),
-		"dnQualifier=rTeK7x\\+nopFkyphflooz6p2ZM7A=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
-		);
-
-	BOOST_CHECK_EQUAL (c.root()->serial(), "5");
-
-	BOOST_CHECK_EQUAL (
-		libdcp::Certificate::name_for_xml (c.root()->subject()),
-		"dnQualifier=rTeK7x\\+nopFkyphflooz6p2ZM7A=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
-		);
-}
-
-BOOST_AUTO_TEST_CASE (recovery)
-{
-	Kumu::libdcp_test = true;
-
-	string const picture = "test/data/32x32_red_square.j2c";
-	int const size = boost::filesystem::file_size (picture);
-	uint8_t* data = new uint8_t[size];
-	{
-		FILE* f = fopen (picture.c_str(), "rb");
-		BOOST_CHECK (f);
-		fread (data, 1, size, f);
-		fclose (f);
-	}
-
-#ifdef LIBDCP_POSIX
-	/* XXX: fix this posix-only stuff */
-	Kumu::ResetTestRNG ();
-#endif	
-	
-	boost::filesystem::remove_all ("build/test/baz");
-	boost::filesystem::create_directories ("build/test/baz");
-	shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/baz", "video1.mxf", 24, libdcp::Size (32, 32)));
-	shared_ptr<libdcp::MonoPictureAssetWriter> writer = mp->start_write (false);
-
-	int written_size = 0;
-	for (int i = 0; i < 24; ++i) {
-		libdcp::FrameInfo info = writer->write (data, size);
-		written_size = info.size;
-	}
-
-	writer->finalize ();
-	writer.reset ();
-
-	boost::filesystem::copy_file ("build/test/baz/video1.mxf", "build/test/baz/video2.mxf");
-	boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + 353 * 11);
-
-	{
-		FILE* f = fopen ("build/test/baz/video2.mxf", "r+");
-		rewind (f);
-		char zeros[256];
-		memset (zeros, 0, 256);
-		fwrite (zeros, 1, 256, f);
-		fclose (f);
-	}
-
-#ifdef LIBDCP_POSIX	
-	Kumu::ResetTestRNG ();
-#endif	
-
-	mp.reset (new libdcp::MonoPictureAsset ("build/test/baz", "video2.mxf", 24, libdcp::Size (32, 32)));
-	writer = mp->start_write (true);
-
-	writer->write (data, size);
-
-	for (int i = 1; i < 4; ++i) {
-		writer->fake_write (written_size);
-	}
-
-	for (int i = 4; i < 24; ++i) {
-		writer->write (data, size);
-	}
-	
-	writer->finalize ();
-}
+#include "encryption_test.cc"
+#include "certificates_test.cc"