fix demo stream reading (pythonnet#225)

matthid · tonyroberts · commit d58b33804568 · 2016-06-23T08:07:27.000+01:00
diff --git a/demo/wordpad.py b/demo/wordpad.py
@@ -293,12 +293,13 @@ def OpenDocument(self):
         stream = File.OpenRead(filename)
 
         buff = System.Array.CreateInstance(System.Byte, 1024)
+        buff.Initialize()
         data = []
+        read = 1
 
-        while stream.Position < stream.Length:
-            buff.Initialize()
-            stream.Read(buff, 0, 1024)
-            temp = Encoding.ASCII.GetString(buff, 0, 1024)
+        while read > 0:
+            read, _ = stream.Read(buff, 0, 1024)
+            temp = Encoding.ASCII.GetString(buff, 0, read)
             data.append(temp)
 
         data = ''.join(data)
diff --git a/src/tests/test_method.py b/src/tests/test_method.py
@@ -759,6 +759,28 @@ def test():
 
         self.assertRaises(TypeError, test)
 
+    def testWeCanBindToEncodingGetString(self):
+        """Check that we can bind to the Encoding.GetString method with variables."""
+        
+        from System.Text import Encoding
+        from System.IO import MemoryStream
+        myBytes = Encoding.UTF8.GetBytes('Some testing string')
+        stream = MemoryStream()
+        stream.Write(myBytes, 0, myBytes.Length)
+        stream.Position = 0
+        
+        buff = System.Array.CreateInstance(System.Byte, 3)
+        buff.Initialize()
+        data = []
+        read = 1
+
+        while read > 0:
+            read, _ = stream.Read(buff, 0, buff.Length)
+            temp = Encoding.UTF8.GetString(buff, 0, read)
+            data.append(temp)
+
+        data = ''.join(data)
+        self.assertEqual(data, 'Some testing string')
 
 def test_suite():
     return unittest.makeSuite(MethodTests)
