diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-08-29 20:57:42 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-08-29 20:57:42 +0000 |
| commit | a0a28b1c05f65a9dd819e5582c4269cc6c35b1fd (patch) | |
| tree | 9944c4d42e325bd04ffc297d0a3bdeaa0a362fd8 | |
| parent | 9266af0664f41b50b7ec189f5b2d387a70429098 (diff) | |
tests: Fixed test warnings for MSVC10, slightly extended substring tests
git-svn-id: http://pugixml.googlecode.com/svn/trunk@707 99668b35-9821-0410-8761-19e4c4f06640
| -rw-r--r-- | tests/test_xpath_functions.cpp | 2 | ||||
| -rw-r--r-- | tests/test_xpath_parse.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/test_xpath_functions.cpp b/tests/test_xpath_functions.cpp index b0d0b52..016c722 100644 --- a/tests/test_xpath_functions.cpp +++ b/tests/test_xpath_functions.cpp @@ -377,6 +377,7 @@ TEST(xpath_string_substring_before) CHECK_XPATH_STRING(c, STR("substring-before('abc', 'cd')"), STR("")); CHECK_XPATH_STRING(c, STR("substring-before('abc', 'b')"), STR("a")); CHECK_XPATH_STRING(c, STR("substring-before('abc', 'c')"), STR("ab")); + CHECK_XPATH_STRING(c, STR("substring-before('abc', '')"), STR("")); CHECK_XPATH_STRING(c, STR("substring-before('', '')"), STR("")); // substring-before with 2 arguments, from W3C standard @@ -402,6 +403,7 @@ TEST(xpath_string_substring_after) CHECK_XPATH_STRING(c, STR("substring-after('abc', 'cd')"), STR("")); CHECK_XPATH_STRING(c, STR("substring-after('abc', 'b')"), STR("c")); CHECK_XPATH_STRING(c, STR("substring-after('abc', 'c')"), STR("")); + CHECK_XPATH_STRING(c, STR("substring-after('abc', '')"), STR("abc")); CHECK_XPATH_STRING(c, STR("substring-after('', '')"), STR("")); // substring-before with 2 arguments, from W3C standard diff --git a/tests/test_xpath_parse.cpp b/tests/test_xpath_parse.cpp index aa148be..4f6f69d 100644 --- a/tests/test_xpath_parse.cpp +++ b/tests/test_xpath_parse.cpp @@ -180,6 +180,7 @@ TEST(xpath_parse_paths_valid) } } +#if defined(PUGIXML_WCHAR_MODE) || !defined(PUGIXML_NO_STL) TEST(xpath_parse_paths_valid_unicode) { // From ajaxslt @@ -226,6 +227,7 @@ TEST(xpath_parse_paths_valid_unicode) #endif } } +#endif TEST(xpath_parse_invalid) { |