Fix assertion failure after removing content.

[dcpomatic.git] / test / stream_test.cc

diff --git a/test/stream_test.cc b/test/stream_test.cc
index b4b7c260b8015cb90ddcaa13ea77fc8f5b472e4f..ecd2deac8fc3c4275544ad5e917444e170143033 100644 (file)
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -18,60 +18,63 @@
 
 */
 
+
 /** @test  test/stream_test.cc
  *  @brief Some simple tests of FFmpegAudioStream.
  */
 
-#include "lib/film.h"
-#include "lib/ffmpeg_content.h"
+
 #include "lib/ffmpeg_audio_stream.h"
-#include "lib/warnings.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/test/unit_test.hpp>
 
-using std::pair;
+
 using std::list;
-using boost::shared_ptr;
+using std::pair;
+
 
 BOOST_AUTO_TEST_CASE (stream_test)
 {
        xmlpp::Document doc;
-       xmlpp::Element* root = doc.create_root_node ("FFmpegAudioStream");
-       root->add_child("Name")->add_child_text ("hello there world");
-       root->add_child("Id")->add_child_text ("4");
-       root->add_child("FrameRate")->add_child_text ("44100");
-       root->add_child("Channels")->add_child_text ("2");
+       auto root = doc.create_root_node("FFmpegAudioStream");
+       cxml::add_text_child(root, "Name", "hello there world");
+       cxml::add_text_child(root, "Id", "4");
+       cxml::add_text_child(root, "FrameRate", "44100");
+       cxml::add_text_child(root, "Channels", "2");
 
        /* This is the state file version 5 description of the mapping */
 
-       xmlpp::Element* mapping = root->add_child("Mapping");
-       mapping->add_child("ContentChannels")->add_child_text ("2");
+       auto mapping = cxml::add_child(root, "Mapping");
+       cxml::add_text_child(mapping, "ContentChannels", "2");
        {
                /* L -> L */
-               xmlpp::Element* map = mapping->add_child ("Map");
-               map->add_child("ContentIndex")->add_child_text ("0");
-               map->add_child("DCP")->add_child_text ("0");
+               auto map = cxml::add_child(mapping, "Map");
+               cxml::add_text_child(map, "ContentIndex", "0");
+               cxml::add_text_child(map, "DCP", "0");
        }
        {
                /* L -> C */
-               xmlpp::Element* map = mapping->add_child ("Map");
-               map->add_child("ContentIndex")->add_child_text ("0");
-               map->add_child("DCP")->add_child_text ("2");
+               auto map = cxml::add_child(mapping, "Map");
+               cxml::add_text_child(map, "ContentIndex", "0");
+               cxml::add_text_child(map, "DCP", "2");
        }
        {
                /* R -> R */
-               xmlpp::Element* map = mapping->add_child ("Map");
-               map->add_child("ContentIndex")->add_child_text ("1");
-               map->add_child("DCP")->add_child_text ("1");
+               auto map = cxml::add_child(mapping, "Map");
+               cxml::add_text_child(map, "ContentIndex", "1");
+               cxml::add_text_child(map, "DCP", "1");
        }
        {
                /* R -> C */
-               xmlpp::Element* map = mapping->add_child ("Map");
-               map->add_child("ContentIndex")->add_child_text ("1");
-               map->add_child("DCP")->add_child_text ("2");
+               auto map = cxml::add_child(mapping, "Map");
+               cxml::add_text_child(map, "ContentIndex", "1");
+               cxml::add_text_child(map, "DCP", "2");
        }
 
        FFmpegAudioStream a (cxml::NodePtr (new cxml::Node (root)), 5);
@@ -82,11 +85,11 @@ BOOST_AUTO_TEST_CASE (stream_test)
        BOOST_CHECK_EQUAL (a.name, "hello there world");
        BOOST_CHECK_EQUAL (a.mapping().input_channels(), 2);
 
-       BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::LEFT)), 1);
-       BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::RIGHT)), 0);
-       BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::CENTRE)), 1);
-       BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::LEFT)), 0);
-       BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::RIGHT)), 1);
-       BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::CENTRE)), 1);
+       BOOST_CHECK_EQUAL (a.mapping().get(0, dcp::Channel::LEFT), 1);
+       BOOST_CHECK_EQUAL (a.mapping().get(0, dcp::Channel::RIGHT), 0);
+       BOOST_CHECK_EQUAL (a.mapping().get(0, dcp::Channel::CENTRE), 1);
+       BOOST_CHECK_EQUAL (a.mapping().get(1, dcp::Channel::LEFT), 0);
+       BOOST_CHECK_EQUAL (a.mapping().get(1, dcp::Channel::RIGHT), 1);
+       BOOST_CHECK_EQUAL (a.mapping().get(1, dcp::Channel::CENTRE), 1);
 }