External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Fixed tests for wchar_t mode, added dummy std::cout/wcout usage for MSVC in order to create locales beforehand (avoids memory leaks during tests), minor additional test fixes

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@629 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-08-04 20:10:10 +00:00
parent deb9e8bc74
commit a9bc2d8873
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/main.cpp
View File

@ -3,6 +3,7 @@
#include <new> #include <new>
#include <exception> #include <exception>
#include <iostream>
#include <stdio.h> #include <stdio.h>
#include <float.h> #include <float.h>
@ -52,7 +53,7 @@ static void replace_memory_management()
pugi::set_memory_management_functions(custom_allocate, custom_deallocate); pugi::set_memory_management_functions(custom_allocate, custom_deallocate);
} }
#ifdef __GNUC__ #if defined(__GNUC__) || defined(__INTEL_COMPILER)
#define DECL_THROW(e) throw(e) #define DECL_THROW(e) throw(e)
#define DECL_NOTHROW() throw() #define DECL_NOTHROW() throw()
#else #else
@ -179,6 +180,11 @@ int main()
#ifdef __BORLANDC__ #ifdef __BORLANDC__
_control87(MCW_EM | PC_53, MCW_EM | MCW_PC); _control87(MCW_EM | PC_53, MCW_EM | MCW_PC);
#endif #endif
#if defined(_MSC_VER) && !defined(__GNUC__)
std::cout.flush();
std::wcout.flush();
#endif
replace_memory_management(); replace_memory_management();

10
tests/test_document.cpp
View File

@ -75,10 +75,8 @@ TEST(document_load_stream_error)
std::ifstream fs1("filedoesnotexist"); std::ifstream fs1("filedoesnotexist");
CHECK(doc.load(fs1).status == status_io_error); CHECK(doc.load(fs1).status == status_io_error);
#ifndef __DMC__ // Digital Mars CRT does not like 'con' pseudo-file
std::ifstream fs2("con"); std::ifstream fs2("con");
CHECK(doc.load(fs2).status == status_io_error); CHECK(doc.load(fs2).status == status_io_error);
#endif
std::istringstream iss("<node/>"); std::istringstream iss("<node/>");
test_runner::_memory_fail_threshold = 1; test_runner::_memory_fail_threshold = 1;
@ -130,7 +128,7 @@ TEST(document_load_stream_exceptions)
TEST(document_load_stream_error_previous) TEST(document_load_stream_error_previous)
{ {
pugi::xml_document doc; pugi::xml_document doc;
CHECK(doc.load("<node/>")); CHECK(doc.load(STR("<node/>")));
CHECK(doc.first_child()); CHECK(doc.first_child());
std::ifstream fs1("filedoesnotexist"); std::ifstream fs1("filedoesnotexist");
@ -141,7 +139,7 @@ TEST(document_load_stream_error_previous)
TEST(document_load_stream_wide_error_previous) TEST(document_load_stream_wide_error_previous)
{ {
pugi::xml_document doc; pugi::xml_document doc;
CHECK(doc.load("<node/>")); CHECK(doc.load(STR("<node/>")));
CHECK(doc.first_child()); CHECK(doc.first_child());
std::basic_ifstream<wchar_t> fs1("filedoesnotexist"); std::basic_ifstream<wchar_t> fs1("filedoesnotexist");
@ -195,9 +193,7 @@ TEST(document_load_file_error)
CHECK(doc.load_file("filedoesnotexist").status == status_file_not_found); CHECK(doc.load_file("filedoesnotexist").status == status_file_not_found);
#ifdef _WIN32 #ifdef _WIN32
#ifndef __DMC__ // Digital Mars CRT does not like 'con' pseudo-file
CHECK(doc.load_file("con").status == status_io_error); CHECK(doc.load_file("con").status == status_io_error);
#endif
#endif #endif
test_runner::_memory_fail_threshold = 1; test_runner::_memory_fail_threshold = 1;
@ -207,7 +203,7 @@ TEST(document_load_file_error)
TEST(document_load_file_error_previous) TEST(document_load_file_error_previous)
{ {
pugi::xml_document doc; pugi::xml_document doc;
CHECK(doc.load("<node/>")); CHECK(doc.load(STR("<node/>")));
CHECK(doc.first_child()); CHECK(doc.first_child());
CHECK(doc.load_file("filedoesnotexist").status == status_file_not_found); CHECK(doc.load_file("filedoesnotexist").status == status_file_not_found);

4
tests/test_dom_modify.cpp
View File

@ -667,11 +667,11 @@ TEST(dom_node_memory_limit)
for (unsigned int i = 0; i < length; ++i) string[i] = 'a'; for (unsigned int i = 0; i < length; ++i) string[i] = 'a';
string[length] = 0; string[length] = 0;
test_runner::_memory_fail_threshold = 32768 * 4; test_runner::_memory_fail_threshold = 32768 * 2 + sizeof(string);
xml_document doc; xml_document doc;
for (int i = 0; i < 32; ++i) for (int j = 0; j < 32; ++j)
{ {
CHECK(doc.append_child().set_name(string)); CHECK(doc.append_child().set_name(string));
CHECK(doc.remove_child(doc.first_child())); CHECK(doc.remove_child(doc.first_child()));