Neater and more correct XML subtitle parser.

3 files changed, 26 insertions, 54 deletions

diff --git a/test/read_smpte_subtitle_test.cc b/test/read_smpte_subtitle_test.cc
index 801d58cd..2aadc2dc 100644
--- a/test/read_smpte_subtitle_test.cc
+++ b/test/read_smpte_subtitle_test.cc
@@ -65,3 +65,29 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
 	BOOST_CHECK_EQUAL (sc.subtitles().back().in(), dcp::Time (0, 1, 57, 17, 25));
 	BOOST_CHECK_EQUAL (sc.subtitles().back().out(), dcp::Time (0, 1, 58, 12, 25));
 }
+
+/** And another one featuring <Font> within <Text> */
+BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
+{
+	dcp::SMPTESubtitleAsset sc (private_test / "olsson.xml");
+
+	BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 6);
+	list<dcp::SubtitleString>::const_iterator i = sc.subtitles().begin();
+	BOOST_CHECK_EQUAL (i->text(), "Testing is ");
+	BOOST_CHECK (!i->italic());
+	++i;
+	BOOST_CHECK_EQUAL (i->text(), "really");
+	BOOST_CHECK (i->italic());
+	++i;
+	BOOST_CHECK_EQUAL (i->text(), " fun!");
+	BOOST_CHECK (!i->italic());
+	++i;
+	BOOST_CHECK_EQUAL (i->text(), "This is the ");
+	BOOST_CHECK (!i->italic());
+	++i;
+	BOOST_CHECK_EQUAL (i->text(), "second");
+	BOOST_CHECK (i->italic());
+	++i;
+	BOOST_CHECK_EQUAL (i->text(), " line!");
+	BOOST_CHECK (!i->italic());
+}
diff --git a/test/text_test.cc b/test/text_test.cc
deleted file mode 100644
index 1c0cf9c4..00000000
--- a/test/text_test.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
-
-    This file is part of libdcp.
-
-    libdcp is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    libdcp is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "text_node.h"
-#include <libcxml/cxml.h>
-#include <libxml++/libxml++.h>
-#include <boost/test/unit_test.hpp>
-
-/** Simple test of Text class parsing some XML */
-BOOST_AUTO_TEST_CASE (text_test1)
-{
-	xmlpp::Document doc;
-	xmlpp::Element* text = doc.create_root_node("Text");
-	text->set_attribute("VPosition", "4.2");
-	text->set_attribute("VAlign", "top");
-	text->add_child_text("Hello world");
-
-	dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250, dcp::INTEROP);
-	BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001);
-	BOOST_CHECK_EQUAL (t.v_align, dcp::VALIGN_TOP);
-	BOOST_CHECK_EQUAL (t.text, "Hello world");
-}
-
-/** Similar to text_test1 but with different capitalisation of attribute names */
-BOOST_AUTO_TEST_CASE (text_test2)
-{
-	xmlpp::Document doc;
-	xmlpp::Element* text = doc.create_root_node("Text");
-	text->set_attribute("Vposition", "4.2");
-	text->set_attribute("Valign", "top");
-	text->add_child_text("Hello world");
-
-	dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250, dcp::INTEROP);
-	BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001);
-	BOOST_CHECK_EQUAL (t.v_align, dcp::VALIGN_TOP);
-	BOOST_CHECK_EQUAL (t.text, "Hello world");
-}
diff --git a/test/wscript b/test/wscript
index 7c84d982..ff0a908a 100644
--- a/test/wscript
+++ b/test/wscript
@@ -92,7 +92,6 @@ def build(bld):
                  smpte_load_font_test.cc
                  sound_frame_test.cc
                  test.cc
-                 text_test.cc
                  util_test.cc
                  write_subtitle_test.cc
                  """