tests: Miscellaneous test fixes

git-svn-id: http://pugixml.googlecode.com/svn/trunk@618 99668b35-9821-0410-8761-19e4c4f06640

2 files changed, 7 insertions, 5 deletions

diff --git a/tests/test_document.cpp b/tests/test_document.cpp
index 35f3f7d..85a63a7 100644
--- a/tests/test_document.cpp
+++ b/tests/test_document.cpp
@@ -108,15 +108,17 @@ TEST(document_load_stream_exceptions)
 {
 	pugi::xml_document doc;
 
+	// Windows has newline translation for text-mode files, so reading from this stream reaches eof and sets fail|eof bits.
+	// This test does not cause stream to throw an exception on Linux - I have no idea how to get read() to fail except
+	// newline translation.
 	std::ifstream iss("tests/data/multiline.xml");
-	iss.exceptions(std::ios::eofbit);
+	iss.exceptions(std::ios::eofbit | std::ios::badbit | std::ios::failbit);
 
 	try
 	{
 		doc.load(iss);
 
-		volatile bool exception_should_be_thrown = false; // to avoid 'controlling expression is constant' warning
-		CHECK(exception_should_be_thrown);
+		CHECK(iss.good()); // if the exception was not thrown, stream reading should succeed without errors
 	}
 	catch (const std::ios_base::failure&)
 	{
diff --git a/tests/test_xpath.cpp b/tests/test_xpath.cpp
index c615f36..fe0a25f 100644
--- a/tests/test_xpath.cpp
+++ b/tests/test_xpath.cpp
@@ -52,7 +52,7 @@ TEST_XML(xpath_sort_complex, "<node><child1 attr1='value1' attr2='value2'/><chil
 TEST(xpath_sort_complex_copy) // copy the document so that document order optimization does not work
 {
 	xml_document doc;
-	load_document_copy(doc, "<node><child1 attr1='value1' attr2='value2'/><child2 attr1='value1'>test</child2></node>");
+	load_document_copy(doc, STR("<node><child1 attr1='value1' attr2='value2'/><child2 attr1='value1'>test</child2></node>"));
 
 	// just some random union order, it should not matter probably?
 	xpath_node_set ns = doc.child(STR("node")).select_nodes(STR("child1 | child2 | child1/@* | . | child2/@* | child2/text()"));
@@ -84,7 +84,7 @@ TEST_XML(xpath_sort_children, "<node><child><subchild id='1'/></child><child><su
 TEST(xpath_sort_children_copy) // copy the document so that document order optimization does not work
 {
 	xml_document doc;
-	load_document_copy(doc, "<node><child><subchild id='1'/></child><child><subchild id='2'/></child></node>");
+	load_document_copy(doc, STR("<node><child><subchild id='1'/></child><child><subchild id='2'/></child></node>"));
 
 	xpath_node_set ns = doc.child(STR("node")).select_nodes(STR("child/subchild[@id=1] | child/subchild[@id=2]"));