diff options
author | Rodrigo Kumpera <kumpera@gmail.com> | 2013-03-01 19:52:03 +0400 |
---|---|---|
committer | Rodrigo Kumpera <kumpera@gmail.com> | 2013-03-01 19:52:03 +0400 |
commit | 93e2d1dc48339be472300910e9290939ee253177 (patch) | |
tree | 34d58191bd013f8177b6010b9c3e11008950120f /mcs/class | |
parent | a4c61d97f6378d270bfc453a34c51d0c625fc05d (diff) |
Fix object::GetType when remoting is enabled.
Diffstat (limited to 'mcs/class')
35 files changed, 85 insertions, 620 deletions
diff --git a/mcs/class/Mono.Security/Test/Mono.Math/ArithmeticBigTest.cs b/mcs/class/Mono.Security/Test/Mono.Math/ArithmeticBigTest.cs index ac05640807f..94ff296ced5 100644 --- a/mcs/class/Mono.Security/Test/Mono.Math/ArithmeticBigTest.cs +++ b/mcs/class/Mono.Security/Test/Mono.Math/ArithmeticBigTest.cs @@ -179,48 +179,48 @@ namespace MonoTests.Mono.Math.Arithmetic.Big { [Test] public void AgtB () { - Assert.IsTrue(A > B); + Assertion.Assert(A > B); } [Test] public void ANotLtB () { - Assert.IsTrue(!(A < B)); + Assertion.Assert(!(A < B)); } [Test] public void BNotGtA () { - Assert.IsTrue(!(B > A)); + Assertion.Assert(!(B > A)); } [Test] public void AltB () { - Assert.IsTrue(B < A); + Assertion.Assert(B < A); } [Test] public void AeqA () { - Assert.AreEqual(A, A); + Assertion.Assert(A == A); } [Test] public void BeqB () { - Assert.AreEqual(B, B); + Assertion.Assert(B == B); } [Test] public void AneqB () { - Assert.AreNotEqual(A, B); + Assertion.Assert(A != B); } [Test] public void BneqA () { - Assert.AreNotEqual(B, A); + Assertion.Assert(B != A); } #endregion diff --git a/mcs/class/Mono.Security/Test/Mono.Math/SearchGeneratorTest.cs b/mcs/class/Mono.Security/Test/Mono.Math/SearchGeneratorTest.cs index 80434f9983c..189dbd9d0df 100644 --- a/mcs/class/Mono.Security/Test/Mono.Math/SearchGeneratorTest.cs +++ b/mcs/class/Mono.Security/Test/Mono.Math/SearchGeneratorTest.cs @@ -62,7 +62,7 @@ namespace MonoTests.Mono.Math { for (int i = 0; i < 5; i++) { ContextData ctx = new ContextData (128, (uint)r.Next (int.MinValue, int.MaxValue)); BigInteger p = GenerateNewPrime (128, ctx); - Assert.IsTrue (p.TestBit (1)); + Assertion.Assert (p.TestBit (1)); uint d = ctx.testData; for (uint j = 128 - 2; d > 0; j--, d >>= 1) Assertion.AssertEquals ((d&1) == 1, p.TestBit (j)); diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/AuthenticodeDeformatterTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/AuthenticodeDeformatterTest.cs index 0a1fd9f3d1a..d15087aef00 100644 --- a/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/AuthenticodeDeformatterTest.cs +++ b/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/AuthenticodeDeformatterTest.cs @@ -678,7 +678,7 @@ namespace MonoTests.Mono.Security.Authenticode { private string WriteFile () { - string filename = Path.Combine (Path.GetTempPath (), "helloworld_signed.exe"); + string filename = "helloworld_signed.exe"; try { if (File.Exists (filename)) { File.Delete (filename); diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/PrivateKeyTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/PrivateKeyTest.cs index 0f529496e11..ee8145cff6b 100644 --- a/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/PrivateKeyTest.cs +++ b/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/PrivateKeyTest.cs @@ -96,13 +96,7 @@ public class PrivateKeyTest : Assertion { Assert (msg, a); } - string testfile; - - [TestFixtureSetUp] - public void FixtureSetup () - { - testfile = Path.Combine (Path.GetTempPath (), "test.pvk"); - } + private const string testfile = "test.pvk"; [TearDown] public void TearDown () diff --git a/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/SoftwarePublisherCertificateTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/SoftwarePublisherCertificateTest.cs index 11136a48904..6e6adce2b86 100644 --- a/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/SoftwarePublisherCertificateTest.cs +++ b/mcs/class/Mono.Security/Test/Mono.Security.Authenticode/SoftwarePublisherCertificateTest.cs @@ -381,13 +381,7 @@ namespace MonoTests.Mono.Security.Authenticode { 0x77, 0xEF, 0xEC, 0x17, 0x92, 0xC7, 0xD6, 0xCD, 0xE1, 0x2A, 0x2E, 0xE7, 0xF3, 0xED, 0x7F, 0x66, 0x86, 0x31, 0x00 }; - string testfile; - - [TestFixtureSetUp] - public void FixtureSetup () - { - testfile = Path.Combine (Path.GetTempPath (), "test.spc"); - } + private const string testfile = "test.spc"; [TearDown] public void TearDown () @@ -403,11 +397,11 @@ namespace MonoTests.Mono.Security.Authenticode { if (unicode) { data = Encoding.Unicode.GetBytes (s); } else if (pem) { - //string b64pem = "-----BEGIN PKCS7-----\n" + s + "\n-----END PKCS7-----"; - //data = Encoding.ASCII.GetBytes (b64pem); - //using (FileStream fs = File.Create ("bad.pem")) { - // fs.Write (data, 0, data.Length); - //} + string b64pem = "-----BEGIN PKCS7-----\n" + s + "\n-----END PKCS7-----"; + data = Encoding.ASCII.GetBytes (b64pem); + using (FileStream fs = File.Create ("bad.pem")) { + fs.Write (data, 0, data.Length); + } } else { data = Encoding.ASCII.GetBytes (s); } diff --git a/mcs/class/Mono.Security/Test/Mono.Security/StrongNameTest.cs b/mcs/class/Mono.Security/Test/Mono.Security/StrongNameTest.cs index 05e013cd4aa..43bc7a5fbb9 100644 --- a/mcs/class/Mono.Security/Test/Mono.Security/StrongNameTest.cs +++ b/mcs/class/Mono.Security/Test/Mono.Security/StrongNameTest.cs @@ -127,8 +127,8 @@ namespace MonoTests.Mono.Security { AssertEquals ("key.PublicKeyToken", sn1.PublicKeyToken, sn2.PublicKeyToken); } - string Signed; - string Delay; + private const string Signed = "hellosigned.exe"; + private const string Delay = "hellodelay.exe"; private StrongName sn; private static byte[] signedData = { 0x4D, 0x5A, 0x90, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, @@ -787,16 +787,11 @@ namespace MonoTests.Mono.Security { [SetUp] public void SetUp () { - Signed = Path.Combine (Path.GetTempPath (), "hellosigned.exe"); - Delay = Path.Combine (Path.GetTempPath (), "hellodelay.exe"); - sn = new StrongName (key); // write hellosigned.exe to disk FileStream fs = File.OpenWrite (Signed); fs.Write (signedData, 0, signedData.Length); fs.Close (); - - // write hellodelay.exe to disk fs = File.OpenWrite (Delay); fs.Write (delayData, 0, delayData.Length); diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs index 6651be4a64f..c5a8dc430ad 100644 --- a/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs +++ b/mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs @@ -525,7 +525,7 @@ namespace MonoTests.System.Net.Http client.SendAsync (request, HttpCompletionOption.ResponseContentRead).Wait (WaitTimeout); Assert.Fail ("#2"); } catch (AggregateException e) { - Assert.IsTrue (e.InnerException is HttpRequestException, "#3"); + Assert.IsInstanceOfType (typeof (HttpRequestException), e.InnerException, "#3"); } } finally { @@ -699,7 +699,7 @@ namespace MonoTests.System.Net.Http client.GetByteArrayAsync (LocalServer).Wait (WaitTimeout); Assert.Fail ("#1"); } catch (AggregateException e) { - Assert.IsTrue (e.InnerException is HttpRequestException , "#2"); + Assert.IsInstanceOfType (typeof (HttpRequestException), e.InnerException, "#2"); } } finally { listener.Close (); @@ -726,7 +726,7 @@ namespace MonoTests.System.Net.Http client.GetStringAsync (LocalServer).Wait (WaitTimeout); Assert.Fail ("#1"); } catch (AggregateException e) { - Assert.IsTrue (e.InnerException is HttpRequestException, "#2"); + Assert.IsInstanceOfType (typeof (HttpRequestException), e.InnerException, "#2"); } } finally { listener.Abort (); diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs index edd4b839c16..b4a541afab2 100644 --- a/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs +++ b/mcs/class/System.Net.Http/Test/System.Net.Http/StreamContentTest.cs @@ -331,7 +331,7 @@ namespace MonoTests.System.Net.Http Assert.IsTrue (sc.LoadIntoBufferAsync (50).Wait (200)); Assert.Fail ("#1"); } catch (AggregateException e) { - Assert.IsTrue (e.InnerException is HttpRequestException, "#2"); + Assert.IsInstanceOfType (typeof (HttpRequestException), e.InnerException, "#2"); } } diff --git a/mcs/class/System.Net.Http/Test/System.Net.Http/StringContentTest.cs b/mcs/class/System.Net.Http/Test/System.Net.Http/StringContentTest.cs index f031fc3ea8e..51a077176b8 100644 --- a/mcs/class/System.Net.Http/Test/System.Net.Http/StringContentTest.cs +++ b/mcs/class/System.Net.Http/Test/System.Net.Http/StringContentTest.cs @@ -61,10 +61,9 @@ namespace MonoTests.System.Net.Http var s = new StringContent ("aaa", null, "multipart/*"); Assert.AreEqual ("Content-Type: multipart/*; charset=utf-8\r\n", s.Headers.ToString ()); -#if !MOBILE + s = new StringContent ("aaa", Encoding.GetEncoding (852), "multipart/*"); Assert.AreEqual ("Content-Type: multipart/*; charset=ibm852\r\n", s.Headers.ToString ()); -#endif } [Test] diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonSerializer.cs b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonSerializer.cs index 595727220ee..42d59afb18e 100644 --- a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonSerializer.cs +++ b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonSerializer.cs @@ -431,12 +431,12 @@ namespace System.Web.Script.Serialization void WriteValue (StringBuilder output, float value) { - StringBuilderExtensions.AppendCount (output, maxJsonLength, value.ToString ("r", CultureInfo.InvariantCulture)); + StringBuilderExtensions.AppendCount (output, maxJsonLength, value.ToString ("r")); } void WriteValue (StringBuilder output, double value) { - StringBuilderExtensions.AppendCount (output, maxJsonLength, value.ToString ("r", CultureInfo.InvariantCulture)); + StringBuilderExtensions.AppendCount (output, maxJsonLength, value.ToString ("r")); } void WriteValue (StringBuilder output, Guid value) diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs index 779c8bd1e1e..0e91387a4be 100644 --- a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs @@ -173,7 +173,6 @@ namespace MonoTests.System.Xml } [Test] - [Category ("MobileNotWorking")] public void TestSimpleMutualImport () { XmlReader r = new XmlTextReader ("Test/XmlFiles/xsd/inter-inc-1.xsd"); diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization.Advanced/SchemaImporterExtensionCollectionTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization.Advanced/SchemaImporterExtensionCollectionTests.cs index 20b0d5dbaf8..718e62c1fff 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization.Advanced/SchemaImporterExtensionCollectionTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization.Advanced/SchemaImporterExtensionCollectionTests.cs @@ -28,7 +28,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !MOBILE +#if NET_2_0 using System; using System.CodeDom; diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization.Advanced/SchemaImporterExtensionTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization.Advanced/SchemaImporterExtensionTests.cs index 7311fbb27e8..5b8d9de6dcc 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization.Advanced/SchemaImporterExtensionTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization.Advanced/SchemaImporterExtensionTests.cs @@ -28,7 +28,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !MOBILE +#if NET_2_0 using System; using System.CodeDom; diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs index b1c7597c150..9f0e0191135 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/SoapSchemaExporterTests.cs @@ -7,8 +7,6 @@ // (C) 2005 Novell // -#if !MOBILE - using System; using System.Collections; using System.Globalization; @@ -1161,5 +1159,3 @@ namespace MonoTests.System.XmlSerialization } } } - -#endif
\ No newline at end of file diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs index 91f0ed1d282..25a1ecf74bf 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs @@ -8,8 +8,6 @@ // (C) 2006 Novell // -#if !MOBILE - using System; using System.CodeDom; using System.CodeDom.Compiler; @@ -1306,5 +1304,3 @@ namespace MonoTests.System.XmlSerialization } } } - -#endif diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaExporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaExporterTests.cs index fc55852869d..f8713258a0f 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaExporterTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaExporterTests.cs @@ -1783,9 +1783,11 @@ namespace MonoTests.System.XmlSerialization [Test] #if NET_2_0 [Category ("NotWorking")] // support for XmlSchemaProvider is not implemented +#else + [Category ("NotWorking")] // mark it NotWorking until fixes have landed in svn #endif public void ExportXmlSerializable_SchemaProvider1 () { - XmlSchemas schemas = Export (typeof (PrimitiveSchemaProvider)); + XmlSchemas schemas = schemas = Export (typeof (PrimitiveSchemaProvider)); Assert.AreEqual (1, schemas.Count, "#1"); StringWriter sw = new StringWriter (); diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaImporterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaImporterTests.cs index fe4838cb2e9..80958667639 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaImporterTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaImporterTests.cs @@ -39,9 +39,8 @@ using System.IO; using System.Xml; using System.Xml.Schema; using System.Xml.Serialization; -#if !MOBILE using Microsoft.CSharp; -#endif + using NUnit.Framework; using MonoTests.System.Xml.TestClasses; @@ -892,8 +891,6 @@ namespace MonoTests.System.Xml.Serialization Assert.AreEqual ("UInt16", map.TypeName, "#6"); } -#if !MOBILE - [Test] public void ImportTypeMapping_EnumSimpleContent () { @@ -1078,6 +1075,30 @@ namespace MonoTests.System.Xml.Serialization return null; } + private static XmlSchemas ExportType (Type type) + { + XmlReflectionImporter ri = new XmlReflectionImporter ("NS" + type.Name); + XmlSchemas schemas = new XmlSchemas (); + XmlSchemaExporter sx = new XmlSchemaExporter (schemas); + XmlTypeMapping tm = ri.ImportTypeMapping (type); + sx.ExportTypeMapping (tm); + return schemas; + } + + private static ArrayList GetXmlQualifiedNames (XmlSchemas schemas) + { + ArrayList qnames = new ArrayList (); + + foreach (XmlSchema schema in schemas) { + if (!schema.IsCompiled) schema.Compile (null); + foreach (XmlSchemaObject ob in schema.Items) + if (ob is XmlSchemaElement) + qnames.Add (((XmlSchemaElement) ob).QualifiedName); + } + + return qnames; + } + [Test] [ExpectedException (typeof (InvalidOperationException))] public void ImportTypeMappingNonExistent () @@ -1217,31 +1238,5 @@ namespace MonoTests.System.Xml.Serialization xss.Add (XmlSchema.Read (new XmlTextReader (new StringReader (xsd)), null)); return new XmlSchemaImporter (xss); } - -#endif - - private static ArrayList GetXmlQualifiedNames (XmlSchemas schemas) - { - ArrayList qnames = new ArrayList (); - - foreach (XmlSchema schema in schemas) { - if (!schema.IsCompiled) schema.Compile (null); - foreach (XmlSchemaObject ob in schema.Items) - if (ob is XmlSchemaElement) - qnames.Add (((XmlSchemaElement) ob).QualifiedName); - } - - return qnames; - } - - private static XmlSchemas ExportType (Type type) - { - XmlReflectionImporter ri = new XmlReflectionImporter ("NS" + type.Name); - XmlSchemas schemas = new XmlSchemas (); - XmlSchemaExporter sx = new XmlSchemaExporter (schemas); - XmlTypeMapping tm = ri.ImportTypeMapping (type); - sx.ExportTypeMapping (tm); - return schemas; - } } } diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs index ed63ede99fa..a7f00ab1e24 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializerTests.cs @@ -2187,7 +2187,8 @@ namespace MonoTests.System.XmlSerialization ser.Deserialize (new XmlTextReader (xml, XmlNodeType.Document, null)); } -#if !TARGET_JVM && !MOBILE +#if NET_2_0 +#if !TARGET_JVM [Test] public void GenerateSerializerGenerics () { @@ -2265,6 +2266,7 @@ namespace MonoTests.System.XmlSerialization Assert.AreEqual (TestEnumWithNulls.bb, w.nenum.Value); Assert.AreEqual (t, w.ndate.Value); } +#endif [Test] public void SerializeBase64Binary() diff --git a/mcs/class/System.XML/Test/System.Xml/XmlDocumentEventTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlDocumentEventTests.cs index 657d672e5bc..4df96725fbb 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlDocumentEventTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlDocumentEventTests.cs @@ -18,6 +18,11 @@ namespace MonoTests.System.Xml [TestFixture]
public class XmlDocumentEventTests
{
+ public static void Main ()
+ {
+ new XmlDocumentEventTests ().InsertingOrder ();
+ }
+
private StringBuilder eventLogBuilder = new StringBuilder ();
private XmlDocument GetEventDocument ()
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs index 52de90d1414..d8035e4d010 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs @@ -27,8 +27,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !MOBILE - using NUnit.Framework; using System; @@ -84,5 +82,3 @@ namespace MonoCasTests.System.Xml { } } } - -#endif
\ No newline at end of file diff --git a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs index c97407de984..0603a694d42 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs @@ -8,8 +8,6 @@ // Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com) // -#if !MOBILE - using System; using System.Collections; using System.IO; @@ -134,4 +132,3 @@ namespace MonoTestsXml } } -#endif diff --git a/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs index 59752547bc0..17e94fc1567 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs @@ -104,17 +104,19 @@ namespace MonoTests.System.Xml #if NET_4_5
[Test]
+ [Category("Async")]
public void TestAsync ()
{
var loc = Assembly.GetExecutingAssembly ().Location;
Uri resolved = resolver.ResolveUri (null, loc);
Assert.AreEqual ("file", resolved.Scheme);
var task = resolver.GetEntityAsync (resolved, null, typeof (Stream));
- Assert.IsTrue (task.Wait (3000));
- Assert.IsTrue (task.Result is Stream);
+ Assert.That (task.Wait (3000));
+ Assert.IsInstanceOfType (typeof (Stream), task.Result);
}
[Test]
+ [Category("Async")]
public void TestAsyncError ()
{
var loc = Assembly.GetExecutingAssembly ().Location;
@@ -127,7 +129,7 @@ namespace MonoTests.System.Xml } catch (Exception ex) {
if (ex is AggregateException)
ex = ((AggregateException) ex).InnerException;
- Assert.IsTrue (ex is XmlException);
+ Assert.IsInstanceOfType (typeof (XmlException), ex);
}
}
#endif
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs index bd5cb6af26f..6ade78b4461 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs @@ -47,7 +47,6 @@ namespace MonoTests.System.Xml } [Test] - [Category ("MobileNotWorking")] public void EncodingTest () { // For Stream it makes sense diff --git a/mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XAttributeTest.cs b/mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XAttributeTest.cs index 7d1e8302b68..15bad621e9c 100644 --- a/mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XAttributeTest.cs +++ b/mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XAttributeTest.cs @@ -451,7 +451,7 @@ namespace MonoTests.System.Xml.Linq Assert.IsNotNull ((double?) new XAttribute (m), "m:double?:null"); Assert.AreEqual (double.NegativeInfinity, ((double?) new XAttribute (m)).Value, "m:double?:value"); Assert.IsNotNull ((double?) new XAttribute (n), "n:double?:null"); - Assert.AreEqual (double.NaN, ((double?) new XAttribute (n)).Value, "n:double?:value"); + Assert.IsNaN (((double?) new XAttribute (n)).Value, "n:double?:value"); Assert.IsNotNull ((float?) new XAttribute (a), "a:float?:null"); Assert.AreEqual (7f, ((float?) new XAttribute (a)).Value, "a:float?:value"); Assert.IsNotNull ((float?) new XAttribute (b), "b:float?:null"); @@ -473,7 +473,7 @@ namespace MonoTests.System.Xml.Linq Assert.IsNotNull ((float?) new XAttribute (m), "m:float?:null"); Assert.AreEqual (float.NegativeInfinity, ((float?) new XAttribute (m)).Value, "m:float?:value"); Assert.IsNotNull ((float?) new XAttribute (n), "n:float?:null"); - Assert.AreEqual (float.NaN, ((float?) new XAttribute (n)).Value, "n:float?:value"); + Assert.IsNaN (((float?) new XAttribute (n)).Value, "n:float?:value"); AssertThrows<FormatException> (() => { Guid? z = (Guid?) new XAttribute (a); }, "a:Guid?"); AssertThrows<FormatException> (() => { Guid? z = (Guid?) new XAttribute (b); }, "b:Guid?"); AssertThrows<FormatException> (() => { Guid? z = (Guid?) new XAttribute (c); }, "c:Guid?"); @@ -629,7 +629,7 @@ namespace MonoTests.System.Xml.Linq Assert.AreEqual (double.PositiveInfinity, (double) new XAttribute (i), "i:double"); Assert.AreEqual (double.NegativeInfinity, (double) new XAttribute (M), "M:double"); Assert.AreEqual (double.NegativeInfinity, (double) new XAttribute (m), "m:double"); - Assert.AreEqual (double.NaN, ((double) new XAttribute (n)), "n:double"); + Assert.IsNaN (((double) new XAttribute (n)), "n:double"); Assert.AreEqual (7f, (float) new XAttribute (a), "a:float"); Assert.AreEqual (42f, (float) new XAttribute (b), "b:float"); Assert.AreEqual (123f, (float) new XAttribute (c), "c:float"); @@ -640,7 +640,7 @@ namespace MonoTests.System.Xml.Linq Assert.AreEqual (float.PositiveInfinity, (float) new XAttribute (i), "i:float"); Assert.AreEqual (float.NegativeInfinity, (float) new XAttribute (M), "M:float"); Assert.AreEqual (float.NegativeInfinity, (float) new XAttribute (m), "m:float"); - Assert.AreEqual (float.NaN, ((float) new XAttribute (n)), "n:float"); + Assert.IsNaN (((float) new XAttribute (n)), "n:float"); AssertThrows<FormatException> (() => { Guid z = (Guid) new XAttribute (a); }, "a:Guid"); AssertThrows<FormatException> (() => { Guid z = (Guid) new XAttribute (b); }, "b:Guid"); AssertThrows<FormatException> (() => { Guid z = (Guid) new XAttribute (c); }, "c:Guid"); diff --git a/mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XElementTest.cs b/mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XElementTest.cs index 5a5f255094c..59a38543164 100644 --- a/mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XElementTest.cs +++ b/mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XElementTest.cs @@ -907,7 +907,7 @@ namespace MonoTests.System.Xml.Linq Assert.IsNotNull ((double?) new XElement (m), "m:double?:null"); Assert.AreEqual (double.NegativeInfinity, ((double?) new XElement (m)).Value, "m:double?:value"); Assert.IsNotNull ((double?) new XElement (n), "n:double?:null"); - Assert.AreEqual (double.NaN, ((double?) new XElement (n)).Value, "n:double?:value"); + Assert.IsNaN (((double?) new XElement (n)).Value, "n:double?:value"); Assert.IsNotNull ((float?) new XElement (a), "a:float?:null"); Assert.AreEqual (7f, ((float?) new XElement (a)).Value, "a:float?:value"); Assert.IsNotNull ((float?) new XElement (b), "b:float?:null"); @@ -929,7 +929,7 @@ namespace MonoTests.System.Xml.Linq Assert.IsNotNull ((float?) new XElement (m), "m:float?:null"); Assert.AreEqual (float.NegativeInfinity, ((float?) new XElement (m)).Value, "m:float?:value"); Assert.IsNotNull ((float?) new XElement (n), "n:float?:null"); - Assert.AreEqual (float.NaN, ((float?) new XElement (n)).Value, "n:float?:value"); + Assert.IsNaN (((float?) new XElement (n)).Value, "n:float?:value"); AssertThrows<FormatException> (() => { Guid? z = (Guid?) new XElement (a); }, "a:Guid?"); AssertThrows<FormatException> (() => { Guid? z = (Guid?) new XElement (b); }, "b:Guid?"); AssertThrows<FormatException> (() => { Guid? z = (Guid?) new XElement (c); }, "c:Guid?"); @@ -1085,7 +1085,7 @@ namespace MonoTests.System.Xml.Linq Assert.AreEqual (double.PositiveInfinity, (double) new XElement (i), "i:double"); Assert.AreEqual (double.NegativeInfinity, (double) new XElement (M), "M:double"); Assert.AreEqual (double.NegativeInfinity, (double) new XElement (m), "m:double"); - Assert.AreEqual (double.NaN, ((double) new XElement (n)), "n:double"); + Assert.IsNaN (((double) new XElement (n)), "n:double"); Assert.AreEqual (7f, (float) new XElement (a), "a:float"); Assert.AreEqual (42f, (float) new XElement (b), "b:float"); Assert.AreEqual (13f, (float) new XElement (c), "c:float"); @@ -1096,7 +1096,7 @@ namespace MonoTests.System.Xml.Linq Assert.AreEqual (float.PositiveInfinity, (float) new XElement (i), "i:float"); Assert.AreEqual (float.NegativeInfinity, (float) new XElement (M), "M:float"); Assert.AreEqual (float.NegativeInfinity, (float) new XElement (m), "m:float"); - Assert.AreEqual (float.NaN, ((float) new XElement (n)), "n:float"); + Assert.IsNaN (((float) new XElement (n)), "n:float"); AssertThrows<FormatException> (() => { Guid z = (Guid) new XElement (a); }, "a:Guid"); AssertThrows<FormatException> (() => { Guid z = (Guid) new XElement (b); }, "b:Guid"); AssertThrows<FormatException> (() => { Guid z = (Guid) new XElement (c); }, "c:Guid"); diff --git a/mcs/class/System.Xml.Linq/Test/System.Xml.Schema/ExtensionsTest.cs b/mcs/class/System.Xml.Linq/Test/System.Xml.Schema/ExtensionsTest.cs index da577e644ef..2ed1b5dedb6 100644 --- a/mcs/class/System.Xml.Linq/Test/System.Xml.Schema/ExtensionsTest.cs +++ b/mcs/class/System.Xml.Linq/Test/System.Xml.Schema/ExtensionsTest.cs @@ -9,8 +9,6 @@ // (C) Stefan Prutianu // -#if !MOBILE - using NUnit.Framework; using System; using System.Xml; @@ -469,5 +467,3 @@ namespace MonoTests.System.Xml.Schema } } - -#endif
\ No newline at end of file diff --git a/mcs/class/corlib/System.Collections.ObjectModel/ReadOnlyDictionary.cs b/mcs/class/corlib/System.Collections.ObjectModel/ReadOnlyDictionary.cs deleted file mode 100644 index a012b56dd06..00000000000 --- a/mcs/class/corlib/System.Collections.ObjectModel/ReadOnlyDictionary.cs +++ /dev/null @@ -1,441 +0,0 @@ -// -// ReadOnlyDictionary.cs -// -// Authors: -// Martin Baulig <martin.baulig@xamarin.com> -// Marek Safar (marek.safar@gmail.com) -// -// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com) -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -// THE SOFTWARE. - -#if NET_4_5 -using System; -using System.Collections.Generic; -using System.Diagnostics; - -namespace System.Collections.ObjectModel { - - [Serializable] - [DebuggerDisplay ("Count={Count}")] - [DebuggerTypeProxy (typeof (CollectionDebuggerView<,>))] - public class ReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IDictionary, - IReadOnlyDictionary<TKey, TValue> - { - readonly IDictionary<TKey, TValue> inner; - - public ReadOnlyDictionary (IDictionary<TKey, TValue> dictionary) - { - if (dictionary == null) - throw new ArgumentNullException ("dictionary"); - - this.inner = dictionary; - } - - protected IDictionary<TKey, TValue> Dictionary { - get { - return inner; - } - } - - public bool ContainsKey (TKey key) - { - return inner.ContainsKey (key); - } - - public bool TryGetValue (TKey key, out TValue value) - { - return inner.TryGetValue (key, out value); - } - - public TValue this [TKey key] { - get { - return inner [key]; - } - } - - public KeyCollection Keys { - get { - return new KeyCollection (inner.Keys); - } - } - - public ValueCollection Values { - get { - return new ValueCollection (inner.Values); - } - } - - #region IEnumerable<KeyValuePair<TKey, TValue>> implementation - public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator () - { - return inner.GetEnumerator (); - } - #endregion - #region IEnumerable implementation - IEnumerator IEnumerable.GetEnumerator () - { - return inner.GetEnumerator (); - } - #endregion - - #region IDictionary<TKey, TValue> implementation - - void IDictionary<TKey, TValue>.Add (TKey key, TValue value) - { - throw new NotSupportedException (); - } - - bool IDictionary<TKey, TValue>.Remove (TKey key) - { - throw new NotSupportedException (); - } - - TValue IDictionary<TKey, TValue>.this [TKey key] { - get { - return inner [key]; - } - set { - throw new NotSupportedException (); - } - } - - ICollection<TKey> IDictionary<TKey, TValue>.Keys { - get { - return Keys; - } - } - - ICollection<TValue> IDictionary<TKey, TValue>.Values { - get { - return Values; - } - } - - #endregion - - #region IDictionary implementation - - void IDictionary.Add (object key, object value) - { - throw new NotSupportedException (); - } - - void IDictionary.Clear () - { - throw new NotSupportedException (); - } - - bool IDictionary.Contains (object key) - { - return ((IDictionary)inner).Contains (key); - } - - IDictionaryEnumerator IDictionary.GetEnumerator () - { - return ((IDictionary)inner).GetEnumerator (); - } - - void IDictionary.Remove (object key) - { - throw new NotSupportedException (); - } - - bool IDictionary.IsFixedSize { - get { - return true; - } - } - - bool IDictionary.IsReadOnly { - get { - return true; - } - } - - object IDictionary.this [object key] { - get { - return ((IDictionary)inner)[key]; - } - set { - throw new NotSupportedException (); - } - } - - ICollection IDictionary.Keys { - get { - return Keys; - } - } - - ICollection IDictionary.Values { - get { - return Values; - } - } - - #endregion - - #region ICollection implementation - - void ICollection.CopyTo (Array array, int index) - { - ((ICollection)inner).CopyTo (array, index); - } - - #endregion - - #region ICollection<KeyValuePair<TKey, TValue>> implementation - - void ICollection<KeyValuePair<TKey, TValue>>.Add (KeyValuePair<TKey, TValue> item) - { - throw new NotSupportedException (); - } - - void ICollection<KeyValuePair<TKey, TValue>>.Clear () - { - throw new NotSupportedException (); - } - - bool ICollection<KeyValuePair<TKey, TValue>>.Contains (KeyValuePair<TKey, TValue> item) - { - return ((ICollection<KeyValuePair<TKey, TValue>>)inner).Contains (item); - } - - void ICollection<KeyValuePair<TKey, TValue>>.CopyTo (KeyValuePair<TKey, TValue>[] array, int arrayIndex) - { - ((ICollection<KeyValuePair<TKey, TValue>>)inner).CopyTo (array, arrayIndex); - } - - bool ICollection<KeyValuePair<TKey, TValue>>.Remove (KeyValuePair<TKey, TValue> item) - { - throw new NotSupportedException (); - } - - bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { - get { - return true; - } - } - - #endregion - - #region ICollection implementation - - public int Count { - get { - return inner.Count; - } - } - - bool ICollection.IsSynchronized { - get { - return false; - } - } - - object ICollection.SyncRoot { - get { - throw new NotSupportedException (); - } - } - - #endregion - - IEnumerable<TKey> IReadOnlyDictionary<TKey, TValue>.Keys { - get { - return Keys; - } - } - - IEnumerable<TValue> IReadOnlyDictionary<TKey, TValue>.Values { - get { - return Values; - } - } - - [Serializable] - [DebuggerDisplay ("Count={Count}")] - [DebuggerTypeProxy (typeof (CollectionDebuggerView<,>))] - public sealed class KeyCollection : ICollection<TKey>, IEnumerable<TKey>, ICollection, IEnumerable - { - readonly ICollection<TKey> collection; - - internal KeyCollection (ICollection<TKey> collection) - { - this.collection = collection; - } - - public void CopyTo (TKey [] array, int arrayIndex) - { - collection.CopyTo (array, arrayIndex); - } - - public IEnumerator<TKey> GetEnumerator () - { - return collection.GetEnumerator (); - } - - void ICollection<TKey>.Add (TKey item) - { - throw new NotSupportedException ("this is a read-only collection"); - } - - void ICollection<TKey>.Clear () - { - throw new NotSupportedException ("this is a read-only collection"); - } - - bool ICollection<TKey>.Contains (TKey item) - { - return collection.Contains (item); - } - - bool ICollection<TKey>.Remove (TKey item) - { - throw new NotSupportedException ("this is a read-only collection"); - } - - void ICollection.CopyTo (Array array, int index) - { - var target = array as TKey []; - if (target != null) { - CopyTo (target, index); - return; - } - - throw new NotImplementedException (); - } - - IEnumerator IEnumerable.GetEnumerator () - { - return collection.GetEnumerator (); - } - - public int Count { - get { - return collection.Count; - } - } - - bool ICollection<TKey>.IsReadOnly { - get { - return true; - } - } - - bool ICollection.IsSynchronized { - get { - return false; - } - } - - object ICollection.SyncRoot { - get { - throw new NotImplementedException (); - } - } - } - - [Serializable] - [DebuggerDisplay ("Count={Count}")] - [DebuggerTypeProxy (typeof (CollectionDebuggerView<,>))] - public sealed class ValueCollection : ICollection<TValue>, IEnumerable<TValue>, ICollection, IEnumerable - { - readonly ICollection<TValue> collection; - - internal ValueCollection (ICollection<TValue> collection) - { - this.collection = collection; - } - - public void CopyTo (TValue [] array, int arrayIndex) - { - collection.CopyTo (array, arrayIndex); - } - - public IEnumerator<TValue> GetEnumerator () - { - return collection.GetEnumerator (); - } - - void ICollection<TValue>.Add (TValue item) - { - throw new NotSupportedException ("this is a read-only collection"); - } - - void ICollection<TValue>.Clear () - { - throw new NotSupportedException ("this is a read-only collection"); - } - - bool ICollection<TValue>.Contains (TValue item) - { - return collection.Contains (item); - } - - bool ICollection<TValue>.Remove (TValue item) - { - throw new NotSupportedException ("this is a read-only collection"); - } - - void ICollection.CopyTo (Array array, int index) - { - var target = array as TValue []; - if (target != null) { - CopyTo (target, index); - return; - } - - throw new NotImplementedException (); - } - - IEnumerator IEnumerable.GetEnumerator () - { - return collection.GetEnumerator (); - } - - public int Count { - get { - return collection.Count; - } - } - - bool ICollection<TValue>.IsReadOnly { - get { - return true; - } - } - - bool ICollection.IsSynchronized { - get { - return false; - } - } - - object ICollection.SyncRoot { - get { - throw new NotImplementedException (); - } - } - } - } -} -#endif - diff --git a/mcs/class/corlib/System.IO/Path.cs b/mcs/class/corlib/System.IO/Path.cs index 57c33d3732b..95ba4ee3d3e 100644 --- a/mcs/class/corlib/System.IO/Path.cs +++ b/mcs/class/corlib/System.IO/Path.cs @@ -222,8 +222,6 @@ namespace System.IO { if (l >= 2 && DirectorySeparatorChar == '\\' && ret [l - 1] == VolumeSeparatorChar) return ret + DirectorySeparatorChar; - else if (l == 1 && DirectorySeparatorChar == '\\' && path.Length >= 2 && path [nLast] == VolumeSeparatorChar) - return ret + VolumeSeparatorChar; else { // // Important: do not use CanonicalizePath here, use diff --git a/mcs/class/corlib/System.Text/Decoder.cs b/mcs/class/corlib/System.Text/Decoder.cs index cf2e6f23efc..fe715c33796 100644 --- a/mcs/class/corlib/System.Text/Decoder.cs +++ b/mcs/class/corlib/System.Text/Decoder.cs @@ -149,10 +149,7 @@ public abstract class Decoder out int bytesUsed, out int charsUsed, out bool completed) { CheckArguments (bytes, byteIndex, byteCount); - if (chars == null) - throw new ArgumentNullException ("chars"); - if (charIndex < 0) - throw new ArgumentOutOfRangeException ("charIndex"); + CheckArguments (chars, charIndex); if (charCount < 0 || chars.Length < charIndex + charCount) throw new ArgumentOutOfRangeException ("charCount"); @@ -172,7 +169,7 @@ public abstract class Decoder { if (chars == null) throw new ArgumentNullException ("chars"); - if (charIndex < 0 || chars.Length < charIndex) + if (charIndex < 0 || chars.Length <= charIndex) throw new ArgumentOutOfRangeException ("charIndex"); } @@ -180,7 +177,7 @@ public abstract class Decoder { if (bytes == null) throw new ArgumentNullException ("bytes"); - if (byteIndex < 0) + if (byteIndex < 0 || bytes.Length <= byteIndex) throw new ArgumentOutOfRangeException ("byteIndex"); if (byteCount < 0 || bytes.Length < byteIndex + byteCount) throw new ArgumentOutOfRangeException ("byteCount"); diff --git a/mcs/class/corlib/System.Text/UTF8Encoding.cs b/mcs/class/corlib/System.Text/UTF8Encoding.cs index bdd80e8a626..fd5e83be04e 100644 --- a/mcs/class/corlib/System.Text/UTF8Encoding.cs +++ b/mcs/class/corlib/System.Text/UTF8Encoding.cs @@ -663,7 +663,7 @@ fail_no_space: throw new ArgumentOutOfRangeException ("charIndex", _("ArgRange_Array")); } - if (charIndex == chars.Length && byteCount == 0) + if (charIndex == chars.Length) return 0; fixed (char* cptr = chars) { @@ -688,14 +688,10 @@ fail_no_space: if (leftOverCount == 0) { int end = byteIndex + byteCount; for (; byteIndex < end; posn++, byteIndex++, byteCount--) { - if (bytes [byteIndex] < 0x80) { - if (posn >= length) { - throw new ArgumentException (_("Arg_InsufficientSpace"), "chars"); - } + if (bytes [byteIndex] < 0x80) chars [posn] = (char) bytes [byteIndex]; - } else { + else break; - } } } diff --git a/mcs/class/corlib/Test/System.IO/PathTest.cs b/mcs/class/corlib/Test/System.IO/PathTest.cs index 77822ac98c4..fb53d803b88 100644 --- a/mcs/class/corlib/Test/System.IO/PathTest.cs +++ b/mcs/class/corlib/Test/System.IO/PathTest.cs @@ -280,8 +280,6 @@ namespace MonoTests.System.IO Assert.AreEqual (@"C:\dir", Path.GetDirectoryName (@"C:\dir\"), "#B5"); Assert.AreEqual (@"C:\dir", Path.GetDirectoryName (@"C:\dir\dir"), "#B6"); Assert.AreEqual (@"C:\dir\dir", Path.GetDirectoryName (@"C:\dir\dir\"), "#B7"); - Assert.AreEqual (@"C:", Path.GetDirectoryName (@"C:foo.txt"), "#B8"); - Assert.AreEqual (@"C:dir", Path.GetDirectoryName (@"C:dir\"), "#B9"); Assert.AreEqual ("\\foo\\bar", Path.GetDirectoryName ("/foo//bar/dingus"), "#C1"); Assert.AreEqual ("foo\\bar", Path.GetDirectoryName ("foo/bar/"), "#C2"); diff --git a/mcs/class/corlib/Test/System.Text/DecoderTest.cs b/mcs/class/corlib/Test/System.Text/DecoderTest.cs index 6cf0306d823..3da0846360b 100644 --- a/mcs/class/corlib/Test/System.Text/DecoderTest.cs +++ b/mcs/class/corlib/Test/System.Text/DecoderTest.cs @@ -98,22 +98,5 @@ namespace MonoTests.System.Text } } #endif - - [Test] - public void Bug10789 () - { - byte[] bytes = new byte[100]; - char[] chars = new char[100]; - - Decoder conv = Encoding.UTF8.GetDecoder (); - int charsUsed, bytesUsed; - bool completed; - - conv.Convert (bytes, 0, 0, chars, 100, 0, false, out bytesUsed, out charsUsed, out completed); - - Assert.IsTrue (completed, "#1"); - Assert.AreEqual (0, charsUsed, "#2"); - Assert.AreEqual (0, bytesUsed, "#3"); - } } } diff --git a/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs b/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs index 1f53af7e3eb..0b0ae720602 100644 --- a/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs +++ b/mcs/class/corlib/Test/System.Text/UTF8EncodingTest.cs @@ -1164,37 +1164,5 @@ namespace MonoTests.System.Text } } #endif - - [Test] - [ExpectedException (typeof (ArgumentException))] - public void Bug10788() - { - byte[] bytes = new byte[4096]; - char[] chars = new char[10]; - - Encoding.UTF8.GetDecoder ().GetChars (bytes, 0, 4096, chars, 9, false); - } - - [Test] - public void Bug10789() - { - byte[] bytes = new byte[4096]; - char[] chars = new char[10]; - - try { - Encoding.UTF8.GetDecoder ().GetChars (bytes, 0, 1, chars, 10, false); - Assert.Fail ("ArgumentException is expected #1"); - } catch (ArgumentException) { - } - - try { - Encoding.UTF8.GetDecoder ().GetChars (bytes, 0, 1, chars, 11, false); - Assert.Fail ("ArgumentOutOfRangeException is expected #2"); - } catch (ArgumentOutOfRangeException) { - } - - int charactersWritten = Encoding.UTF8.GetDecoder ().GetChars (bytes, 0, 0, chars, 10, false); - Assert.AreEqual (0, charactersWritten, "#3"); - } } } diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index 4d9560fc138..eafb48667df 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -1562,7 +1562,6 @@ System.Collections.Generic/List.cs System.Collections.ObjectModel/Collection.cs System.Collections.ObjectModel/KeyedCollection.cs System.Collections.ObjectModel/ReadOnlyCollection.cs -System.Collections.ObjectModel/ReadOnlyDictionary.cs System/Action.cs System/ArraySegment.cs System/Comparison.cs diff --git a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/HoistedLocals.cs b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/HoistedLocals.cs index ddb304be986..b6db15ad2e2 100644 --- a/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/HoistedLocals.cs +++ b/mcs/class/dlr/Runtime/Microsoft.Scripting.Core/Compiler/HoistedLocals.cs @@ -64,7 +64,7 @@ namespace System.Linq.Expressions.Compiler { internal readonly HoistedLocals Parent; // A mapping of hoisted variables to their indexes in the array - internal readonly System.Dynamic.Utils.ReadOnlyDictionary<Expression, int> Indexes; + internal readonly ReadOnlyDictionary<Expression, int> Indexes; // The variables, in the order they appear in the array internal readonly ReadOnlyCollection<ParameterExpression> Variables; @@ -87,7 +87,7 @@ namespace System.Linq.Expressions.Compiler { SelfVariable = Expression.Variable(typeof(object[]), null); Parent = parent; Variables = vars; - Indexes = new System.Dynamic.Utils.ReadOnlyDictionary<Expression, int>(indexes); + Indexes = new ReadOnlyDictionary<Expression, int>(indexes); } internal ParameterExpression ParentVariable { |