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.

Sign up for GitHub

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

Fix culture in literal tests #1788

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Fix culture in literal tests #1788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/Framework/Testing/ControlTestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ private TestDotvvmRequestContext PreparePage(
CultureInfo? culture = null
)
{
CultureInfo.CurrentCulture = culture ?? new CultureInfo("en-US");
CultureInfo.CurrentUICulture = culture ?? new CultureInfo("en-US");
CultureInfo.CurrentCulture = CultureInfo.CurrentUICulture =
culture ?? new CultureInfo("en-US");

Configuration.Freeze();
fileName = (fileName ?? "testpage") + ".dothtml";
var (_, controlBuilder) = CompilePage(markup, fileName, markupFiles);
return PrepareRequest(fileName, user: user);
return PrepareRequest(fileName, user: user, culture: culture);
}

public async Task<PageRunResult> RunPage(
Expand Down
30 changes: 23 additions & 7 deletions src/Framework/Testing/DotvvmTestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Linq;
using System.Security;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using DotVVM.Framework.Compilation.ControlTree;
using DotVVM.Framework.Compilation.ControlTree.Resolved;
using DotVVM.Framework.Compilation.Parser.Dothtml.Parser;
Expand Down Expand Up @@ -190,19 +190,35 @@ public static void EnsureCompiledAssemblyCache()

public static void RunInCulture(CultureInfo cultureInfo, Action action)
{
var originalCulture = Thread.CurrentThread.CurrentCulture;
var originalUICulture = Thread.CurrentThread.CurrentUICulture;
var originalCulture = CultureInfo.CurrentCulture;
var originalUICulture = CultureInfo.CurrentUICulture;

Thread.CurrentThread.CurrentCulture = cultureInfo;
Thread.CurrentThread.CurrentUICulture = cultureInfo;
CultureInfo.CurrentCulture = cultureInfo;
CultureInfo.CurrentUICulture = cultureInfo;
try
{
action();
}
finally
{
Thread.CurrentThread.CurrentCulture = originalCulture;
Thread.CurrentThread.CurrentUICulture = originalUICulture;
CultureInfo.CurrentCulture = originalCulture;
CultureInfo.CurrentUICulture = originalUICulture;
}
}
public static async Task RunInCultureAsync(CultureInfo cultureInfo, Func<Task> action)
{
var originalCulture = CultureInfo.CurrentCulture;
var originalUICulture = CultureInfo.CurrentUICulture;

CultureInfo.CurrentCulture = CultureInfo.CurrentUICulture = cultureInfo;
try
{
await action();
}
finally
{
CultureInfo.CurrentCulture = originalCulture;
CultureInfo.CurrentUICulture = originalUICulture;
}
}

Expand Down
92 changes: 49 additions & 43 deletions src/Tests/ControlTests/SimpleControlTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,49 +70,55 @@ public async Task RouteLink()
[TestMethod]
public async Task Literal_ClientServerRendering()
{
var r = await cth.RunPage(typeof(BasicTestViewModel), @"
<!-- literal syntax, client rendering -->
<span>
{{value: Integer}}
{{value: Float}}
{{value: DateTime}}
{{value: NullableString}}
</span>
<!-- literal syntax, server rendering -->
<span RenderSettings.Mode=Server>
{{value: Integer}}
{{value: Float}}
{{value: DateTime}}
{{value: NullableString}}
</span>
<!-- control syntax, client rendering -->
<span RenderSettings.Mode=Client>
<dot:Literal Text={value: Integer} />
<dot:Literal Text={value: Float} />
<dot:Literal Text={value: DateTime} />
</span>
<!-- control syntax, server rendering -->
<span RenderSettings.Mode=Server>
<dot:Literal Text={value: Integer} />
<dot:Literal Text={value: Float} />
<dot:Literal Text={value: DateTime} />
</span>
<!-- control syntax, client rendering, format string -->
<span RenderSettings.Mode=Client>
<dot:Literal Text={value: Integer} FormatString=X />
<dot:Literal Text={value: Float} FormatString=P2 />
<dot:Literal Text={value: DateTime} FormatString=dddd />
</span>
<!-- control syntax, server rendering, format string -->
<span RenderSettings.Mode=Server>
<dot:Literal Text={value: Integer} FormatString=X />
<dot:Literal Text={value: Float} FormatString=P2 />
<dot:Literal Text={value: DateTime} FormatString=dddd />
</span>
"
);

check.CheckString(r.FormattedHtml, fileExtension: "html");
await DotvvmTestHelper.RunInCultureAsync(new CultureInfo("sv"), async () => {
await Task.Delay(1);
Assert.AreEqual("sv", CultureInfo.CurrentCulture.Name);
var r = await cth.RunPage(typeof(BasicTestViewModel), """
<!-- literal syntax, client rendering -->
{{resource: System.Globalization.CultureInfo.CurrentCulture.Name}}
<span>
{{value: Integer}}
{{value: Float}}
{{value: DateTime}}
{{value: NullableString}}
</span>
<!-- literal syntax, server rendering -->
<span RenderSettings.Mode=Server>
{{value: Integer}}
{{value: Float}}
{{value: DateTime}}
{{value: NullableString}}
</span>
<!-- control syntax, client rendering -->
<span RenderSettings.Mode=Client>
<dot:Literal Text={value: Integer} />
<dot:Literal Text={value: Float} />
<dot:Literal Text={value: DateTime} />
</span>
<!-- control syntax, server rendering -->
<span RenderSettings.Mode=Server>
<dot:Literal Text={value: Integer} />
<dot:Literal Text={value: Float} />
<dot:Literal Text={value: DateTime} />
</span>
<!-- control syntax, client rendering, format string -->
<span RenderSettings.Mode=Client>
<dot:Literal Text={value: Integer} FormatString=X />
<dot:Literal Text={value: Float} FormatString=P2 />
<dot:Literal Text={value: DateTime} FormatString=dddd />
</span>
<!-- control syntax, server rendering, format string -->
<span RenderSettings.Mode=Server>
<dot:Literal Text={value: Integer} FormatString=X />
<dot:Literal Text={value: Float} FormatString=P2 />
<dot:Literal Text={value: DateTime} FormatString=dddd />
</span>
""",
culture: new CultureInfo("sv")
);
Assert.AreEqual("sv", CultureInfo.CurrentCulture.Name);
check.CheckString(r.FormattedHtml, fileExtension: "html");
});
}

[TestMethod]
Expand Down
14 changes: 7 additions & 7 deletions src/Tests/ControlTests/testoutputs/SimpleControlTests.Literal_ClientServerRendering.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<head></head>
<body>

<!-- literal syntax, client rendering -->
<span data-bind="text: dotvvm.globalize.bindingNumberToString(int)() + &quot;\n &quot; + dotvvm.globalize.bindingNumberToString(float)() + &quot;\n &quot; + (dotvvm.globalize.bindingDateToString(date)() ?? &quot;&quot;) + &quot;\n &quot; + (NullableString() ?? &quot;&quot;)"></span>
<!-- literal syntax, client rendering --> sv
<span data-bind="text: dotvvm.globalize.bindingNumberToString(int)() + &quot;\n &quot; + dotvvm.globalize.bindingNumberToString(float)() + &quot;\n &quot; + (dotvvm.globalize.bindingDateToString(date)() ?? &quot;&quot;) + &quot;\n &quot; + (NullableString() ?? &quot;&quot;)"></span>

<!-- literal syntax, server rendering -->
<span data-bind="text: dotvvm.globalize.bindingNumberToString(int)() + &quot;\n &quot; + dotvvm.globalize.bindingNumberToString(float)() + &quot;\n &quot; + (dotvvm.globalize.bindingDateToString(date)() ?? &quot;&quot;) + &quot;\n &quot; + (NullableString() ?? &quot;&quot;)">10000000 0.11111 8/11/2020 4:01:44 PM
<span data-bind="text: dotvvm.globalize.bindingNumberToString(int)() + &quot;\n &quot; + dotvvm.globalize.bindingNumberToString(float)() + &quot;\n &quot; + (dotvvm.globalize.bindingDateToString(date)() ?? &quot;&quot;) + &quot;\n &quot; + (NullableString() ?? &quot;&quot;)">10000000 0,11111 2020-08-11 16:01:44
</span>

<!-- control syntax, client rendering -->
Expand All @@ -19,8 +19,8 @@
<!-- control syntax, server rendering -->
<span>
<span data-bind="text: int">10000000</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;&quot;, float, &quot;double&quot;)">0.11111</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;&quot;, date, &quot;datetime&quot;)">8/11/2020 4:01:44 PM</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;&quot;, float, &quot;double&quot;)">0,11111</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;&quot;, date, &quot;datetime&quot;)">2020-08-11 16:01:44</span>
</span>

<!-- control syntax, client rendering, format string -->
Expand All @@ -33,8 +33,8 @@
<!-- control syntax, server rendering, format string -->
<span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;X&quot;, int, &quot;int32&quot;)">989680</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;P2&quot;, float, &quot;double&quot;)">11.11%</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;dddd&quot;, date, &quot;datetime&quot;)">Tuesday</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;P2&quot;, float, &quot;double&quot;)">11,11 %</span>
<span data-bind="text: dotvvm.globalize.formatString(&quot;dddd&quot;, date, &quot;datetime&quot;)">tisdag</span>
</span>
</body>
</html>
4 changes: 2 additions & 2 deletions src/Tests/Runtime/DotvvmControlRenderedHtmlTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void MarkupControl_WrapperTagAndNoWrapperTagDirective()
[TestMethod]
public void Literal_DateTimeToBrowserLocalTime_RenderOnServer()
{
DotvvmTestHelper.RunInCulture(new CultureInfo("en-US"), () =>
DotvvmTestHelper.RunInCulture(new CultureInfo("sv"), () =>
{
var vm = new LiteralDateTimeViewModel();
var control = $@"@viewModel {vm.GetType().FullName}
Expand All @@ -207,7 +207,7 @@ public void Literal_DateTimeToBrowserLocalTime_RenderOnServer()
var context = CreateContext(vm);
var html = InvokeLifecycleAndRender(dotvvmBuilder.BuildView(context), context);

Assert.AreEqual(@"<span>1/2/2021 3:04:05 AM</span><span>1/2/2021 3:04:05 AM</span>", html);
Assert.AreEqual(@"<span>2021-01-02 03:04:05</span><span>2021-01-02 03:04:05</span>", html);
});
}

Expand Down
Loading