-
Notifications
You must be signed in to change notification settings - Fork 28
Extend VFS unicode coverage #109
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
13bc26f
extend vfs unicode coverage
KSemenenko 4fc503d
add filesystem unicode mount regression test
KSemenenko 831bebf
remove capability guards from vfs tests
KSemenenko 2889d80
Use repo-local folders for VFS tests
KSemenenko 513b58b
fixes
KSemenenko 1bb6474
tests and fixes
KSemenenko 7c29841
sftp security fix
KSemenenko b5eb4d6
sanitiation
KSemenenko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
84 changes: 84 additions & 0 deletions
84
...nagedCode.Storage.Tests/VirtualFileSystem/FileSystemVirtualFileSystemUnicodeMountTests.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Threading.Tasks; | ||
| using ManagedCode.Storage.FileSystem; | ||
| using ManagedCode.Storage.FileSystem.Options; | ||
| using ManagedCode.Storage.Tests.VirtualFileSystem.Fixtures; | ||
| using ManagedCode.Storage.VirtualFileSystem.Core; | ||
| using ManagedCode.Storage.VirtualFileSystem.Options; | ||
| using Shouldly; | ||
| using Xunit; | ||
|
|
||
| namespace ManagedCode.Storage.Tests.VirtualFileSystem; | ||
|
|
||
| [Collection(VirtualFileSystemCollection.Name)] | ||
| public sealed class FileSystemVirtualFileSystemUnicodeMountTests | ||
| { | ||
| [Theory] | ||
| [MemberData(nameof(UnicodeVfsTestCases.FolderScenarios), MemberType = typeof(UnicodeVfsTestCases))] | ||
| public async Task MountingExistingUnicodeDirectories_ShouldExposeFiles( | ||
| string directoryName, | ||
| string fileName, | ||
| string content) | ||
| { | ||
| var rootFolder = Path.Combine(Directory.GetCurrentDirectory(), "managedcode-vfs-existing", Guid.NewGuid().ToString("N")); | ||
| var internationalFolder = Path.Combine(rootFolder, "international", directoryName); | ||
| Directory.CreateDirectory(internationalFolder); | ||
|
|
||
| var seededFilePath = Path.Combine(internationalFolder, $"{fileName}.txt"); | ||
| await File.WriteAllTextAsync(seededFilePath, content); | ||
|
|
||
| var options = new FileSystemStorageOptions | ||
| { | ||
| BaseFolder = rootFolder, | ||
| CreateContainerIfNotExists = true | ||
| }; | ||
|
|
||
| var storage = new FileSystemStorage(options); | ||
|
|
||
| async ValueTask Cleanup() | ||
| { | ||
| try | ||
| { | ||
| await storage.RemoveContainerAsync(); | ||
| } | ||
| finally | ||
| { | ||
| if (Directory.Exists(rootFolder)) | ||
| { | ||
| Directory.Delete(rootFolder, recursive: true); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| await using var context = await VirtualFileSystemTestContext.CreateAsync( | ||
| storage, | ||
| containerName: string.Empty, | ||
| ownsStorage: true, | ||
| serviceProvider: null, | ||
| cleanup: Cleanup); | ||
|
|
||
| var vfs = context.FileSystem; | ||
| var expectedPath = new VfsPath($"/international/{directoryName}/{fileName}.txt"); | ||
|
|
||
| (await vfs.FileExistsAsync(expectedPath)).ShouldBeTrue(); | ||
|
|
||
| var file = await vfs.GetFileAsync(expectedPath); | ||
| var actualContent = await file.ReadAllTextAsync(); | ||
| actualContent.ShouldBe(content); | ||
|
|
||
| var entries = new List<IVfsNode>(); | ||
| await foreach (var entry in vfs.ListAsync(new VfsPath($"/international/{directoryName}"), new ListOptions | ||
| { | ||
| IncludeDirectories = false, | ||
| IncludeFiles = true, | ||
| Recursive = false | ||
| })) | ||
| { | ||
| entries.Add(entry); | ||
| } | ||
|
|
||
| entries.ShouldContain(e => e.Path.Value == expectedPath.Value); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
Tests/ManagedCode.Storage.Tests/VirtualFileSystem/UnicodeVfsTestCases.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| using System.Collections.Generic; | ||
|
|
||
| namespace ManagedCode.Storage.Tests.VirtualFileSystem; | ||
|
|
||
| public static class UnicodeVfsTestCases | ||
| { | ||
| public static IEnumerable<object[]> FolderScenarios => new[] | ||
| { | ||
| new object[] { "Українська-папка", "лист-привіт", "Привіт з Києва!" }, | ||
| new object[] { "中文目錄", "測試文件", "雲端中的內容" }, | ||
| new object[] { "日本語ディレクトリ", "テストファイル", "東京からこんにちは" }, | ||
| new object[] { "한국어_폴더", "테스트-파일", "부산에서 안녕하세요" }, | ||
|
KSemenenko marked this conversation as resolved.
|
||
| new object[] { "emoji📁", "😀-файл", "multi🌐lingual content" } | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.