Fix rebase onto 1.0.

[libdcp.git] / test / text_test.cc

diff --git a/test/text_test.cc b/test/text_test.cc
index b8d76207c565e288771f4032681ea92d3487b0f5..a9723bb156930cc12e697268fd3369eb003777c8 100644 (file)
--- a/test/text_test.cc
+++ b/test/text_test.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "text.h"
+#include "text_node.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
@@ -31,9 +31,9 @@ BOOST_AUTO_TEST_CASE (text_test1)
        text->set_attribute("VAlign", "top");
        text->add_child_text("Hello world");
 
-       dcp::Text t (cxml::NodePtr (new cxml::Node (text)), 250);
-       BOOST_CHECK_CLOSE (t.v_position, 4.2, 0.001);
-       BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
+       dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250);
+       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");
 }
 
@@ -46,8 +46,8 @@ BOOST_AUTO_TEST_CASE (text_test2)
        text->set_attribute("Valign", "top");
        text->add_child_text("Hello world");
 
-       dcp::Text t (cxml::NodePtr (new cxml::Node (text)), 250);
-       BOOST_CHECK_CLOSE (t.v_position, 4.2, 0.001);
-       BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
+       dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250);
+       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");
 }