From f542c5ebb8068ccd4f9176684eb62183afbe7e5c Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Thu, 6 May 2010 20:28:36 +0000
Subject: Integrated changes from unicode branch to trunk

git-svn-id: http://pugixml.googlecode.com/svn/trunk@383 99668b35-9821-0410-8761-19e4c4f06640
---
 tests/test_memory.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/test_memory.cpp')

diff --git a/tests/test_memory.cpp b/tests/test_memory.cpp
index 8706ed2..7ca87d6 100644
--- a/tests/test_memory.cpp
+++ b/tests/test_memory.cpp
@@ -2,13 +2,13 @@
 
 namespace
 {
-	char buffer[8];
+	pugi::char_t buffer[8];
 	int allocate_count = 0;
 	int deallocate_count = 0;
 
 	void* allocate(size_t size)
 	{
-		CHECK(size == 8);
+		CHECK(size == sizeof(pugi::char_t) * 8);
 		++allocate_count;
 		return buffer;
 	}
@@ -32,23 +32,23 @@ TEST(custom_memory_management)
 	{
 		// parse document
 		xml_document doc;
-		CHECK(doc.load("<node/>"));
+		CHECK(doc.load(STR("<node />")));
 	
 		CHECK(allocate_count == 1);
 		CHECK(deallocate_count == 0);
-		CHECK_STRING(buffer, "<node\0>");
+		CHECK_STRING(buffer, STR("<node"));
 
 		// modify document
-		doc.child("node").set_name("foobars");
+		doc.child(STR("node")).set_name(STR("foobars"));
 
 		CHECK(allocate_count == 2);
 		CHECK(deallocate_count == 0);
-		CHECK_STRING(buffer, "foobars");
+		CHECK_STRING(buffer, STR("foobars"));
 	}
 
 	CHECK(allocate_count == 2);
 	CHECK(deallocate_count == 2);
-	CHECK_STRING(buffer, "foobars");
+	CHECK_STRING(buffer, STR("foobars"));
 
 	// restore old functions
 	set_memory_management_functions(old_allocate, old_deallocate);
-- 
cgit v1.2.3