X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftests.cc;h=4b8efc74450bc65e6d92d97868a1d5e46d4d7664;hb=5defe5065789beeb903bcf65de05dd4468079ea7;hp=fc1603111e80ba8d27c0a9a2a00e5ed390b23c48;hpb=088f3cc5d2f200c27d76c23c480153f1b93f8230;p=libcxml.git

diff --git a/test/tests.cc b/test/tests.cc
index fc16031..4b8efc7 100644
--- a/test/tests.cc
+++ b/test/tests.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libcxml.
+
+    libcxml 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.
 
-    This program is distributed in the hope that it will be useful,
+    libcxml 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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libcxml.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,14 +24,12 @@
 #include "cxml.h"
 
 #define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE libdcp_test
+#define BOOST_TEST_MODULE libcxml_test
 #include <boost/test/unit_test.hpp>
 
+using std::shared_ptr;
 using std::string;
-using std::cout;
 using std::vector;
-using std::list;
-using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (test)
 {
@@ -62,16 +61,19 @@ BOOST_AUTO_TEST_CASE (test)
 	BOOST_CHECK_EQUAL (document.optional_bool_child("E").get(), true);
 	BOOST_CHECK_THROW (document.optional_bool_child("F"), cxml::Error);
 
-	BOOST_CHECK_EQUAL (document.node_children("F").size(), 2);
+	BOOST_CHECK_EQUAL (document.node_children("F").size(), 2U);
 	BOOST_CHECK_EQUAL (document.node_children("F").front()->content(), "1");
 	BOOST_CHECK_EQUAL (document.node_children("F").back()->content(), "2");
 
 	BOOST_CHECK (!document.optional_bool_child("G"));
 
-	BOOST_CHECK_EQUAL (document.node_children("H/I").size(), 2);
-	BOOST_CHECK_EQUAL (document.node_children("H/I").front()->content(), "testing");
-	BOOST_CHECK_EQUAL (document.node_children("H/I").back()->content(), "more testing");
+	vector<shared_ptr<cxml::Node>> h = document.node_children ("H");
+	BOOST_CHECK_EQUAL (h.size(), 1U);
+	BOOST_CHECK_EQUAL (h.front()->node_children("I").size(), 2U);
+	BOOST_CHECK_EQUAL (h.front()->node_children("I").front()->content(), "testing");
+	BOOST_CHECK_EQUAL (h.front()->node_children("I").back()->content(), "more testing");
 
-	BOOST_CHECK_EQUAL (document.string_child("J/K"), "jim");
-	BOOST_CHECK (!document.optional_bool_child("G"));
+	BOOST_CHECK_EQUAL (document.node_children("J").size(), 1U);
+	BOOST_CHECK_EQUAL (document.node_children("J").front()->node_children("K").size(), 1U);
+	BOOST_CHECK_EQUAL (document.node_children("J").front()->node_children("K").front()->content(), "jim");
 }