Imported Upstream version 4.0.1.44

Former-commit-id: 25ecb6b7e167efcf4b0500e73daf6ec78889b0b8
This commit is contained in:
Xamarin Public Jenkins
2015-05-28 04:38:13 -04:00
parent c567abfd48
commit 98e85815fb
17 changed files with 32 additions and 11 deletions

View File

@@ -253,6 +253,13 @@ namespace System.IO {
m_buffer [pos ++] = (byte)read_byte;
bytes_read ++;
if (m_encoding is UnicodeEncoding) {
CheckBuffer (pos + 1);
read_byte = m_stream.ReadByte();
if (read_byte != -1) {
m_buffer [pos++] = (byte)read_byte;
}
}
int n = m_encoding.GetChars (m_buffer, 0, pos, buffer, index + chars_read);
if (n > 0)

View File

@@ -274,6 +274,20 @@ namespace MonoTests.System.IO
}
}
[Test]
public void TestReadUnicode ()
{
char testChar1 = 'H';
using (var stream = new MemoryStream())
using (var writer = new BinaryWriter(stream, Encoding.Unicode, true))
using (var reader = new BinaryReader(stream, Encoding.Unicode))
{
writer.Write(testChar1);
stream.Position = 0;
Assert.AreEqual ('H', reader.ReadChar ());
}
}
//-TODO: (TestRead[Type]*) Verify the ReadBoolean, ReadByte ....
// ReadBoolean, ReadByte, ReadChar, ReadInt32 Done

View File

@@ -1 +1 @@
1c8c63024e2890bc7bef625af05d4c2f6a8f7b5a
a7e75eef6368c6220420fa94b92d9f18efdc954b

View File

@@ -1 +1 @@
70d2fcb59d657b9d2a69eaf92589ac8dd29b8ae5
2eb43af5239e63316874341249c70a7aaaa21548

View File

@@ -1 +1 @@
433141ac44966433021bb18eca97d0c0bf1eba6e
1e8e4cd027b107938b2ccffcb417211866ad1223

View File

@@ -1 +1 @@
d36f7fa35e1e825e33423f2bc7ed953ba7ab3d69
c662727d3b509939685f97c0494d303020cc0725

View File

@@ -1 +1 @@
062186f53d20ad38ba65594e46aa800bcb9ec915
134f3a9815c9cb89f775b433dcde3143b910e93c