Various test fixes.

4 files changed, 83 insertions, 52 deletions

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index eccd7ad3..a6f234c5 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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
@@ -17,15 +17,22 @@
 
 */
 
-#include <boost/test/unit_test.hpp>
 #include "dcp.h"
 #include "metadata.h"
 #include "cpl.h"
-#include "mono_picture_asset.h"
-#include "sound_asset.h"
+#include "mono_picture_mxf.h"
+#include "picture_mxf_writer.h"
+#include "sound_mxf_writer.h"
+#include "sound_mxf.h"
+#include "subtitle_content.h"
 #include "reel.h"
 #include "test.h"
+#include "file.h"
+#include "reel_mono_picture_asset.h"
+#include "reel_sound_asset.h"
 #include "KM_util.h"
+#include <sndfile.h>
+#include <boost/test/unit_test.hpp>
 
 using boost::shared_ptr;
 
@@ -48,30 +55,51 @@ BOOST_AUTO_TEST_CASE (dcp_test)
 	boost::filesystem::remove_all ("build/test/foo");
 	boost::filesystem::create_directories ("build/test/foo");
 	dcp::DCP d ("build/test/foo");
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("build/test/foo", "A Test DCP", dcp::FEATURE, 24, 24));
+	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
 
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset ("build/test/foo", "video.mxf"));
+	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
 	mp->set_progress (&d.Progress);
-	mp->set_edit_rate (24);
-	mp->set_intrinsic_duration (24);
-	mp->set_duration (24);
-	mp->set_size (dcp::Size (32, 32));
 	mp->set_metadata (mxf_meta);
-	mp->create (j2c);
+	shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/DCP/bar/video.mxf", dcp::SMPTE, false);
+	dcp::File j2c ("test/data/32x32_red_square.j2c");
+	for (int i = 0; i < 24; ++i) {
+		picture_writer->write (j2c.data (), j2c.size ());
+	}
+	picture_writer->finalize ();
 
-	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset ("build/test/foo", "audio.mxf"));
+	shared_ptr<dcp::SoundMXF> ms (new dcp::SoundMXF (dcp::Fraction (24, 1), 48000, 1));
 	ms->set_progress (&d.Progress);
-	ms->set_edit_rate (24);
-	ms->set_intrinsic_duration (24);
-	ms->set_duration (24);
-	ms->set_channels (2);
 	ms->set_metadata (mxf_meta);
-	ms->create (wav);
+	shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/bar/audio.mxf", dcp::SMPTE);
+
+	SF_INFO info;
+	info.format = 0;
+	SNDFILE* sndfile = sf_open ("test/data/1s_24-bit_48k_silence.wav", SFM_READ, &info);
+	BOOST_CHECK (sndfile);
+	float buffer[4096*6];
+	float* channels[1];
+	channels[0] = buffer;
+	while (1) {
+		sf_count_t N = sf_readf_float (sndfile, buffer, 4096);
+		sound_writer->write (channels, N);
+		if (N < 4096) {
+			break;
+		}
+	}
+	
+	sound_writer->finalize ();
 	
-	cpl->add_reel (shared_ptr<dcp::Reel> (new dcp::Reel (mp, ms, shared_ptr<dcp::SubtitleAsset> ())));
-	d.add_cpl (cpl);
+	cpl->add (shared_ptr<dcp::Reel> (
+			  new dcp::Reel (
+				  shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)),
+				  shared_ptr<dcp::ReelSoundAsset> (new dcp::ReelSoundAsset (ms, 0)),
+				  shared_ptr<dcp::ReelSubtitleAsset> ()
+				  )
+			  ));
+		  
+	d.add (cpl);
 
-	d.write_xml (false, xml_meta);
+	d.write_xml (dcp::SMPTE, xml_meta);
 
 	/* build/test/foo is checked against test/ref/DCP/foo by run-tests.sh */
 }
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 7cd202f2..a4e8688b 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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
@@ -17,7 +17,6 @@
 
 */
 
-#include <boost/test/unit_test.hpp>
 #include "kdm.h"
 #include "KM_util.h"
 #include "metadata.h"
@@ -25,18 +24,25 @@
 #include "dcp.h"
 #include "signer.h"
 #include "cpl.h"
-#include "mono_picture_asset.h"
-#include "sound_asset.h"
+#include "mono_picture_mxf.h"
+#include "picture_mxf_writer.h"
+#include "sound_mxf.h"
 #include "reel.h"
 #include "test.h"
+#include "file.h"
 #include "signer_chain.h"
+#include "subtitle_content.h"
+#include "reel_mono_picture_asset.h"
+#include "reel_sound_asset.h"
+#include <boost/test/unit_test.hpp>
+#include <boost/shared_ptr.hpp>
 
 using boost::shared_ptr;
 
 /* 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)
+BOOST_AUTO_TEST_CASE (encryption_test)
 {
 	boost::filesystem::remove_all ("build/test/signer");
 	boost::filesystem::create_directory ("build/test/signer");
@@ -70,34 +76,29 @@ BOOST_AUTO_TEST_CASE (encryption)
 			)
 		);
 
-	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("build/test/DCP/bar", "A Test DCP", dcp::FEATURE, 24, 24));
+	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
 
 	dcp::Key key;
 	
-	shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset ("build/test/DCP/bar", "video.mxf"));
+	shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1)));
 	mp->set_progress (&d.Progress);
-	mp->set_edit_rate (24);
-	mp->set_intrinsic_duration (24);
-	mp->set_duration (24);
-	mp->set_size (dcp::Size (32, 32));
 	mp->set_metadata (mxf_metadata);
 	mp->set_key (key);
-	mp->create (j2c);
-
-	shared_ptr<dcp::SoundAsset> ms (new dcp::SoundAsset ("build/test/DCP/bar", "audio.mxf"));
-	ms->set_progress (&d.Progress);
-	ms->set_edit_rate (24);
-	ms->set_intrinsic_duration (24);
-	mp->set_duration (24);
-	ms->set_channels (2);
-	ms->set_metadata (mxf_metadata);
-	ms->set_key (key);
-	ms->create (wav);
-	
-	cpl->add_reel (shared_ptr<dcp::Reel> (new dcp::Reel (mp, ms, shared_ptr<dcp::SubtitleAsset> ())));
-	d.add_cpl (cpl);
 
-	d.write_xml (false, xml_metadata, signer);
+	shared_ptr<dcp::PictureMXFWriter> writer = mp->start_write ("build/test/DCP/bar/video.mxf", dcp::SMPTE, false);
+	dcp::File j2c ("test/data/32x32_red_square.j2c");
+	for (int i = 0; i < 24; ++i) {
+		writer->write (j2c.data (), j2c.size ());
+	}
+	writer->finalize ();
+
+	cpl->add (shared_ptr<dcp::Reel> (new dcp::Reel (
+						 shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mp, 0)),
+						 shared_ptr<dcp::ReelSoundAsset> (),
+						 shared_ptr<dcp::ReelSubtitleAsset> ()
+						 )));
+	d.add (cpl);
+	d.write_xml (dcp::SMPTE, xml_metadata, signer);
 
 	dcp::KDM kdm (
 		cpl,
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 8b1efbd7..e94d8c72 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -17,8 +17,6 @@
 
 */
 
-#include <iostream>
-#include <boost/test/unit_test.hpp>
 #include "certificates.h"
 #include "kdm.h"
 #include "signer.h"
@@ -32,7 +30,10 @@
 #include "signer_chain.h"
 #include "mono_picture_mxf_writer.h"
 #include "reel_picture_asset.h"
+#include "reel_mono_picture_asset.h"
 #include "file.h"
+#include <boost/test/unit_test.hpp>
+#include <iostream>
 
 using std::list;
 using boost::shared_ptr;
@@ -73,7 +74,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 
 	shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE));
 	shared_ptr<dcp::Reel> reel (new dcp::Reel ());
-	reel->add (shared_ptr<dcp::ReelPictureAsset> (mxf_A, 0));
+	reel->add (shared_ptr<dcp::ReelMonoPictureAsset> (new dcp::ReelMonoPictureAsset (mxf_A, 0)));
 	cpl->add (reel);
 
 	/* A KDM using our certificate chain's leaf key pair */
@@ -111,6 +112,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 		new dcp::MonoPictureMXF (work_dir / "video.mxf")
 		);
 
+	BOOST_CHECK (!kdm_B.keys().empty ());
 	mxf_B->set_key (kdm_B.keys().front().key());
 
 	shared_ptr<dcp::ARGBFrame> frame_A = mxf_A->get_frame(0)->argb_frame ();
diff --git a/test/wscript b/test/wscript
index 83232216..83253f2b 100644
--- a/test/wscript
+++ b/test/wscript
@@ -18,16 +18,16 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
-    obj.uselib = 'BOOST_TEST OPENJPEG CXML XMLSEC1'
+    obj.uselib = 'BOOST_TEST OPENJPEG CXML XMLSEC1 SNDFILE'
     obj.use    = 'libdcp'
-#                 dcp_test.cc
-#                 encryption_test.cc
     obj.source = """
                  certificates_test.cc
                  color_test.cc
                  cpl_sar_test.cc
+                 dcp_test.cc
                  dcp_time_test.cc
                  decryption_test.cc
+                 encryption_test.cc
                  frame_info_test.cc
                  kdm_key_test.cc
                  kdm_test.cc