Fix symlink tests on unix

This commit is contained in:
caesay
2024-03-26 14:48:43 +00:00
parent 0ac71b1960
commit 5ea5f3207d
2 changed files with 6 additions and 6 deletions

View File

@@ -106,8 +106,8 @@ public class SymbolicLinkTests
Assert.Equal("Hello!", File.ReadAllText(symFile2)); Assert.Equal("Hello!", File.ReadAllText(symFile2));
Assert.Equal("AFile", SymbolicLink.GetTarget(symFile1, relative: true)); Assert.Equal("AFile", SymbolicLink.GetTarget(symFile1, relative: true));
Assert.Equal("..\\AFile", SymbolicLink.GetTarget(symFile2, relative: true)); Assert.Equal($"..{Path.DirectorySeparatorChar}AFile", SymbolicLink.GetTarget(symFile2, relative: true));
Assert.Equal("..\\AFile", SymbolicLink.GetTarget(symFile3, relative: true)); Assert.Equal($"..{Path.DirectorySeparatorChar}AFile", SymbolicLink.GetTarget(symFile3, relative: true));
Assert.Equal(tmpFile, SymbolicLink.GetTarget(symFile1, relative: false)); Assert.Equal(tmpFile, SymbolicLink.GetTarget(symFile1, relative: false));
Assert.Equal(tmpFile, SymbolicLink.GetTarget(symFile2, relative: false)); Assert.Equal(tmpFile, SymbolicLink.GetTarget(symFile2, relative: false));
Assert.Equal(tmpFile, SymbolicLink.GetTarget(symFile3, relative: false)); Assert.Equal(tmpFile, SymbolicLink.GetTarget(symFile3, relative: false));
@@ -135,8 +135,8 @@ public class SymbolicLinkTests
Assert.Equal(subSubDir, SymbolicLink.GetTarget(sym2)); Assert.Equal(subSubDir, SymbolicLink.GetTarget(sym2));
Assert.Equal(subDir2, SymbolicLink.GetTarget(sym1)); Assert.Equal(subDir2, SymbolicLink.GetTarget(sym1));
Assert.Equal("..\\..\\SubDir2", SymbolicLink.GetTarget(sym1, relative: true)); Assert.Equal($"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}SubDir2", SymbolicLink.GetTarget(sym1, relative: true));
Assert.Equal("SubDir\\SubSub", SymbolicLink.GetTarget(sym2, relative: true)); Assert.Equal($"SubDir{Path.DirectorySeparatorChar}SubSub", SymbolicLink.GetTarget(sym2, relative: true));
} }
[Fact] [Fact]

View File

@@ -38,7 +38,7 @@ public class ZipPackageTests
SymbolicLink.Create(symfile, actualFile); SymbolicLink.Create(symfile, actualFile);
Compression.EasyZip.CreateZipFromDirectoryAsync(logger, zipFile, tempDir).GetAwaiterResult(); Compression.EasyZip.CreateZipFromDirectoryAsync(logger, zipFile, tempDir).GetAwaiterResult();
Compression.EasyZip.ExtractZipToDirectory(logger, zipFile, extractedDir); Compression.EasyZip.ExtractZipToDirectory(logger, zipFile, extractedDir, expandSymlinks: true);
Assert.True(File.Exists(Path.Combine(extractedDir, "actual", "file.txt"))); Assert.True(File.Exists(Path.Combine(extractedDir, "actual", "file.txt")));
Assert.Equal("hello", File.ReadAllText(Path.Combine(extractedDir, "actual", "file.txt"))); Assert.Equal("hello", File.ReadAllText(Path.Combine(extractedDir, "actual", "file.txt")));
@@ -50,7 +50,7 @@ public class ZipPackageTests
Assert.True(SymbolicLink.Exists(Path.Combine(extractedDir, "other", "syml"))); Assert.True(SymbolicLink.Exists(Path.Combine(extractedDir, "other", "syml")));
Assert.True(SymbolicLink.Exists(Path.Combine(extractedDir, "other", "sym.txt"))); Assert.True(SymbolicLink.Exists(Path.Combine(extractedDir, "other", "sym.txt")));
Assert.Equal("..\\actual\\file.txt", SymbolicLink.GetTarget(Path.Combine(extractedDir, "other", "sym.txt"), relative: true)); Assert.Equal($"..{Path.DirectorySeparatorChar}actual{Path.DirectorySeparatorChar}file.txt", SymbolicLink.GetTarget(Path.Combine(extractedDir, "other", "sym.txt"), relative: true));
} }
[Fact] [Fact]