Fixed usings in unit tests
This commit is contained in:
@@ -29,7 +29,6 @@ using Duplicati.Library.Main;
|
||||
using Duplicati.Library.Utility;
|
||||
using NUnit.Framework;
|
||||
using Utility = Duplicati.Library.Utility.Utility;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace Duplicati.UnitTest
|
||||
{
|
||||
@@ -51,10 +50,10 @@ namespace Duplicati.UnitTest
|
||||
const string asterisk = "*";
|
||||
string dirWithAsterisk = Path.Combine(this.DATAFOLDER, asterisk);
|
||||
// Windows does not support literal asterisks in paths.
|
||||
if (!Platform.IsClientWindows)
|
||||
{
|
||||
SystemIO.IO_OS.DirectoryCreate(dirWithAsterisk);
|
||||
TestUtils.WriteFile(SystemIO.IO_OS.PathCombine(dirWithAsterisk, file), new byte[] {0});
|
||||
if (!Platform.IsClientWindows)
|
||||
{
|
||||
SystemIO.IO_OS.DirectoryCreate(dirWithAsterisk);
|
||||
TestUtils.WriteFile(SystemIO.IO_OS.PathCombine(dirWithAsterisk, file), new byte[] {0});
|
||||
directories.Add(dirWithAsterisk);
|
||||
questionMarkWildcardShouldMatchCount++;
|
||||
verbatimAsteriskShouldMatchCount++;
|
||||
@@ -63,11 +62,11 @@ namespace Duplicati.UnitTest
|
||||
const string questionMark = "?";
|
||||
string dirWithQuestionMark = Path.Combine(this.DATAFOLDER, questionMark);
|
||||
// Windows does not support literal question marks in paths.
|
||||
if (!Platform.IsClientWindows)
|
||||
{
|
||||
SystemIO.IO_OS.DirectoryCreate(dirWithQuestionMark);
|
||||
TestUtils.WriteFile(SystemIO.IO_OS.PathCombine(dirWithQuestionMark, file), new byte[] { 1 });
|
||||
directories.Add(dirWithQuestionMark);
|
||||
if (!Platform.IsClientWindows)
|
||||
{
|
||||
SystemIO.IO_OS.DirectoryCreate(dirWithQuestionMark);
|
||||
TestUtils.WriteFile(SystemIO.IO_OS.PathCombine(dirWithQuestionMark, file), new byte[] { 1 });
|
||||
directories.Add(dirWithQuestionMark);
|
||||
questionMarkWildcardShouldMatchCount++;
|
||||
}
|
||||
|
||||
@@ -75,9 +74,9 @@ namespace Duplicati.UnitTest
|
||||
// for a '?' wildcard can match on
|
||||
const string singleCharacterDir = "X";
|
||||
string dirWithSingleCharacter = Path.Combine(this.DATAFOLDER, singleCharacterDir);
|
||||
SystemIO.IO_OS.DirectoryCreate(dirWithSingleCharacter);
|
||||
TestUtils.WriteFile(SystemIO.IO_OS.PathCombine(dirWithSingleCharacter, file), new byte[] { 2 });
|
||||
directories.Add(dirWithSingleCharacter);
|
||||
SystemIO.IO_OS.DirectoryCreate(dirWithSingleCharacter);
|
||||
TestUtils.WriteFile(SystemIO.IO_OS.PathCombine(dirWithSingleCharacter, file), new byte[] { 2 });
|
||||
directories.Add(dirWithSingleCharacter);
|
||||
questionMarkWildcardShouldMatchCount++;
|
||||
|
||||
const string dir = "dir";
|
||||
@@ -103,7 +102,7 @@ namespace Duplicati.UnitTest
|
||||
Assert.AreEqual(0, restoreResults.Errors.Count());
|
||||
Assert.AreEqual(0, restoreResults.Warnings.Count());
|
||||
|
||||
TestUtils.AssertDirectoryTreesAreEquivalent(this.DATAFOLDER, this.RESTOREFOLDER, true, "Restore");
|
||||
TestUtils.AssertDirectoryTreesAreEquivalent(this.DATAFOLDER, this.RESTOREFOLDER, true, "Restore");
|
||||
|
||||
// List results using * should return a match for each directory.
|
||||
IListResults listResults = c.List(SystemIO.IO_OS.PathCombine(dirWithAsterisk, file));
|
||||
@@ -114,11 +113,11 @@ namespace Duplicati.UnitTest
|
||||
listResults = c.List(SystemIO.IO_OS.PathCombine(dirWithQuestionMark, file));
|
||||
Assert.AreEqual(0, listResults.Errors.Count());
|
||||
Assert.AreEqual(0, listResults.Warnings.Count());
|
||||
// List results using ? should return 3 matches in Linux,
|
||||
// one for the directory with '*' and one for the directory
|
||||
// with '?', plus one for directory 'X'; but should return
|
||||
// 1 matches in Windows just for directory 'X'.
|
||||
Assert.AreEqual(questionMarkWildcardShouldMatchCount, listResults.Files.Count());
|
||||
// List results using ? should return 3 matches in Linux,
|
||||
// one for the directory with '*' and one for the directory
|
||||
// with '?', plus one for directory 'X'; but should return
|
||||
// 1 matches in Windows just for directory 'X'.
|
||||
Assert.AreEqual(questionMarkWildcardShouldMatchCount, listResults.Files.Count());
|
||||
}
|
||||
|
||||
SystemIO.IO_OS.DirectoryDelete(this.RESTOREFOLDER, true);
|
||||
@@ -173,9 +172,9 @@ namespace Duplicati.UnitTest
|
||||
IBackupResults backupResults = c.Backup(new[] {this.DATAFOLDER}, filter);
|
||||
Assert.AreEqual(0, backupResults.Errors.Count());
|
||||
Assert.AreEqual(0, backupResults.Warnings.Count());
|
||||
Assert.AreEqual(verbatimAsteriskShouldMatchCount, backupResults.ExaminedFiles);
|
||||
Assert.AreEqual(verbatimAsteriskShouldMatchCount, backupResults.ExaminedFiles);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category("ProblematicPath")]
|
||||
|
||||
Reference in New Issue
Block a user