Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@ -274,20 +274,6 @@ 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
@ -1076,7 +1062,7 @@ namespace MonoTests.System.IO
}
[Test]
[ExpectedException(typeof(EndOfStreamException))]
[ExpectedException(typeof(IOException))]
public void ReadDecimalException ()
{
MemoryStream stream = new MemoryStream (new byte [] {0, 0, 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, 0, 0, 0 ,87, 98, 0, 0, 0, 0, 0});
@ -1576,5 +1562,22 @@ namespace MonoTests.System.IO
}
}
}
// Bug Xamarin #30171
[Test]
public void BinaryReaderRegressionMono40 ()
{
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;
char testchar2 = reader.ReadChar();
Assert.AreEqual (testChar1, testchar2);
}
}
}
}
}
}