From 8374fea7769059ebc86d2d9ea3fa62b37aad795b Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Sun, 19 Jun 2022 17:59:16 -0600 Subject: [PATCH] Update tests for unicode chars --- .../FileManager.Tests/FileNamingTemplateTests.cs | 2 +- .../_Tests/FileManager.Tests/FileUtilityTests.cs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/_Tests/FileManager.Tests/FileNamingTemplateTests.cs b/Source/_Tests/FileManager.Tests/FileNamingTemplateTests.cs index c6b30dd8..4672cdcf 100644 --- a/Source/_Tests/FileManager.Tests/FileNamingTemplateTests.cs +++ b/Source/_Tests/FileManager.Tests/FileNamingTemplateTests.cs @@ -20,7 +20,7 @@ namespace FileNamingTemplateTests var longText = sb.ToString(); var expectedOld = "C:\\foo\\bar\\my_ book 00000000000000000000000000000000000000000 [ID123456].txt"; - var expectedNew = "C:\\foo\\bar\\my_ book 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt"; + var expectedNew = "C:\\foo\\bar\\my꞉ book 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [ID123456].txt"; var f1 = OLD_GetValidFilename(@"C:\foo\bar", "my: book " + longText, "txt", "ID123456"); var f2 = NEW_GetValidFilename_FileNamingTemplate(@"C:\foo\bar", "my: book " + longText, "txt", "ID123456"); diff --git a/Source/_Tests/FileManager.Tests/FileUtilityTests.cs b/Source/_Tests/FileManager.Tests/FileUtilityTests.cs index c61c55b2..e32a258d 100644 --- a/Source/_Tests/FileManager.Tests/FileUtilityTests.cs +++ b/Source/_Tests/FileManager.Tests/FileUtilityTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -17,25 +17,25 @@ namespace FileUtilityTests // needs separate method. middle null param not running correctly in TestExplorer when used in DataRow() [TestMethod] - [DataRow("http://test.com/a/b/c", @"http\test.com\a\b\c")] + [DataRow("http://test.com/a/b/c", @"http꞉\test.com\a\b\c")] public void null_replacement(string inStr, string outStr) => Tests(inStr, null, outStr); [TestMethod] // empty replacement - [DataRow("abc*abc.txt", "", "abcabc.txt")] + [DataRow("abc*abc.txt", "", "abc⁎abc.txt")] // non-empty replacement - [DataRow("abc*abc.txt", "ZZZ", "abcZZZabc.txt")] + [DataRow("abc*abc.txt", "ZZZ", "abc⁎abc.txt")] // standardize slashes [DataRow(@"a/b\c/d", "Z", @"a\b\c\d")] // remove illegal chars - [DataRow("a*?:z.txt", "Z", "aZZZz.txt")] + [DataRow("a*?:z.txt", "Z", "a⁎？꞉z.txt")] // retain drive letter path colon [DataRow(@"C:\az.txt", "Z", @"C:\az.txt")] // replace all other colons - [DataRow(@"a\b:c\d.txt", "ZZZ", @"a\bZZZc\d.txt")] + [DataRow(@"a\b:c\d.txt", "ZZZ", @"a\b꞉c\d.txt")] // remove empty directories [DataRow(@"C:\a\\\b\c\\\d.txt", "ZZZ", @"C:\a\b\c\d.txt")] - [DataRow(@"C:\""foo\", "ZZZ", @"C:\ZZZfoo\ZZZidZZZ")] + [DataRow(@"C:\""foo\", "ZZZ", @"C:\“foo\＜id＞")] public void Tests(string inStr, string replacement, string outStr) => Assert.AreEqual(outStr, FileUtility.GetSafePath(inStr, replacement).PathWithoutPrefix); }