instantobjects-cvscommit

[<dav...@us...>]

Revision: 884
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=884&view=rev
Author:   davidvtaylor
Date:     2009-12-28 22:53:38 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
* Fix failing Blob test under D2009+ caused by reading raw AnsiString data into a UnicodeString

Modified Paths:
--------------
    trunk/Tests/TestInstantBlob.pas

Modified: trunk/Tests/TestInstantBlob.pas
===================================================================
--- trunk/Tests/TestInstantBlob.pas	2009-12-28 15:43:22 UTC (rev 883)
+++ trunk/Tests/TestInstantBlob.pas	2009-12-28 22:53:38 UTC (rev 884)
@@ -203,6 +203,8 @@
   vReturnValue: Integer;
   vCount: Integer;
   vPosition: Integer;
+  vTempStr1: AnsiString;
+  vTempStr2: AnsiString;
   vBlobReadStr: string;
   vStreamReadStr: string;
 begin
@@ -218,15 +220,16 @@
     vReturnValue := vStream.Seek(vPosition, soFromBeginning);
     AssertEquals(vPosition, vReturnValue);
 
-    SetLength(vStreamReadStr, vCount);
-    vReturnValue := vStream.Read(vStreamReadStr[1], vCount);
+    SetLength(vTempStr1, vCount);
+    vReturnValue := vStream.Read(vTempStr1[1], vCount);
     AssertEquals(vCount, vReturnValue);
+    vStreamReadStr := string(vTempStr1);
 
-    SetLength(vBlobReadStr, vCount);
-    vReturnValue := FInstantBlob.ReadBuffer(vBlobReadStr[1], vPosition,
-      vCount);
+    SetLength(vTempStr2, vCount);
+    vReturnValue := FInstantBlob.ReadBuffer(vTempStr2[1], vPosition, vCount);
     AssertEquals(vCount, vReturnValue);
-    AssertEquals(vStreamReadStr, vBlobReadStr);
+    vBlobReadStr := string(vTempStr2);
+    AssertEquals(string(vStreamReadStr), string(vBlobReadStr));
 
     vStreamReadStr := UpperCase(vStreamReadStr);
     vBlobReadStr := UpperCase(vBlobReadStr);