From ff16dbdd4c63fa46cc1f38eda4cfb66f38047657 Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Sat, 13 Dec 2014 20:34:10 -0800 Subject: Don't use off64_t/_wfopen on MinGW32 in C++11 mode Unfortunately, standard headers on MinGW32 insist on undefining off64_t and _wfopen extensions if __STRICT_ANSI__ is true (e.g. C++11 mode). This leads to compilation errors since b7a1fec started to use _wfopen in strict mode. That change erroneously checked GCC version - however, the version itself is irrelevant; the actual criteria is whether mingw64 runtime is used. off64_t is not useful on MinGW32 since we only need it to open large files on 64-bit platforms; unfortunately, the lack of _wfopen means we won't be able to support wide-char paths on Windows for MinGW32. Fixes #24. --- tests/test_document.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_document.cpp b/tests/test_document.cpp index f57465f..ebcdcd1 100644 --- a/tests/test_document.cpp +++ b/tests/test_document.cpp @@ -323,7 +323,7 @@ TEST(document_load_file_wide_ascii) CHECK_NODE(doc, STR("")); } -#if !defined(__DMC__) && !defined(__MWERKS__) && !(defined(__MINGW32__) && defined(__STRICT_ANSI__) && __GNUC__ * 100 + __GNUC_MINOR__ <= 405) +#if !defined(__DMC__) && !defined(__MWERKS__) && !(defined(__MINGW32__) && defined(__STRICT_ANSI__) && !defined(__MINGW64_VERSION_MAJOR)) TEST(document_load_file_wide_unicode) { pugi::xml_document doc; -- cgit v1.2.3 From f3e42969a5118247de548c059e9bed69cdf208bb Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Fri, 9 Jan 2015 19:29:23 -0800 Subject: Simplify header-only mode usage It's sufficient to define PUGIXML_HEADER_ONLY anywhere now, source is included automatically. This is a second attempt; this time it includes a workaround for QMake bug that caused it to generate incorrect Makefile. --- tests/test_header_only.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 tests/test_header_only.cpp (limited to 'tests') diff --git a/tests/test_header_only.cpp b/tests/test_header_only.cpp new file mode 100644 index 0000000..f1990dd --- /dev/null +++ b/tests/test_header_only.cpp @@ -0,0 +1,16 @@ +#define PUGIXML_HEADER_ONLY +#define pugi pugih + +#include "common.hpp" + +// Check header guards +#include "../src/pugixml.hpp" +#include "../src/pugixml.hpp" + +TEST(header_only) +{ + xml_document doc; + CHECK(doc.load_string(STR(""))); + CHECK_STRING(doc.first_child().name(), STR("node")); + CHECK(doc.first_child() == doc.select_node(STR("//*")).node()); +} -- cgit v1.2.3 From cf72c20ca173bbad227e8f70bd68a2dbfb5b2890 Mon Sep 17 00:00:00 2001 From: Steve Doiel Date: Fri, 16 Jan 2015 16:14:59 -0800 Subject: Increase precision on large number test --- tests/test_dom_modify.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/test_dom_modify.cpp b/tests/test_dom_modify.cpp index 7863718..85c381e 100644 --- a/tests/test_dom_modify.cpp +++ b/tests/test_dom_modify.cpp @@ -753,8 +753,8 @@ TEST_XML(dom_attr_assign_large_number, "") node.attribute(STR("attr1")) = std::numeric_limits::max(); node.attribute(STR("attr2")) = std::numeric_limits::max(); - CHECK(test_node(node, STR(""), STR(""), pugi::format_raw) || - test_node(node, STR(""), STR(""), pugi::format_raw)); + CHECK(test_node(node, STR(""), STR(""), pugi::format_raw) || + test_node(node, STR(""), STR(""), pugi::format_raw)); } TEST(dom_node_declaration_name) -- cgit v1.2.3 From f9ee391233ed8526597abb3ffa96c4eb8b1c92ad Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Fri, 16 Jan 2015 21:42:35 -0800 Subject: tests: Add coverage tests for new float setters These only do basic testing to make sure the paths are covered and trivial values work. --- tests/test_dom_modify.cpp | 16 +++++++++++----- tests/test_dom_text.cpp | 14 ++++++++++---- 2 files changed, 21 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/test_dom_modify.cpp b/tests/test_dom_modify.cpp index 85c381e..70cba53 100644 --- a/tests/test_dom_modify.cpp +++ b/tests/test_dom_modify.cpp @@ -21,10 +21,13 @@ TEST_XML(dom_attr_assign, "") node.append_attribute(STR("attr6")) = 0.5; xml_attribute() = 0.5; - node.append_attribute(STR("attr7")) = true; + node.append_attribute(STR("attr7")) = 0.25f; + xml_attribute() = 0.25f; + + node.append_attribute(STR("attr8")) = true; xml_attribute() = true; - CHECK_NODE(node, STR("")); + CHECK_NODE(node, STR("")); } TEST_XML(dom_attr_set_name, "") @@ -55,10 +58,13 @@ TEST_XML(dom_attr_set_value, "") CHECK(node.append_attribute(STR("attr6")).set_value(0.5)); CHECK(!xml_attribute().set_value(0.5)); - CHECK(node.append_attribute(STR("attr7")).set_value(true)); + CHECK(node.append_attribute(STR("attr7")).set_value(0.25f)); + CHECK(!xml_attribute().set_value(0.25f)); + + CHECK(node.append_attribute(STR("attr8")).set_value(true)); CHECK(!xml_attribute().set_value(true)); - CHECK_NODE(node, STR("")); + CHECK_NODE(node, STR("")); } #ifdef PUGIXML_HAS_LONG_LONG @@ -753,7 +759,7 @@ TEST_XML(dom_attr_assign_large_number, "") node.attribute(STR("attr1")) = std::numeric_limits::max(); node.attribute(STR("attr2")) = std::numeric_limits::max(); - CHECK(test_node(node, STR(""), STR(""), pugi::format_raw) || + CHECK(test_node(node, STR(""), STR(""), pugi::format_raw) || test_node(node, STR(""), STR(""), pugi::format_raw)); } diff --git a/tests/test_dom_text.cpp b/tests/test_dom_text.cpp index fb65b03..007334a 100644 --- a/tests/test_dom_text.cpp +++ b/tests/test_dom_text.cpp @@ -263,10 +263,13 @@ TEST_XML(dom_text_assign, "") node.append_child(STR("text6")).text() = 0.5; xml_text() = 0.5; - node.append_child(STR("text7")).text() = true; + node.append_child(STR("text7")).text() = 0.25f; + xml_text() = 0.25f; + + node.append_child(STR("text8")).text() = true; xml_text() = true; - CHECK_NODE(node, STR("v1-2147483647-2147483648429496729542949672940.5true")); + CHECK_NODE(node, STR("v1-2147483647-2147483648429496729542949672940.50.25true")); } TEST_XML(dom_text_set_value, "") @@ -287,10 +290,13 @@ TEST_XML(dom_text_set_value, "") CHECK(node.append_child(STR("text6")).text().set(0.5)); CHECK(!xml_text().set(0.5)); - CHECK(node.append_child(STR("text7")).text().set(true)); + CHECK(node.append_child(STR("text7")).text().set(0.25f)); + CHECK(!xml_text().set(0.25f)); + + CHECK(node.append_child(STR("text8")).text().set(true)); CHECK(!xml_text().set(true)); - CHECK_NODE(node, STR("v1-2147483647-2147483648429496729542949672940.5true")); + CHECK_NODE(node, STR("v1-2147483647-2147483648429496729542949672940.50.25true")); } #ifdef PUGIXML_HAS_LONG_LONG -- cgit v1.2.3 From d454013cffe1be5819bfb6329b1aa218b8de618f Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Fri, 16 Jan 2015 21:43:28 -0800 Subject: tests: Add tests for fp roundtrip We test min/max and several different mantissas for the entire exponent range for both float and double. It's not clear whether all supported compilers provide an implementation of sprintf/strtod that supports roundtripping so we may need to disable some of these tests in the future. --- tests/test_dom_modify.cpp | 84 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 73 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/test_dom_modify.cpp b/tests/test_dom_modify.cpp index 70cba53..1fb9dd3 100644 --- a/tests/test_dom_modify.cpp +++ b/tests/test_dom_modify.cpp @@ -2,6 +2,7 @@ #include #include +#include TEST_XML(dom_attr_assign, "") { @@ -99,6 +100,17 @@ TEST_XML(dom_attr_set_value_llong, "") } #endif +TEST_XML(dom_attr_assign_large_number, "") +{ + xml_node node = doc.child(STR("node")); + + node.attribute(STR("attr1")) = std::numeric_limits::max(); + node.attribute(STR("attr2")) = std::numeric_limits::max(); + + CHECK(test_node(node, STR(""), STR(""), pugi::format_raw) || + test_node(node, STR(""), STR(""), pugi::format_raw)); +} + TEST_XML(dom_node_set_name, "text") { CHECK(doc.child(STR("node")).set_name(STR("n"))); @@ -752,17 +764,6 @@ TEST_XML_FLAGS(dom_node_copy_types, "pcdatapcdata")); } -TEST_XML(dom_attr_assign_large_number, "") -{ - xml_node node = doc.child(STR("node")); - - node.attribute(STR("attr1")) = std::numeric_limits::max(); - node.attribute(STR("attr2")) = std::numeric_limits::max(); - - CHECK(test_node(node, STR(""), STR(""), pugi::format_raw) || - test_node(node, STR(""), STR(""), pugi::format_raw)); -} - TEST(dom_node_declaration_name) { xml_document doc; @@ -1444,3 +1445,64 @@ TEST(dom_node_copy_declaration_empty_name) CHECK_STRING(decl2.name(), STR("")); } + +TEST(dom_fp_roundtrip_min_max) +{ + xml_document doc; + xml_node node = doc.append_child(STR("node")); + xml_attribute attr = node.append_attribute(STR("attr")); + + node.text().set(std::numeric_limits::min()); + CHECK(node.text().as_float() == std::numeric_limits::min()); + + attr.set_value(std::numeric_limits::max()); + CHECK(attr.as_float() == std::numeric_limits::max()); + + attr.set_value(std::numeric_limits::min()); + CHECK(attr.as_double() == std::numeric_limits::min()); + + node.text().set(std::numeric_limits::max()); + CHECK(node.text().as_double() == std::numeric_limits::max()); +} + +const double fp_roundtrip_base[] = +{ + 0.31830988618379067154, + 0.43429448190325182765, + 0.57721566490153286061, + 0.69314718055994530942, + 0.70710678118654752440, + 0.78539816339744830962, +}; + +TEST(dom_fp_roundtrip_float) +{ + xml_document doc; + + for (int e = -125; e <= 128; ++e) + { + for (size_t i = 0; i < sizeof(fp_roundtrip_base) / sizeof(fp_roundtrip_base[0]); ++i) + { + float value = ldexpf(fp_roundtrip_base[i], e); + + doc.text().set(value); + CHECK(doc.text().as_float() == value); + } + } +} + +TEST(dom_fp_roundtrip_double) +{ + xml_document doc; + + for (int e = -1021; e <= 1024; ++e) + { + for (size_t i = 0; i < sizeof(fp_roundtrip_base) / sizeof(fp_roundtrip_base[0]); ++i) + { + double value = ldexp(fp_roundtrip_base[i], e); + + doc.text().set(value); + CHECK(doc.text().as_double() == value); + } + } +} -- cgit v1.2.3