Skip to content

Commit a1180e8

Browse files
authored
tests for more unicode characters (#101059)
1 parent 3d0da2c commit a1180e8

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public BuildPublishTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur
2828
[InlineData("Release")]
2929
public async Task DefaultTemplate_WithoutWorkload(string config)
3030
{
31-
string id = $"blz_no_workload_{config}_{GetRandomId()}_{s_unicodeChar}";
31+
string id = $"blz_no_workload_{config}_{GetRandomId()}_{s_unicodeChars}";
3232
CreateBlazorWasmTemplateProject(id);
3333

3434
BlazorBuild(new BlazorBuildOptions(id, config));
@@ -63,7 +63,7 @@ public static TheoryData<string, bool> TestDataForDefaultTemplate_WithWorkload(b
6363
public void DefaultTemplate_NoAOT_WithWorkload(string config, bool testUnicode)
6464
{
6565
string id = testUnicode ?
66-
$"blz_no_aot_{config}_{GetRandomId()}_{s_unicodeChar}" :
66+
$"blz_no_aot_{config}_{GetRandomId()}_{s_unicodeChars}" :
6767
$"blz_no_aot_{config}_{GetRandomId()}";
6868
CreateBlazorWasmTemplateProject(id);
6969

@@ -84,7 +84,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config, bool testUnicode)
8484
public void DefaultTemplate_AOT_WithWorkload(string config, bool testUnicode)
8585
{
8686
string id = testUnicode ?
87-
$"blz_aot_{config}_{GetRandomId()}_{s_unicodeChar}" :
87+
$"blz_aot_{config}_{GetRandomId()}_{s_unicodeChars}" :
8888
$"blz_aot_{config}_{GetRandomId()}";
8989
CreateBlazorWasmTemplateProject(id);
9090

src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public MiscTests3(ITestOutputHelper output, SharedBuildPerTestClassFixture build
3333
public async Task WithDllImportInMainAssembly(string config, bool build, bool publish)
3434
{
3535
// Based on https://github.com/dotnet/runtime/issues/59255
36-
string id = $"blz_dllimp_{config}_{s_unicodeChar}";
36+
string id = $"blz_dllimp_{config}_{s_unicodeChars}";
3737
if (build && publish)
3838
id += "build_then_publish";
3939
else if (build)

src/mono/wasm/Wasm.Build.Tests/BuildPublishTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void CheckOutputForNativeBuild(bool expectAOT, bool expectRelinking, BuildArgs b
158158
{
159159
if (testUnicode)
160160
{
161-
string projectNameCore = buildArgs.ProjectName.Trim(new char[] {s_unicodeChar});
161+
string projectNameCore = buildArgs.ProjectName.Replace(s_unicodeChars, "");
162162
TestUtils.AssertMatches(@$"{projectNameCore}\S+.dll -> {projectNameCore}\S+.dll.bc", buildOutput, contains: expectAOT);
163163
TestUtils.AssertMatches(@$"{projectNameCore}\S+.dll.bc -> {projectNameCore}\S+.dll.o", buildOutput, contains: expectAOT);
164164
}

src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract class BuildTestBase : IClassFixture<SharedBuildPerTestClassFixtu
2929
public const string DefaultTargetFrameworkForBlazor = "net9.0";
3030
public const string TargetFrameworkForTasks = "net9.0";
3131
private const string DefaultEnvironmentLocale = "en-US";
32-
protected static readonly char s_unicodeChar = '\u7149';
32+
protected static readonly string s_unicodeChars = "\u9FC0\u8712\u679B\u906B\u486B\u7149";
3333
protected static readonly bool s_skipProjectCleanup;
3434
protected static readonly string s_xharnessRunnerCommand;
3535
protected readonly ITestOutputHelper _testOutput;
@@ -239,10 +239,10 @@ protected string RunAndTestWasmApp(BuildArgs buildArgs,
239239

240240
TestUtils.AssertSubstring("AOT: image 'System.Private.CoreLib' found.", output, contains: buildArgs.AOT);
241241

242-
if (s_isWindows && buildArgs.ProjectName.Contains(s_unicodeChar))
242+
if (s_isWindows && buildArgs.ProjectName.Contains(s_unicodeChars))
243243
{
244244
// unicode chars in output on Windows are decoded in unknown way, so finding utf8 string is more complicated
245-
string projectNameCore = buildArgs.ProjectName.Trim(new char[] {s_unicodeChar});
245+
string projectNameCore = buildArgs.ProjectName.Replace(s_unicodeChars, "");
246246
TestUtils.AssertMatches(@$"AOT: image '{projectNameCore}\S+' found.", output, contains: buildArgs.AOT);
247247
}
248248
else

src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NativeRebuildTestsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ protected BuildArgs GenerateProjectContents(BuildArgs buildArgs, bool nativeReli
110110

111111
// appending UTF-8 char makes sure project build&publish under all types of paths is supported
112112
protected string GetTestProjectPath(string prefix, string config, bool appendUnicode=true) =>
113-
appendUnicode ? $"{prefix}_{config}_{s_unicodeChar}" : $"{prefix}_{config}";
113+
appendUnicode ? $"{prefix}_{config}_{s_unicodeChars}" : $"{prefix}_{config}";
114114

115115
}
116116
}

0 commit comments

Comments
 (0)