Skip to content
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

[WASM] Clean up of HybridGlobalization in tests #45412

Merged
merged 2 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,6 @@ public enum GlobalizationMode : int
/// Load custom icu file provided by the developer.
/// </summary>
Custom = 3,

/// <summary>
/// Use the reduced icudt_hybrid.dat file
/// </summary>
Hybrid = 4,
}

[DataContract]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public class WasmBuildIntegrationTest(ITestOutputHelper log) : BlazorWasmBaselin
{
private static string customIcuFilename = "icudt_custom.dat";
private static string fullIcuFilename = "icudt.dat";
private static string hybridIcuFilename = "icudt_hybrid.dat";
private static string[] icuShardFilenames = new string[] {
"icudt_EFIGS.dat",
"icudt_CJK.dat",
Expand Down Expand Up @@ -491,15 +490,13 @@ public void Build_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsICUDataMode(

bootJsonData.resources.wasmNative.Should().ContainKey("dotnet.native.wasm");
bootJsonData.resources.icu.Should().ContainKey(fullIcuFilename);
bootJsonData.resources.icu.Should().NotContainKey(hybridIcuFilename);
foreach (var shardFilename in icuShardFilenames)
{
bootJsonData.resources.icu.Should().NotContainKey(shardFilename);
}

new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "dotnet.native.wasm")).Should().Exist();
new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", fullIcuFilename)).Should().Exist();
new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", hybridIcuFilename)).Should().NotExist();
foreach (var shardFilename in icuShardFilenames)
{
new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", shardFilename)).Should().NotExist();
Expand Down Expand Up @@ -535,15 +532,13 @@ public void Publish_WithBlazorWebAssemblyLoadAllGlobalizationData_SetsGlobalizat

bootJsonData.resources.wasmNative.Should().ContainKey("dotnet.native.wasm");
bootJsonData.resources.icu.Should().ContainKey(fullIcuFilename);
bootJsonData.resources.icu.Should().NotContainKey(hybridIcuFilename);
foreach (var shardFilename in icuShardFilenames)
{
bootJsonData.resources.icu.Should().NotContainKey(shardFilename);
}

new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", "dotnet.native.wasm")).Should().Exist();
new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", fullIcuFilename)).Should().Exist();
new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", hybridIcuFilename)).Should().NotExist();
foreach (var shardFilename in icuShardFilenames)
{
new FileInfo(Path.Combine(publishDirectory, "wwwroot", "_framework", shardFilename)).Should().NotExist();
Expand Down
Loading