From 4b371e10eed49d25bf4240a6aaa321b084e586ea Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Thu, 22 Jun 2017 20:33:02 -0700 Subject: tests: Remove redundant pugi:: qualifier Most tests have `using namespace pugi` which makes explicit qualifications unnecessary. --- tests/test_xpath.cpp | 58 ++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'tests/test_xpath.cpp') diff --git a/tests/test_xpath.cpp b/tests/test_xpath.cpp index 3f5d084..24daa4e 100644 --- a/tests/test_xpath.cpp +++ b/tests/test_xpath.cpp @@ -194,11 +194,11 @@ TEST(xpath_sort_random_large) TEST(xpath_long_numbers_parse) { - const pugi::char_t* str_flt_max = STR("340282346638528860000000000000000000000"); - const pugi::char_t* str_flt_max_dec = STR("340282346638528860000000000000000000000.000000"); + const char_t* str_flt_max = STR("340282346638528860000000000000000000000"); + const char_t* str_flt_max_dec = STR("340282346638528860000000000000000000000.000000"); - const pugi::char_t* str_dbl_max = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); - const pugi::char_t* str_dbl_max_dec = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.000000"); + const char_t* str_dbl_max = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); + const char_t* str_dbl_max_dec = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.000000"); xml_node c; @@ -209,25 +209,25 @@ TEST(xpath_long_numbers_parse) CHECK_XPATH_NUMBER(c, str_dbl_max_dec, std::numeric_limits::max()); } -static bool test_xpath_string_prefix(const pugi::xml_node& node, const pugi::char_t* query, const pugi::char_t* expected, size_t match_length) +static bool test_xpath_string_prefix(const xml_node& node, const char_t* query, const char_t* expected, size_t match_length) { - pugi::xpath_query q(query); + xpath_query q(query); - pugi::char_t result[32]; + char_t result[32]; size_t size = q.evaluate_string(result, sizeof(result) / sizeof(result[0]), node); - size_t expected_length = std::char_traits::length(expected); + size_t expected_length = std::char_traits::length(expected); - return size == expected_length + 1 && std::char_traits::compare(result, expected, match_length) == 0; + return size == expected_length + 1 && std::char_traits::compare(result, expected, match_length) == 0; } TEST(xpath_long_numbers_stringize) { - const pugi::char_t* str_flt_max = STR("340282346638528860000000000000000000000"); - const pugi::char_t* str_flt_max_dec = STR("340282346638528860000000000000000000000.000000"); + const char_t* str_flt_max = STR("340282346638528860000000000000000000000"); + const char_t* str_flt_max_dec = STR("340282346638528860000000000000000000000.000000"); - const pugi::char_t* str_dbl_max = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); - const pugi::char_t* str_dbl_max_dec = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.000000"); + const char_t* str_dbl_max = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); + const char_t* str_dbl_max_dec = STR("179769313486231570000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.000000"); xml_node c; @@ -240,7 +240,7 @@ TEST(xpath_long_numbers_stringize) TEST(xpath_denorm_numbers) { - std::basic_string query; + std::basic_string query; // 10^-318 - double denormal for (int i = 0; i < 106; ++i) @@ -383,7 +383,7 @@ TEST_XML(xpath_out_of_memory_evaluate, "") query.resize(4196, 'a'); query += STR("\")]"); - pugi::xpath_query q(query.c_str()); + xpath_query q(query.c_str()); CHECK_ALLOC_FAIL(CHECK(q.evaluate_boolean(doc) == false)); CHECK_ALLOC_FAIL(CHECK_DOUBLE_NAN(q.evaluate_number(doc))); @@ -402,7 +402,7 @@ TEST(xpath_out_of_memory_evaluate_concat) query.resize(4196, 'a'); query += STR("\")"); - pugi::xpath_query q(query.c_str()); + xpath_query q(query.c_str()); CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, xml_node()) == 1)); } @@ -416,7 +416,7 @@ TEST(xpath_out_of_memory_evaluate_concat_list) query += STR("\"\")"); - pugi::xpath_query q(query.c_str()); + xpath_query q(query.c_str()); test_runner::_memory_fail_threshold = 1; @@ -432,7 +432,7 @@ TEST(xpath_out_of_memory_evaluate_substring) query.resize(4196, 'a'); query += STR("\", 1, 4097)"); - pugi::xpath_query q(query.c_str()); + xpath_query q(query.c_str()); CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(0, 0, xml_node()) == 1)); } @@ -441,7 +441,7 @@ TEST_XML(xpath_out_of_memory_evaluate_union, " { test_runner::_memory_fail_threshold = 32768 + 4096 * 2; - pugi::xpath_query q(STR("a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|a)))))))))))))))))))")); + xpath_query q(STR("a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|(a|a)))))))))))))))))))")); CHECK_ALLOC_FAIL(CHECK(q.evaluate_node_set(doc.child(STR("node"))).empty())); } @@ -450,7 +450,7 @@ TEST_XML(xpath_out_of_memory_evaluate_predicate, " { test_runner::_memory_fail_threshold = 32768 + 4096 * 2; - pugi::xpath_query q(STR("//a[//a[//a[//a[true()]]]]")); + xpath_query q(STR("//a[//a[//a[//a[true()]]]]")); CHECK_ALLOC_FAIL(CHECK(q.evaluate_node_set(doc).empty())); } @@ -459,7 +459,7 @@ TEST_XML(xpath_out_of_memory_evaluate_normalize_space_0, " a b c d e f g h { test_runner::_memory_fail_threshold = 32768 + 4096 * 2; - pugi::xpath_query q(STR("concat(normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space())")); + xpath_query q(STR("concat(normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space(), normalize-space())")); CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(doc.first_child()).empty())); } @@ -468,7 +468,7 @@ TEST_XML(xpath_out_of_memory_evaluate_normalize_space_1, " a b c d e f g h { test_runner::_memory_fail_threshold = 32768 + 4096 * 2; - pugi::xpath_query q(STR("concat(normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node))")); + xpath_query q(STR("concat(normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node), normalize-space(node))")); CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(doc).empty())); } @@ -477,7 +477,7 @@ TEST_XML(xpath_out_of_memory_evaluate_translate, " a b c d e f g h i j k l { test_runner::_memory_fail_threshold = 32768 + 4096 * 2; - pugi::xpath_query q(STR("concat(translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'))")); + xpath_query q(STR("concat(translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'), translate(node, 'a', '\xe9'))")); CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(doc).empty())); } @@ -486,7 +486,7 @@ TEST_XML(xpath_out_of_memory_evaluate_translate_table, " a b c d e f g h i { test_runner::_memory_fail_threshold = 32768 + 4096 * 2; - pugi::xpath_query q(STR("concat(translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'))")); + xpath_query q(STR("concat(translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'), translate(node, 'a', 'A'))")); CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(doc).empty())); } @@ -505,7 +505,7 @@ TEST(xpath_out_of_memory_evaluate_string_append) xml_document doc; CHECK(doc.load_buffer_inplace(&buf[0], buf.size() * sizeof(char_t))); - pugi::xpath_query q(STR("string(n)")); + xpath_query q(STR("string(n)")); CHECK(q); CHECK_ALLOC_FAIL(CHECK(q.evaluate_string(doc).empty())); @@ -525,13 +525,13 @@ TEST(xpath_out_of_memory_evaluate_number_to_string) TEST(xpath_memory_concat_massive) { - pugi::xml_document doc; - pugi::xml_node node = doc.append_child(STR("node")); + xml_document doc; + xml_node node = doc.append_child(STR("node")); for (int i = 0; i < 5000; ++i) node.append_child(STR("c")).text().set(i % 10); - pugi::xpath_query q(STR("/")); + xpath_query q(STR("/")); size_t size = q.evaluate_string(0, 0, node); CHECK(size == 5001); @@ -547,7 +547,7 @@ TEST_XML(xpath_memory_translate_table, "a") query += STR("translate(.,'a','A'),"); query += STR("'')"); - CHECK_ALLOC_FAIL(CHECK(!pugi::xpath_query(query.c_str()))); + CHECK_ALLOC_FAIL(CHECK(!xpath_query(query.c_str()))); } TEST_XML(xpath_sort_copy_share, "test") -- cgit v1.2.3