diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/mca_test.cc | 8 | ||||
| -rw-r--r-- | test/test.cc | 18 | ||||
| -rw-r--r-- | test/test.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/test/mca_test.cc b/test/mca_test.cc index 1cd95732..e6b0dfab 100644 --- a/test/mca_test.cc +++ b/test/mca_test.cc @@ -80,10 +80,10 @@ BOOST_AUTO_TEST_CASE (parse_mca_descriptors_from_mxf_test) vector<string> ignore; check_xml ( - dynamic_cast<xmlpp::Element*>( + dynamic_cast<xmlpp::Element const*>( ref.node_child("ReelList")->node_children("Reel").front()->node_child("AssetList")->node_child("CompositionMetadataAsset")->node_child("MCASubDescriptors")->node() ), - dynamic_cast<xmlpp::Element*>( + dynamic_cast<xmlpp::Element const*>( check.node_child("ReelList")->node_children("Reel").front()->node_child("AssetList")->node_child("CompositionMetadataAsset")->node_child("MCASubDescriptors")->node() ), ignore, @@ -132,10 +132,10 @@ BOOST_AUTO_TEST_CASE (write_mca_descriptors_to_mxf_test) cxml::Document check("CompositionPlaylist", "build/test/write_mca_descriptors_to_mxf_test/cpl.xml"); check_xml ( - dynamic_cast<xmlpp::Element*>( + dynamic_cast<xmlpp::Element const*>( ref.node_child("ReelList")->node_children("Reel")[0]->node_child("AssetList")->node_child("CompositionMetadataAsset")->node_child("MCASubDescriptors")->node() ), - dynamic_cast<xmlpp::Element*>( + dynamic_cast<xmlpp::Element const*>( check.node_child("ReelList")->node_children("Reel")[0]->node_child("AssetList")->node_child("CompositionMetadataAsset")->node_child("MCASubDescriptors")->node() ), { "InstanceID", "MCALinkID", "SoundfieldGroupLinkID" }, diff --git a/test/test.cc b/test/test.cc index 65649efd..0de9c73c 100644 --- a/test/test.cc +++ b/test/test.cc @@ -116,7 +116,7 @@ struct TestConfig void -check_xml (xmlpp::Element* ref, xmlpp::Element* test, vector<string> ignore_tags, bool ignore_whitespace) +check_xml(xmlpp::Element const* ref, xmlpp::Element const* test, vector<string> ignore_tags, bool ignore_whitespace) { BOOST_CHECK_EQUAL (ref->get_name (), test->get_name ()); BOOST_CHECK_EQUAL (ref->get_namespace_prefix (), test->get_namespace_prefix ()); @@ -125,8 +125,8 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, vector<string> ignore_tags return; } - auto whitespace_content = [](xmlpp::Node* node) { - auto content = dynamic_cast<xmlpp::ContentNode*>(node); + auto whitespace_content = [](xmlpp::Node const* node) { + auto content = dynamic_cast<xmlpp::ContentNode const*>(node); return content && content->get_content().find_first_not_of(" \t\r\n") == string::npos; }; @@ -137,12 +137,12 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, vector<string> ignore_tags auto l = test_children.begin (); while (k != ref_children.end() && l != test_children.end()) { - if (dynamic_cast<xmlpp::CommentNode*>(*k)) { + if (dynamic_cast<xmlpp::CommentNode const*>(*k)) { ++k; continue; } - if (dynamic_cast<xmlpp::CommentNode*>(*l)) { + if (dynamic_cast<xmlpp::CommentNode const*>(*l)) { ++l; continue; } @@ -159,15 +159,15 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, vector<string> ignore_tags /* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */ - auto ref_el = dynamic_cast<xmlpp::Element*> (*k); - auto test_el = dynamic_cast<xmlpp::Element*> (*l); + auto ref_el = dynamic_cast<xmlpp::Element const*>(*k); + auto test_el = dynamic_cast<xmlpp::Element const*>(*l); BOOST_CHECK ((ref_el && test_el) || (!ref_el && !test_el)); if (ref_el && test_el) { check_xml (ref_el, test_el, ignore_tags, ignore_whitespace); } - auto ref_cn = dynamic_cast<xmlpp::ContentNode*> (*k); - auto test_cn = dynamic_cast<xmlpp::ContentNode*> (*l); + auto ref_cn = dynamic_cast<xmlpp::ContentNode const*>(*k); + auto test_cn = dynamic_cast<xmlpp::ContentNode const*>(*l); BOOST_CHECK ((ref_cn && test_cn) || (!ref_cn && !test_cn)); if (ref_cn && test_cn) { BOOST_CHECK_EQUAL (ref_cn->get_content(), test_cn->get_content()); diff --git a/test/test.h b/test/test.h index d796a4a4..28c3b70a 100644 --- a/test/test.h +++ b/test/test.h @@ -40,7 +40,7 @@ namespace dcp { extern boost::filesystem::path private_test; extern boost::filesystem::path xsd_test; -extern void check_xml (xmlpp::Element* ref, xmlpp::Element* test, std::vector<std::string> ignore_tags, bool ignore_whitespace = false); +extern void check_xml(xmlpp::Element const* ref, xmlpp::Element const* test, std::vector<std::string> ignore_tags, bool ignore_whitespace = false); extern void check_xml (std::string ref, std::string test, std::vector<std::string> ignore, bool ignore_whitespace = false); extern void check_file (boost::filesystem::path ref, boost::filesystem::path check); extern std::shared_ptr<dcp::MonoJ2KPictureAsset> simple_picture ( |