Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs

@@ -925,7 +925,6 @@ namespace MonoTests.System.Xml
 				xtr.Read ();
 		}
 
-#if NET_2_0
 		[Test]
 		public void Settings ()
 		{
@@ -1082,7 +1081,6 @@ namespace MonoTests.System.Xml
 			} catch (XmlException) {
 			}
 		}
-#endif
 
 		[Test]
 		public void SurrogatePair ()
@@ -1433,5 +1431,43 @@ namespace MonoTests.System.Xml
 			Assert.IsFalse (reader.ReadAttributeValue(), "#4");
 			Assert.AreEqual (XmlNodeType.Text, reader.NodeType, "#5");
 		}
+		
+		[Test]
+		public void Whitespaces ()
+		{
+			const string xml = "<?xml version=\"1.0\"?><test> <foo name=\"Hello\"> <value>World</value> </foo> <foo name=\"Foo\"><value>Bar</value></foo></test>";
+			var reader = new XmlTextReader (new StringReader (xml));
+			//reader.WhitespaceHandling = WhitespaceHandling.All;
+
+			reader.Read ();
+			Assert.AreEqual  (XmlNodeType.XmlDeclaration, reader.NodeType, "#1a");
+			reader.Read ();
+			Assert.AreEqual (XmlNodeType.Element, reader.NodeType, "#1b");
+			Assert.AreEqual ("test", reader.Name, "#1c");
+
+			reader.Read ();
+			if  (reader.NodeType == XmlNodeType.Whitespace)
+				reader.Read ();
+
+			Assert.AreEqual (XmlNodeType.Element, reader.NodeType, "#2a");
+			Assert.AreEqual ("foo", reader.Name, "#2b");
+
+			var doc = new XmlDocument ();
+			//doc.PreserveWhitespace = true;
+			doc.ReadNode (reader);
+
+			Assert.AreEqual (XmlNodeType.Whitespace, reader.NodeType, "#3");
+
+			reader.Read ();
+			if  (reader.NodeType == XmlNodeType.Whitespace)
+				reader.Read ();
+
+			Assert.AreEqual (XmlNodeType.Element, reader.NodeType, "#4");
+			Assert.AreEqual ("foo", reader.Name, "#4b");
+
+			doc.ReadNode (reader);
+
+			Assert.AreEqual (XmlNodeType.EndElement, reader.NodeType, "#5");
+		}
 	}
 }