test: TestWithFolder 与 InlineData

Tests/TestUtils.cs

@@ -1,25 +1,31 @@
 namespace MeloongCore.Tests;
-public static class TestUtils {
+
+/// <summary>
+/// 用于带文件测试的基类。
+/// 会在极端路径下创建测试用的临时文件夹。
+/// </summary>
+public abstract class TestWithFolder {
 
     /// <summary>
-    /// 获取一个在极端路径下的测试文件夹。
+    /// 测试用的临时文件夹路径。
+    /// 这是一个包含特殊字符的长路径，以 \ 结尾。
     /// </summary>
-    public static string GetTempFolder(string? identifier = null) {
-        string folderPath = Path.Combine(
-            Path.GetTempPath(), "PCL", "Tests", 
-            (identifier ?? "Test") + "-" + Guid.NewGuid().ToString(), 
+    private readonly string tempFolder;
+    public TestWithFolder() {
+        tempFolder = Path.Combine(
+            Path.GetTempPath(), "PCL", "Tests",
+            $"{GetType().Name}-{Guid.NewGuid()}",
             "文件夹 Dir_!@#$%^&()_+={}[];',_",
-            new string('X', 200), new string('X', 200));
-        Directory.CreateDirectory(@"\\?\" + folderPath);
-        return folderPath;
+            new string('X', 200), new string('X', 200)) + @"\";
+        Directory.CreateDirectory(@"\\?\" + tempFolder);
     }
 
     /// <summary>
-    /// 将指定的测试用文件输出到一个极端路径下，然后返回文件路径。
+    /// 输出指定的测试用文件，返回文件路径。
     /// </summary>
-    public static string GetTestFile(string directoryName, string fileName) {
-        var sourceFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "TestFiles", directoryName, fileName);
-        var distPath = Path.Combine(GetTempFolder("GetTestFile"), Path.GetFileName(sourceFilePath));
+    public string GetTestFile(string fileName) {
+        var sourceFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "TestFiles", GetType().Name.Replace("Test", ""), fileName);
+        var distPath = Path.Combine(tempFolder, Path.GetFileName(sourceFilePath));
         File.Copy(sourceFilePath, @"\\?\" + distPath);
         return distPath;
     }

Tests/Utils/FileUtilsTest.cs

@@ -1,26 +1,25 @@
 using System.IO.Compression;
 
 namespace MeloongCore.Tests;
-public class FileUtilsTest : IDisposable {
+public class FileUtilsTest : TestWithFolder {
 
     #region 压缩包
 
-    [Fact(DisplayName = nameof(OpenZip))]
-    public void OpenZip() {
-        // GB 编码
-        using var gbArchive = FileUtils.OpenZip(TestUtils.GetTestFile(nameof(FileUtils), "GB Encoding.zip"));
-        Assert.Contains(gbArchive.Entries, e => e.Name == "中文文件.txt");
-        Assert.Contains(gbArchive.Entries, e => e.Name == "fabricloader.log");
-        Assert.DoesNotContain(gbArchive.Entries, e => e.Name == "fabricloader.log2");
-        // UTF8 编码
-        using var utfArchive = FileUtils.OpenZip(TestUtils.GetTestFile(nameof(FileUtils), "UTF8 Encoding.zip"));
-        Assert.Contains(utfArchive.Entries, e => e.Name == "中文文件.txt");
-        Assert.Contains(utfArchive.Entries, e => e.Name == "fabricloader.log");
-        Assert.DoesNotContain(utfArchive.Entries, e => e.Name == "fabricloader.log2");
-        // 损坏的文件
-        Assert.Throws<InvalidDataException>(() => FileUtils.OpenZip(TestUtils.GetTestFile(nameof(FileUtils), "Corrupted.zip")));
-        // 非压缩文件
-        Assert.Throws<InvalidDataException>(() => FileUtils.OpenZip(TestUtils.GetTestFile(nameof(FileUtils), "Not zip.zip")));
+    [Theory]
+    [InlineData("GB Encoding.zip")]
+    [InlineData("UTF8 Encoding.zip")]
+    public void OpenZip_Successful(string testFile) {
+        using var archive = FileUtils.OpenZip(GetTestFile(testFile));
+        Assert.Contains(archive.Entries, e => e.Name == "中文文件.txt");
+        Assert.Contains(archive.Entries, e => e.Name == "fabricloader.log");
+        Assert.DoesNotContain(archive.Entries, e => e.Name == "fabricloader.log2");
+    }
+
+    [Theory]
+    [InlineData("Corrupted.zip")]
+    [InlineData("Not zip.zip")]
+    public void OpenZip_Corrupted(string testFile) {
+        Assert.Throws<InvalidDataException>(() => FileUtils.OpenZip(GetTestFile(testFile)));
     }
 
     [Fact(DisplayName = nameof(ExtractToDirectory))]
@@ -118,20 +117,9 @@ public class FileUtilsTest : IDisposable {
 
 
 
-
+    /*
     #region 辅助方法
 
-    private readonly string _tempDir;
-
-    public FileUtilsTest() {
-        _tempDir = Path.Combine(Path.GetTempPath(), "MeloongCoreTests_" + Guid.NewGuid().ToString("N"));
-        Directory.CreateDirectory(_tempDir);
-    }
-
-    public void Dispose() {
-        if (Directory.Exists(_tempDir)) Directory.Delete(_tempDir, recursive: true);
-    }
-
     /// <summary>
     /// 创建一个包含若干文件的临时文件夹，并返回该文件夹路径。
     /// </summary>
@@ -146,40 +134,6 @@ public class FileUtilsTest : IDisposable {
         return dir;
     }
 
-    /// <summary>
-    /// 创建一个只含 ASCII 文件名的合法 ZIP，使用指定编码写入文件名。
-    /// </summary>
-    private string CreateZipWithEncoding(string zipName, Encoding encoding, params (string entryName, string content)[] entries) {
-        string zipPath = Path.Combine(_tempDir, zipName);
-        using var stream = File.Create(zipPath);
-        using var archive = new ZipArchive(stream, ZipArchiveMode.Create, leaveOpen: false, encoding);
-        foreach (var (entryName, content) in entries) {
-            var entry = archive.CreateEntry(entryName);
-            using var writer = new StreamWriter(entry.Open(), Encoding.UTF8);
-            writer.Write(content);
-        }
-        return zipPath;
-    }
-
-    /// <summary>
-    /// 创建一个用于 GZip 解压测试的 .gz 文件。
-    /// </summary>
-    private string CreateGzFile(string innerFileName, string content) {
-        string gzPath = Path.Combine(_tempDir, innerFileName + ".gz");
-        byte[] contentBytes = Encoding.UTF8.GetBytes(content);
-        using var fileStream = File.Create(gzPath);
-        using var gzStream = new GZipStream(fileStream, CompressionMode.Compress);
-        gzStream.Write(contentBytes, 0, contentBytes.Length);
-        return gzPath;
-    }
-
-    /// <summary>
-    /// 读取文件内容（兼容长路径）。
-    /// </summary>
-    private static string ReadFile(string path) {
-        return File.ReadAllText(path, Encoding.UTF8);
-    }
-
     #endregion
 
     #region CreateZipFromDirectory 测试
@@ -392,5 +346,5 @@ public class FileUtilsTest : IDisposable {
     }
 
     #endregion
-
+    */
 }