DiskProvider.Move now overwrites existing folder, Update some Diskprovider to use .NET 4 calls.

This commit is contained in:
kay.one 2011-11-17 22:52:50 -08:00
commit d97a1d068c
3 changed files with 92 additions and 24 deletions

View file

@ -13,6 +13,7 @@ namespace NzbDrone.Common.Test
{
DirectoryInfo BinFolder;
DirectoryInfo BinFolderCopy;
DirectoryInfo BinFolderMove;
[SetUp]
public void Setup()
@ -20,11 +21,17 @@ namespace NzbDrone.Common.Test
var binRoot = new DirectoryInfo(Directory.GetCurrentDirectory()).Parent.Parent;
BinFolder = new DirectoryInfo(Path.Combine(binRoot.FullName, "bin"));
BinFolderCopy = new DirectoryInfo(Path.Combine(binRoot.FullName, "bin_copy"));
BinFolderMove = new DirectoryInfo(Path.Combine(binRoot.FullName, "bin_move"));
if (BinFolderCopy.Exists)
{
BinFolderCopy.Delete(true);
}
if (BinFolderMove.Exists)
{
BinFolderMove.Delete(true);
}
}
[Test]
@ -56,6 +63,22 @@ namespace NzbDrone.Common.Test
VerifyCopy();
}
[Test]
public void MoveFolder_should_overright_existing_folder()
{
var diskProvider = new DiskProvider();
diskProvider.CopyDirectory(BinFolder.FullName, BinFolderCopy.FullName);
diskProvider.CopyDirectory(BinFolder.FullName, BinFolderMove.FullName);
VerifyCopy();
//Act
diskProvider.MoveDirectory(BinFolderCopy.FullName, BinFolderMove.FullName);
//Assert
VerifyMove();
}
private void VerifyCopy()
{
BinFolder.Refresh();
@ -66,5 +89,19 @@ namespace NzbDrone.Common.Test
BinFolderCopy.GetDirectories().Should().HaveSameCount(BinFolder.GetDirectories());
}
private void VerifyMove()
{
BinFolder.Refresh();
BinFolderCopy.Refresh();
BinFolderMove.Refresh();
BinFolderCopy.Exists.Should().BeFalse();
BinFolderMove.GetFiles("*.*", SearchOption.AllDirectories)
.Should().HaveSameCount(BinFolder.GetFiles("*.*", SearchOption.AllDirectories));
BinFolderMove.GetDirectories().Should().HaveSameCount(BinFolder.GetDirectories());
}
}
}