X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=0211c2cb8ae9d8e88c60a677b4b471f702daad06;hb=466216662900d6362f8fa60ed67b778f60413968;hp=3f044acf1fc97ffa7cde203e7127bea7b5c1aa0f;hpb=23e62ea48ec4da80cc37895c7dbb9826063fada8;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 3f044acf1..0211c2cb8 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -17,9 +17,14 @@
 
 */
 
+/** @file  test/test.cc
+ *  @brief Overall test stuff and useful methods for tests.
+ */
+
 #include <vector>
 #include <list>
 #include <Magick++.h>
+#include <sndfile.h>
 #include <libxml++/libxml++.h>
 #include <dcp/dcp.h>
 #include "lib/config.h"
@@ -43,7 +48,7 @@ using std::cerr;
 using std::list;
 using boost::shared_ptr;
 
-boost::filesystem::path private_data = boost::filesystem::path ("test") / boost::filesystem::path ("private");
+boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
 
 class TestUISignaller : public UISignaller
 {
@@ -63,7 +68,7 @@ struct TestConfig
 
 		Config::instance()->set_num_local_encoding_threads (1);
 		Config::instance()->set_server_port_base (61920);
-		Config::instance()->set_default_dci_metadata (DCIMetadata ());
+		Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
 		Config::instance()->set_default_container (static_cast<Ratio*> (0));
 		Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 		Config::instance()->set_default_audio_delay (0);
@@ -72,6 +77,11 @@ struct TestConfig
 
 		ui_signaller = new TestUISignaller ();
 	}
+
+	~TestConfig ()
+	{
+		JobManager::drop ();
+	}
 };
 
 BOOST_GLOBAL_FIXTURE (TestConfig);
@@ -99,12 +109,51 @@ new_test_film (string name)
 	return f;
 }
 
+void
+check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
+{
+	SF_INFO ref_info;
+	ref_info.format = 0;
+	SNDFILE* ref_file = sf_open (ref.string().c_str(), SFM_READ, &ref_info);
+	BOOST_CHECK (ref_file);
+	
+	SF_INFO check_info;
+	check_info.format = 0;
+	SNDFILE* check_file = sf_open (check.string().c_str(), SFM_READ, &check_info);
+	BOOST_CHECK (check_file);
+
+	BOOST_CHECK_EQUAL (ref_info.frames, check_info.frames);
+	BOOST_CHECK_EQUAL (ref_info.samplerate, check_info.samplerate);
+	BOOST_CHECK_EQUAL (ref_info.channels, check_info.channels);
+	BOOST_CHECK_EQUAL (ref_info.format, check_info.format);
+
+	/* buffer_size is in frames */
+	sf_count_t const buffer_size = 65536 * ref_info.channels;
+	int32_t* ref_buffer = new int32_t[buffer_size];
+	int32_t* check_buffer = new int32_t[buffer_size];
+	
+	sf_count_t N = ref_info.frames;
+	while (N) {
+		sf_count_t this_time = min (buffer_size, N);
+		sf_count_t r = sf_readf_int (ref_file, ref_buffer, this_time);
+		BOOST_CHECK_EQUAL (r, this_time);
+		r = sf_readf_int (check_file, check_buffer, this_time);
+		BOOST_CHECK_EQUAL (r, this_time);
+
+		for (sf_count_t i = 0; i < this_time; ++i) {
+			BOOST_CHECK (fabs (ref_buffer[i] - check_buffer[i]) <= 65536);
+		}
+
+		N -= this_time;
+	}
+}
+
 void
 check_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
 	uintmax_t N = boost::filesystem::file_size (ref);
 	BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
-	FILE* ref_file = fopen (ref.c_str(), "rb");
+	FILE* ref_file = fopen_boost (ref, "rb");
 	BOOST_CHECK (ref_file);
 	FILE* check_file = fopen_boost (check, "rb");
 	BOOST_CHECK (check_file);
@@ -113,6 +162,9 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 	uint8_t* ref_buffer = new uint8_t[buffer_size];
 	uint8_t* check_buffer = new uint8_t[buffer_size];
 
+	SafeStringStream error;
+	error << "File " << check.string() << " differs from reference " << ref.string();
+	
 	while (N) {
 		uintmax_t this_time = min (uintmax_t (buffer_size), N);
 		size_t r = fread (ref_buffer, 1, this_time, ref_file);
@@ -120,7 +172,11 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 		r = fread (check_buffer, 1, this_time, check_file);
 		BOOST_CHECK_EQUAL (r, this_time);
 
-		BOOST_CHECK_EQUAL (memcmp (ref_buffer, check_buffer, this_time), 0);
+		BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error.str ());
+		if (memcmp (ref_buffer, check_buffer, this_time)) {
+			break;
+		}
+		
 		N -= this_time;
 	}
 
@@ -134,7 +190,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 static void
 note (dcp::NoteType t, string n)
 {
-	if (t == dcp::ERROR) {
+	if (t == dcp::DCP_ERROR) {
 		cerr << n << "\n";
 	}
 }
@@ -153,6 +209,7 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
 	options.max_audio_sample_error = 255;
 	options.cpl_annotation_texts_can_differ = true;
 	options.mxf_names_can_differ = true;
+	options.reel_hashes_can_differ = true;
 	
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
@@ -173,7 +230,7 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 
 	xmlpp::Element::NodeList::iterator k = ref_children.begin ();
 	xmlpp::Element::NodeList::iterator l = test_children.begin ();
-	while (k != ref_children.end ()) {
+	while (k != ref_children.end () && l != test_children.end ()) {
 		
 		/* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
 
@@ -202,6 +259,9 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 		++k;
 		++l;
 	}
+
+	BOOST_CHECK (k == ref_children.end ());
+	BOOST_CHECK (l == test_children.end ());
 }
 
 void