diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2013-03-01 19:54:09 +0400 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2013-03-01 19:54:09 +0400 |
| commit | abe9dc62066232dcd3b6e8ba70df575fd2ee342f (patch) | |
| tree | bfff098c8f34a03c7efade64bb743feafaa16e34 /mcs/class/System.XML/Test/System.Xml | |
| parent | 93e2d1dc48339be472300910e9290939ee253177 (diff) | |
Revert "Fix object::GetType when remoting is enabled."
This reverts commit 93e2d1dc48339be472300910e9290939ee253177.
Diffstat (limited to 'mcs/class/System.XML/Test/System.Xml')
5 files changed, 11 insertions, 10 deletions
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlDocumentEventTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlDocumentEventTests.cs index 4df96725fbb..657d672e5bc 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlDocumentEventTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlDocumentEventTests.cs @@ -18,11 +18,6 @@ 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 d8035e4d010..52de90d1414 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverCas.cs @@ -27,6 +27,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // +#if !MOBILE + using NUnit.Framework; using System; @@ -82,3 +84,5 @@ 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 0603a694d42..c97407de984 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlSecureResolverTests.cs @@ -8,6 +8,8 @@ // Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com) // +#if !MOBILE + using System; using System.Collections; using System.IO; @@ -132,3 +134,4 @@ 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 17e94fc1567..59752547bc0 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs @@ -104,19 +104,17 @@ 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.That (task.Wait (3000));
- Assert.IsInstanceOfType (typeof (Stream), task.Result);
+ Assert.IsTrue (task.Wait (3000));
+ Assert.IsTrue (task.Result is Stream);
}
[Test]
- [Category("Async")]
public void TestAsyncError ()
{
var loc = Assembly.GetExecutingAssembly ().Location;
@@ -129,7 +127,7 @@ namespace MonoTests.System.Xml } catch (Exception ex) {
if (ex is AggregateException)
ex = ((AggregateException) ex).InnerException;
- Assert.IsInstanceOfType (typeof (XmlException), ex);
+ Assert.IsTrue (ex is XmlException);
}
}
#endif
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs index 6ade78b4461..bd5cb6af26f 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs @@ -47,6 +47,7 @@ namespace MonoTests.System.Xml } [Test] + [Category ("MobileNotWorking")] public void EncodingTest () { // For Stream it makes sense |