Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/corlib/Test/System.IO/DirectoryTest.cs

@@ -17,7 +17,7 @@ using System.IO;
 using System.Text;
 using System.Threading;
 
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MOBILE
 using Mono.Unix;
 #endif
 using NUnit.Framework;
@@ -47,7 +47,7 @@ public class DirectoryTest
 		if (Directory.Exists (TempFolder))
 			Directory.Delete (TempFolder, true);
 	}
-#if !MONOTOUCH && !MOBILE_STATIC
+#if !MOBILE
 	[Test] //BXC #12461
 	public void EnumerateFilesListSymlinks ()
 	{
@@ -1527,7 +1527,23 @@ public class DirectoryTest
 		info = Directory.GetParent (Path.GetPathRoot (Path.GetTempPath ()));
 		Assert.IsNull (info);
 	}
-	
+
+	[Test]
+	public void GetDirectoryRoot ()
+	{
+		if (RunningOnUnix)
+		{
+			string path = "/usr/lib";
+			Assert.AreEqual ("/", Directory.GetDirectoryRoot (path));
+		}
+		else
+		{
+			Assert.Ignore ("TODO: no proper implementation on Windows.");
+			string path = "C:\\Windows";
+			Assert.AreEqual ("C:\\", Directory.GetDirectoryRoot (path));
+		}
+	}
+
 	[Test]
 	public void GetFiles ()
 	{
@@ -1673,6 +1689,20 @@ public class DirectoryTest
 		}
 	}
 
+	
+	[Test]
+	public void GetFiles_SubDirInPattern ()
+	{
+		string DirPath = TempFolder + Path.DirectorySeparatorChar + "GetFiles_SubDirInPattern";
+		if (Directory.Exists (DirPath))
+			Directory.Delete (DirPath, true);
+
+		Directory.CreateDirectory ($"{DirPath}{Path.DirectorySeparatorChar}something{Path.DirectorySeparatorChar}else");
+		File.WriteAllText($"{DirPath}{Path.DirectorySeparatorChar}something{Path.DirectorySeparatorChar}else{Path.DirectorySeparatorChar}file", "hello");
+
+		var r = Directory.GetFiles (DirPath, $"something{Path.DirectorySeparatorChar}else{Path.DirectorySeparatorChar}*", SearchOption.AllDirectories);
+		Assert.AreEqual (new string[] { Path.Combine (DirPath, "something", "else", "file") }, r);
+	}
 
 	[Test]
 	[ExpectedException (typeof (ArgumentNullException))]

mcs/class/corlib/Test/System.IO/FileStreamTest.cs

@@ -1742,5 +1742,15 @@ namespace MonoTests.System.IO
 				DeleteFile (path);
 			}
 		}
+
+		[Test]
+		public void NamePropertyNormalization ()
+		{
+			string fname = TempFolder + DSC + ".." + DSC + "MonoTests.System.IO.Tests" + DSC + "tfile.txt";
+
+			using (var s = new FileStream (fname, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Delete)) {
+				Assert.AreEqual (TempFolder + DSC + "tfile.txt", s.Name);
+			}
+		}
 	}
 }