Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 71cd50ac928b9b9cab897abc445532c7c918a55e..2620800bcc95354ce6e0fe0131d11dadabbc95ce 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -47,6 +47,7 @@ using std::cout;
 using std::cerr;
 using std::list;
 using boost::shared_ptr;
+using boost::scoped_array;
 
 boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
 
@@ -130,15 +131,15 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
 
        /* 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];
+       scoped_array<int32_t> ref_buffer (new int32_t[buffer_size]);
+       scoped_array<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);
+               sf_count_t r = sf_readf_int (ref_file, ref_buffer.get(), this_time);
                BOOST_CHECK_EQUAL (r, this_time);
-               r = sf_readf_int (check_file, check_buffer, this_time);
+               r = sf_readf_int (check_file, check_buffer.get(), this_time);
                BOOST_CHECK_EQUAL (r, this_time);
 
                for (sf_count_t i = 0; i < this_time; ++i) {
@@ -209,7 +210,7 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
        options.max_std_dev_pixel_error = 5;
        options.max_audio_sample_error = 255;
        options.cpl_annotation_texts_can_differ = true;
-       options.mxf_names_can_differ = true;
+       options.mxf_filenames_can_differ = true;
        options.reel_hashes_can_differ = true;
        
        BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
@@ -224,15 +225,15 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
        if (find (ignore.begin(), ignore.end(), ref->get_name()) != ignore.end ()) {
                return;
        }
-           
+
        xmlpp::Element::NodeList ref_children = ref->get_children ();
        xmlpp::Element::NodeList test_children = test->get_children ();
        BOOST_CHECK_EQUAL (ref_children.size (), test_children.size ());
 
        xmlpp::Element::NodeList::iterator k = ref_children.begin ();
        xmlpp::Element::NodeList::iterator l = test_children.begin ();
-       while (k != ref_children.end () && l != test_children.end ()) {
-               
+       while (k != ref_children.end ()) {
+
                /* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
 
                xmlpp::Element* ref_el = dynamic_cast<xmlpp::Element*> (*k);
@@ -249,20 +250,23 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
                        BOOST_CHECK_EQUAL (ref_cn->get_content(), test_cn->get_content ());
                }
 
-               xmlpp::Attribute* ref_at = dynamic_cast<xmlpp::Attribute*> (*k);
-               xmlpp::Attribute* test_at = dynamic_cast<xmlpp::Attribute*> (*l);
-               BOOST_CHECK ((ref_at && test_at) || (!ref_at && !test_at));
-               if (ref_at && test_at) {
-                       BOOST_CHECK_EQUAL (ref_at->get_name(), test_at->get_name ());
-                       BOOST_CHECK_EQUAL (ref_at->get_value(), test_at->get_value ());
-               }
-
                ++k;
                ++l;
        }
 
-       BOOST_CHECK (k == ref_children.end ());
-       BOOST_CHECK (l == test_children.end ());
+       xmlpp::Element::AttributeList ref_attributes = ref->get_attributes ();
+       xmlpp::Element::AttributeList test_attributes = test->get_attributes ();
+       BOOST_CHECK_EQUAL (ref_attributes.size(), test_attributes.size ());
+
+       xmlpp::Element::AttributeList::const_iterator m = ref_attributes.begin();
+       xmlpp::Element::AttributeList::const_iterator n = test_attributes.begin();
+       while (m != ref_attributes.end ()) {
+               BOOST_CHECK_EQUAL ((*m)->get_name(), (*n)->get_name());
+               BOOST_CHECK_EQUAL ((*m)->get_value(), (*n)->get_value());
+
+               ++m;
+               ++n;
+       }
 }
 
 void
@@ -309,7 +313,11 @@ wait_for_jobs ()
 void
 write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 {
-       using namespace MagickCore;
+#ifdef DCPOMATIC_IMAGE_MAGICK
+               using namespace MagickCore;
+#else
+               using namespace MagickLib;
+#endif         
 
        Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
        m.write (file.string ());