diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-11-20 23:47:00 -0800 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2014-11-20 23:47:16 -0800 |
| commit | db8df4a5665cfb24c1c18be438d10b2e310a234e (patch) | |
| tree | 16d251ba91d88fd99343e9628348f912e0170f1a /tests/test_xpath.cpp | |
| parent | cca23e636354dc73429a19e14e32cc9a5e632735 (diff) | |
| parent | 125aa55061ccde4ae7351a9a6c7270a15c9e0204 (diff) | |
Merge branch 'master' into compact
Diffstat (limited to 'tests/test_xpath.cpp')
| -rw-r--r-- | tests/test_xpath.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/test_xpath.cpp b/tests/test_xpath.cpp index a65ee37..f5b4c66 100644 --- a/tests/test_xpath.cpp +++ b/tests/test_xpath.cpp @@ -13,7 +13,7 @@ static void load_document_copy(xml_document& doc, const char_t* text) { xml_document source; - CHECK(source.load(text)); + CHECK(source.load_string(text)); doc.append_copy(source.first_child()); } @@ -551,10 +551,10 @@ TEST_XML(xpath_sort_append_buffer, "<node /><node />") TEST(xpath_sort_crossdoc) { xml_document doc1; - CHECK(doc1.load(STR("<node />"))); + CHECK(doc1.load_string(STR("<node />"))); xml_document doc2; - CHECK(doc2.load(STR("<node />"))); + CHECK(doc2.load_string(STR("<node />"))); xpath_node_set ns1 = doc1.select_nodes(STR("*")); CHECK(ns1.size() == 1); @@ -639,9 +639,11 @@ TEST(xpath_allocate_string_out_of_memory) #else try { + #ifndef __DMC__ // DigitalMars exception handling crashes instead of catching the exception... xpath_query q(query.c_str()); CHECK_FORCE_FAIL("Expected out of memory exception"); + #endif } catch (const std::bad_alloc&) { |