haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract duplicated path specifications to private property.

Browse Source
This commit is contained in:
Kenneth Hsu
2019-08-18 17:46:13 -07:00
parent caaedccc61
commit 9f23597c2b
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/UnitTest/CommandLineOperationsTests.cs
+5 -7
View File
@@ -36,6 +36,7 @@ namespace Duplicati.UnitTest
protected readonly string SOURCEFOLDER = Path.Combine(BASEFOLDER, "data");
private readonly string zipFilename = "data.zip";
private string zipFilepath => Path.Combine(BASEFOLDER, this.zipFilename);
protected virtual IEnumerable<string> SourceDataFolders
{
@@ -52,13 +53,12 @@ namespace Duplicati.UnitTest
{
base.OneTimeSetUp();
string tempZipFile = Path.Combine(BASEFOLDER, this.zipFilename);
using (WebClient client = new WebClient())
{
client.DownloadFile($"https://s3.amazonaws.com/duplicati-test-file-hosting/{this.zipFilename}", tempZipFile);
client.DownloadFile($"https://s3.amazonaws.com/duplicati-test-file-hosting/{this.zipFilename}", this.zipFilepath);
}
System.IO.Compression.ZipFile.ExtractToDirectory(tempZipFile, BASEFOLDER);
System.IO.Compression.ZipFile.ExtractToDirectory(this.zipFilepath, BASEFOLDER);
}
public override void OneTimeTearDown()
@@ -67,11 +67,9 @@ namespace Duplicati.UnitTest
{
Directory.Delete(this.SOURCEFOLDER, true);
}
string zipFile = Path.Combine(BASEFOLDER, this.zipFilename);
if (File.Exists(zipFile))
if (File.Exists(this.zipFilepath))
{
File.Delete(zipFile);
File.Delete(this.zipFilepath);
}
}
Duplicati/UnitTest/GeneralBlackBoxTesting.cs
+5 -7
View File
@@ -29,6 +29,7 @@ namespace Duplicati.UnitTest
{
private static readonly string SOURCE_FOLDERS = Path.Combine(BASEFOLDER, "DSMCBE");
private readonly string zipFilename = "DSMCBE.zip";
private string zipFilepath => Path.Combine(BASEFOLDER, this.zipFilename);
protected IEnumerable<string> TestFolders
{
@@ -65,13 +66,12 @@ namespace Duplicati.UnitTest
{
base.OneTimeSetUp();
string tempZipFile = Path.Combine(BASEFOLDER, this.zipFilename);
using (WebClient client = new WebClient())
{
client.DownloadFile($"https://s3.amazonaws.com/duplicati-test-file-hosting/{this.zipFilename}", tempZipFile);
client.DownloadFile($"https://s3.amazonaws.com/duplicati-test-file-hosting/{this.zipFilename}", this.zipFilepath);
}
System.IO.Compression.ZipFile.ExtractToDirectory(tempZipFile, BASEFOLDER);
System.IO.Compression.ZipFile.ExtractToDirectory(this.zipFilepath, BASEFOLDER);
}
public override void OneTimeTearDown()
@@ -80,11 +80,9 @@ namespace Duplicati.UnitTest
{
Directory.Delete(SOURCE_FOLDERS, true);
}
string zipFile = Path.Combine(BASEFOLDER, this.zipFilename);
if (File.Exists(zipFile))
if (File.Exists(this.zipFilepath))
{
File.Delete(zipFile);
File.Delete(this.zipFilepath);
}
}