Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -7,7 +7,6 @@
// Copyright (C) 2005 Novell, Inc. http://www.novell.com
//
#if NET_2_0
using System;
using System.Xml;
@@ -792,4 +791,3 @@ namespace MonoTests.System.Xml.XPath
}
}
#endif

View File

@@ -425,7 +425,6 @@ namespace MonoTests.System.Xml
Assert.AreEqual (2, iter.Count, "#1");
}
#if NET_2_0
[Test]
// bug #78067
@@ -462,7 +461,6 @@ namespace MonoTests.System.Xml
xr.Read (); // should be at x:val
Assert.AreEqual ("urn:x", xr.LookupNamespace ("x"), "#1");
}
#endif
[Test]
public void GetNamespaceConsistentTree ()

View File

@@ -47,14 +47,6 @@ namespace MonoTests.System.Xml
// Testing Core Funcetion Library functions defined at: http://www.w3.org/TR/xpath#corelib
[Test]
#if !NET_2_0
// .NET 2.0 is fixed for last() to return 1 for the
// initial context position. Someone thinks we should follow
// the fix, but in reality we should just discard this
// pointless test. The positional value under those conditions
// does not make any sense.
[Category ("NotDotNet")]
#endif
public void CoreFunctionNodeSetLast ()
{
expression = navigator.Compile("last()");
@@ -69,15 +61,6 @@ namespace MonoTests.System.Xml
}
[Test]
#if !NET_2_0
// .NET 2.0 is fixed for position() to return 1 for the
// initial context position. Someone thinks we should follow
// the fix, but in reality we should just discard this
// pointless test. The positional value under those conditions
// does not make any sense.
// [Category ("NotWorking")]
[Category ("NotDotNet")]
#endif
public void CoreFunctionNodeSetPosition ()
{
expression = navigator.Compile("position()");

View File

@@ -6,7 +6,6 @@
//
// Copyright (C) 2005 Novell, Inc. http://www.novell.com
//
#if NET_2_0
using System;
using System.Xml;
@@ -682,4 +681,3 @@ namespace MonoTests.System.Xml.XPath
}
}
#endif

View File

@@ -258,14 +258,6 @@ namespace MonoTests.System.Xml
Assert.IsTrue (nav.MoveToId ("aaa"), "ctor() from XmlValidatingReader");
// FIXME: it seems to result in different in .NET 2.0.
#if NET_2_0
#else
// When it is XmlTextReader, XPathDocument fails.
XmlTextReader xtr = new XmlTextReader (xml, XmlNodeType.Document, null);
nav = new XPathDocument (xtr).CreateNavigator ();
Assert.IsTrue (!nav.MoveToId ("aaa"), "ctor() from XmlTextReader");
xtr.Close ();
#endif
}
[Test]
@@ -443,7 +435,6 @@ namespace MonoTests.System.Xml
Assert.IsTrue (i.MoveNext (), "#2");
}
#if NET_2_0
[Test]
public void ValueAsBoolean ()
{
@@ -716,6 +707,5 @@ namespace MonoTests.System.Xml
return;
Assert.Fail ("no selection");
}
#endif
}
}