Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@ -1723,13 +1723,14 @@ public class DirectoryTest
Directory.SetCurrentDirectory (" ");
}
[Test] // https://github.com/mono/mono/issues/13030
public void GetLogicalDrivesNotEmpty ()
{
CollectionAssert.IsNotEmpty (Directory.GetLogicalDrives ());
}
[Test] // https://github.com/mono/mono/issues/13030
public void GetLogicalDrivesNotEmpty ()
{
CollectionAssert.IsNotEmpty (Directory.GetLogicalDrives ());
}
[Test]
[Category("AndroidSdksNotWorking")]
public void GetNoFiles () // Bug 58875. This throwed an exception on windows.
{
DirectoryInfo dir = new DirectoryInfo (".");

View File

@ -30,6 +30,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
@ -43,7 +44,7 @@ namespace MonoTests.System.IO
[Test]
public void Constructor ()
{
if (Environment.OSVersion.Platform != PlatformID.Win32NT)
if (!RuntimeInformation.IsOSPlatform (OSPlatform.Windows))
Assert.Ignore ("The Jenkins builders don't have '/' mounted, just testing Windows for now.");
var drive = new DriveInfo ("C:\\");
@ -54,7 +55,22 @@ namespace MonoTests.System.IO
[Test]
public void ConstructorThrowsOnNonExistingDrive ()
{
Assert.Throws<ArgumentException> (() => new DriveInfo ("/monodriveinfotest"));
Assert.Throws<ArgumentException> (() => new DriveInfo ("monodriveinfotest"));
}
[Test]
[Category ("NotWasm")] // it doesn't know about 'memfs' drive format
public void ConstructorGetsValidDriveFromNonDriveString ()
{
if (!RuntimeInformation.IsOSPlatform (OSPlatform.Windows) && !RuntimeInformation.IsOSPlatform (OSPlatform.OSX))
Assert.Ignore ("Some Linux-hosted CI builders don't have '/' mounted, just testing Windows and MacOS for now.");
var tempPath = Path.GetTempPath ();
var drive = new DriveInfo (tempPath);
ValidateDriveInfo (drive);
drive = new DriveInfo (tempPath.ToUpper());
ValidateDriveInfo (drive);
}
[Test]

View File

@ -622,6 +622,7 @@ namespace MonoTests.System.IO
}
[Test]
[Category("AndroidSdksNotWorking")]
public void MoveTo ()
{
string path1 = TempFolder + DSC + "FIT.MoveTo.Source.Test";
@ -651,6 +652,7 @@ namespace MonoTests.System.IO
}
[Test] //Covers #18361
[Category("AndroidSdksNotWorking")]
public void MoveTo_SameName ()
{
string name = "FIT.MoveTo.SameName.Test";
@ -880,6 +882,7 @@ namespace MonoTests.System.IO
}
[Test] //Covers #38796
[Category("AndroidSdksNotWorking")]
public void ToStringAfterMoveTo ()
{
string name1 = "FIT.ToStringAfterMoveTo.Test";

View File

@ -913,6 +913,7 @@ namespace MonoTests.System.IO
}
[Test]
[Category("AndroidSdksNotWorking")]
public void Move ()
{
string bar = tmpFolder + Path.DirectorySeparatorChar + "bar";
@ -923,7 +924,7 @@ namespace MonoTests.System.IO
}
Assert.IsTrue (File.Exists (bar), "#1");
Assert.DoesNotThrow (() => File.Move (bar, baz), "#5");
File.Move (bar, baz);
Assert.IsFalse (File.Exists (bar), "#2");
Assert.IsTrue (File.Exists (baz), "#3");
@ -939,7 +940,7 @@ namespace MonoTests.System.IO
Directory.CreateDirectory (dir);
Directory.CreateDirectory (dir2);
File.Create (dir_foo).Close ();
Assert.DoesNotThrow (() => File.Move (dir_foo, dir2_foo), "#6");
File.Move (dir_foo, dir2_foo);
Assert.IsTrue (File.Exists (dir2_foo), "#4");
Directory.Delete (dir, true);
@ -2507,6 +2508,7 @@ namespace MonoTests.System.IO
[Test]
[Category("NotWasm")]
[Category("AndroidSdksNotWorking")]
public void ReplaceTest ()
{
string tmp = Path.Combine (tmpFolder, "ReplaceTest");