[Instantobjects-cvscommit] SF.net SVN: instantobjects:[869] trunk

[<na...@us...>]

Revision: 869
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=869&view=rev
Author:   nandod
Date:     2009-08-29 07:57:59 +0000 (Sat, 29 Aug 2009)

Log Message:
-----------
* Fixed regression: XML object output was not encoding entities such as " correctly. TestIO updated.

Modified Paths:
--------------
    trunk/Source/Core/InstantClasses.pas
    trunk/Tests/TestXMLBroker.pas

Modified: trunk/Source/Core/InstantClasses.pas
===================================================================
--- trunk/Source/Core/InstantClasses.pas	2009-08-28 07:36:34 UTC (rev 868)
+++ trunk/Source/Core/InstantClasses.pas	2009-08-29 07:57:59 UTC (rev 869)
@@ -1470,7 +1470,7 @@
           Esc := 'gt';
       end;
       Esc := Format(EscStr, [Esc]);
-      LString := LString + EscStr;
+      LString := LString + Esc;
     end
     else
       LString := LString + C;

Modified: trunk/Tests/TestXMLBroker.pas
===================================================================
--- trunk/Tests/TestXMLBroker.pas	2009-08-28 07:36:34 UTC (rev 868)
+++ trunk/Tests/TestXMLBroker.pas	2009-08-29 07:57:59 UTC (rev 869)
@@ -164,7 +164,7 @@
 
 procedure TTestXMLBroker.TestStoreAndRetrieveContact;
 const
-  DEF_NAME = 'Mike Art\xF9';
+  DEF_NAME = 'Mike "Art\xF9"';
   DEF_CITY = 'Milan (\x80)';
 var
   c: TContact;
@@ -196,8 +196,8 @@
   try
     AssertNotNull('Object not retrieved', c);
     AssertEquals(old_id, c.Id);
-    AssertEquals(c.Name, DEF_NAME);
-    AssertEquals(c.Address.City, DEF_CITY);
+    AssertEquals(DEF_NAME, c.Name);
+    AssertEquals(DEF_CITY, c.Address.City);
     AssertNotNull(c.Address);
     AssertEquals(2, c.PhoneCount);
   finally