summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-02 19:22:14 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-02 19:22:14 +0100
commit552534a2a264676a5a560bbcd9bdbf8c72910a7e (patch)
tree373a1d1fd1eaf668b8f79138b62ddc9c41306f1c /test
parent713a073cae011a108e6acb69daca73abf852783c (diff)
Rename a few bits.
Diffstat (limited to 'test')
-rw-r--r--test/tests.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/tests.cc b/test/tests.cc
index 21466ca..326a813 100644
--- a/test/tests.cc
+++ b/test/tests.cc
@@ -37,24 +37,24 @@ BOOST_AUTO_TEST_CASE (test)
cxml::File file ("test/ref/a.xml", "A");
BOOST_CHECK_EQUAL (file.string_child("B"), "42");
- BOOST_CHECK_EQUAL (file.numerical_child<int>("B"), 42);
- BOOST_CHECK_EQUAL (file.numerical_child<float>("B"), 42);
+ BOOST_CHECK_EQUAL (file.number_child<int>("B"), 42);
+ BOOST_CHECK_EQUAL (file.number_child<float>("B"), 42);
BOOST_CHECK_EQUAL (file.string_child("C"), "fred");
- BOOST_CHECK_EQUAL (file.numerical_child<double>("D"), 42.9);
+ BOOST_CHECK_EQUAL (file.number_child<double>("D"), 42.9);
BOOST_CHECK_EQUAL (file.string_child("E"), "yes");
BOOST_CHECK_EQUAL (file.bool_child("E"), true);
BOOST_CHECK_THROW (file.bool_child("F"), cxml::Error);
BOOST_CHECK (file.optional_string_child("B"));
BOOST_CHECK_EQUAL (file.optional_string_child("B").get(), "42");
- BOOST_CHECK (file.optional_numerical_child<int>("B"));
- BOOST_CHECK_EQUAL (file.optional_numerical_child<int>("B").get(), 42);
- BOOST_CHECK (file.optional_numerical_child<float>("B"));
- BOOST_CHECK_EQUAL (file.optional_numerical_child<float>("B").get(), 42);
+ BOOST_CHECK (file.optional_number_child<int>("B"));
+ BOOST_CHECK_EQUAL (file.optional_number_child<int>("B").get(), 42);
+ BOOST_CHECK (file.optional_number_child<float>("B"));
+ BOOST_CHECK_EQUAL (file.optional_number_child<float>("B").get(), 42);
BOOST_CHECK (file.optional_string_child("C"));
BOOST_CHECK_EQUAL (file.optional_string_child("C").get(), "fred");
- BOOST_CHECK (file.optional_numerical_child<double>("D"));
- BOOST_CHECK_EQUAL (file.optional_numerical_child<double>("D").get(), 42.9);
+ BOOST_CHECK (file.optional_number_child<double>("D"));
+ BOOST_CHECK_EQUAL (file.optional_number_child<double>("D").get(), 42.9);
BOOST_CHECK (file.optional_string_child("E"));
BOOST_CHECK_EQUAL (file.optional_string_child("E").get(), "yes");
BOOST_CHECK (file.optional_bool_child("E"));