diff options
| author | Dean Ferreyra <dean@octw.com> | 2020-09-13 00:45:55 +0300 |
|---|---|---|
| committer | Dean Ferreyra <dean@octw.com> | 2020-09-13 00:45:55 +0300 |
| commit | eafe7320e90996633889ea1c64d3fd94deb81691 (patch) | |
| tree | a2a992c1354ad9590d704e61a96a2eaf77fe58d2 /Duplicati/UnitTest | |
| parent | 3366071d048fcf851d9e57fa63f91ad4cde5f641 (diff) | |
Address review comments
Diffstat (limited to 'Duplicati/UnitTest')
| -rw-r--r-- | Duplicati/UnitTest/ProblematicPathTests.cs | 10 | ||||
| -rw-r--r-- | Duplicati/UnitTest/TestUtils.cs | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/Duplicati/UnitTest/ProblematicPathTests.cs b/Duplicati/UnitTest/ProblematicPathTests.cs index 8917701b5..ac1d075f1 100644 --- a/Duplicati/UnitTest/ProblematicPathTests.cs +++ b/Duplicati/UnitTest/ProblematicPathTests.cs @@ -82,14 +82,10 @@ namespace Duplicati.UnitTest Assert.AreEqual(0, restoreResults.Warnings.Count()); foreach (string directory in directories) - { + {
string directoryName = SystemIO.IO_OS.PathGetFileName(directory); - foreach (string expectedFilePath in SystemIO.IO_OS.EnumerateFiles(directory)) - { - string fileName = SystemIO.IO_OS.PathGetFileName(expectedFilePath); - string restoredFilePath = SystemIO.IO_OS.PathCombine(this.RESTOREFOLDER, directoryName, fileName); - TestUtils.AssertFilesAreEqual(expectedFilePath, restoredFilePath, false, expectedFilePath); - } + string restoredDirectory = SystemIO.IO_OS.PathCombine(this.RESTOREFOLDER, directoryName); + TestUtils.AssertDirectoryTreesAreEquivalent(directory, restoredDirectory, true, "Restore");
} // List results using * should return a match for each directory. diff --git a/Duplicati/UnitTest/TestUtils.cs b/Duplicati/UnitTest/TestUtils.cs index fc6202ad5..36d7beaf1 100644 --- a/Duplicati/UnitTest/TestUtils.cs +++ b/Duplicati/UnitTest/TestUtils.cs @@ -234,8 +234,7 @@ namespace Duplicati.UnitTest // For performance reasons, only exercise Assert mechanism and generate message if byte comparison fails
if (expectedByte != actualByte)
{
- var message =
- $"{contextMessage}, file contents mismatch at position {i} for {expectedFile} and {actualFile}";
+ var message = $"{contextMessage}, file contents mismatch at position {i} for {expectedFile} and {actualFile}";
Assert.That(actualByte, Is.EqualTo(expectedByte), message);
}
}
|