Skip to content

Make unit test data culture invariant. #390

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

Open
Daniel-Walther wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Make unit test data culture invariant. #390

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/Test/TestCases.Workflows/TestXamls/SalaryCalculation.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<Variable x:TypeArguments="mswe:Employee" Default="[New Employee(&quot;Frank&quot;, &quot;Kimono&quot;, 89000.0)]" Name="Employee2" />
<Variable x:TypeArguments="mswe:SalaryStats" Default="[New SalaryStats()]" Name="SalaryStats" />
</Sequence.Variables>
<WriteLine Text="[Employee1.FirstName &amp; &quot; &quot; &amp; Employee1.LastName &amp; &quot; earns &quot; &amp; Employee1.Salary.ToString(&quot;$0.00&quot;)]" />
<WriteLine Text="[Employee2.FirstName &amp; &quot; &quot; &amp; Employee2.LastName &amp; &quot; earns &quot; &amp; Employee2.Salary.ToString(&quot;$0.00&quot;)]" />
<WriteLine Text="[Employee1.FirstName &amp; &quot; &quot; &amp; Employee1.LastName &amp; &quot; earns &quot; &amp; Employee1.Salary.ToString(&quot;$0.00&quot;, System.Globalization.CultureInfo.InvariantCulture)]" />
<WriteLine Text="[Employee2.FirstName &amp; &quot; &quot; &amp; Employee2.LastName &amp; &quot; earns &quot; &amp; Employee2.Salary.ToString(&quot;$0.00&quot;, System.Globalization.CultureInfo.InvariantCulture)]" />
<Assign>
<Assign.To>
<OutArgument x:TypeArguments="x:Double">[SalaryStats.MinSalary]</OutArgument>
Expand All @@ -37,6 +37,6 @@
<InArgument x:TypeArguments="x:Double">[(Employee1.Salary + Employee2.Salary) / 2.0]</InArgument>
</Assign.Value>
</Assign>
<WriteLine Text="[String.Format(&quot;Salary statistics: minimum salary is {0:$0.00}, maximum salary is {1:$0.00}, average salary is {2:$0.00}&quot;, SalaryStats.MinSalary, SalaryStats.MaxSalary, SalaryStats.AvgSalary)]" />
<WriteLine Text="[String.Format(&quot;Salary statistics: minimum salary is {0}, maximum salary is {1}, average salary is {2}&quot;, SalaryStats.MinSalary.ToString(&quot;$0.00&quot;, System.Globalization.CultureInfo.InvariantCulture), SalaryStats.MaxSalary.ToString(&quot;$0.00&quot;, System.Globalization.CultureInfo.InvariantCulture), SalaryStats.AvgSalary.ToString(&quot;$0.00&quot;, System.Globalization.CultureInfo.InvariantCulture))]" />
</Sequence>
</Activity>
31 changes: 19 additions & 12 deletions src/Test/TestCases.Workflows/WF4Samples/Expressions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Activities.XamlIntegration;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
Expand Down Expand Up @@ -256,8 +257,8 @@ static Activity FuncCodeOnlyWorkflow() => CreateSequence(
CreateVariable(name: "SalaryStats", @default: ctx => new SalaryStats()),
CreateVariable<double>(name: "average")},
activities: new Activity[]{
CreateWriteLine(text: ctx => ctx.GetValue<Employee>("Employee1").FirstName + " " + ctx.GetValue<Employee>("Employee1").LastName + " earns " + ctx.GetValue<Employee>("Employee1").Salary.ToString("$0.00")),
CreateWriteLine(text: ctx => ctx.GetValue<Employee>("Employee2").FirstName + " " + ctx.GetValue<Employee>("Employee2").LastName + " earns " + ctx.GetValue<Employee>("Employee2").Salary.ToString("$0.00")),
CreateWriteLine(text: ctx => ctx.GetValue<Employee>("Employee1").FirstName + " " + ctx.GetValue<Employee>("Employee1").LastName + " earns " + ctx.GetValue<Employee>("Employee1").Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
CreateWriteLine(text: ctx => ctx.GetValue<Employee>("Employee2").FirstName + " " + ctx.GetValue<Employee>("Employee2").LastName + " earns " + ctx.GetValue<Employee>("Employee2").Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
CreateAssign(to: (OutArgument<double>)new FuncReference<SalaryStats, double>("SalaryStats", s => s.MinSalary, (s, value) =>
{
s.MinSalary = value;
Expand All @@ -275,8 +276,10 @@ static Activity FuncCodeOnlyWorkflow() => CreateSequence(
}), value: (InArgument<double>)(Func<ActivityContext, double>)(ctx => (ctx.GetValue<Employee>("Employee1").Salary + ctx.GetValue<Employee>("Employee2").Salary) / 2.0)),
CreateAssign(to: (OutArgument<double>)new Reference<double>("average"), value: (InArgument<double>)(Func<ActivityContext, double>)
(ctx => ctx.GetValue<SalaryStats>("SalaryStats").AvgSalary)),
CreateWriteLine(text: ctx => string.Format("Salary statistics: minimum salary is {0:$0.00}, maximum salary is {1:$0.00}, average salary is {2:$0.00}",
ctx.GetValue<SalaryStats>("SalaryStats").MinSalary, ctx.GetValue<SalaryStats>("SalaryStats").MaxSalary, ctx.GetValue<SalaryStats>("SalaryStats").AvgSalary))});
CreateWriteLine(text: ctx => string.Format("Salary statistics: minimum salary is {0}, maximum salary is {1}, average salary is {2}",
ctx.GetValue<SalaryStats>("SalaryStats").MinSalary.ToString("$0.00", CultureInfo.InvariantCulture),
ctx.GetValue<SalaryStats>("SalaryStats").MaxSalary.ToString("$0.00", CultureInfo.InvariantCulture),
ctx.GetValue<SalaryStats>("SalaryStats").AvgSalary.ToString("$0.00", CultureInfo.InvariantCulture)))});
static Variable<T> CreateVariable<T>(string name = null, Func<ActivityContext, T> @default = null)
{
var variable = new Variable<T>();
Expand Down Expand Up @@ -402,11 +405,11 @@ private Activity CreateCodeOnlyWorkflow()
{
new WriteLine()
{
Text = new LambdaValue<string>(ctx => e1.Get(ctx).FirstName + " " + e1.Get(ctx).LastName + " earns " + e1.Get(ctx).Salary.ToString("$0.00")),
Text = new LambdaValue<string>(ctx => e1.Get(ctx).FirstName + " " + e1.Get(ctx).LastName + " earns " + e1.Get(ctx).Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
},
new WriteLine()
{
Text = new LambdaValue<string>(ctx => e2.Get(ctx).FirstName + " " + e2.Get(ctx).LastName + " earns " + e2.Get(ctx).Salary.ToString("$0.00")),
Text = new LambdaValue<string>(ctx => e2.Get(ctx).FirstName + " " + e2.Get(ctx).LastName + " earns " + e2.Get(ctx).Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
},
new Assign<double>()
{
Expand All @@ -426,8 +429,10 @@ private Activity CreateCodeOnlyWorkflow()
new WriteLine()
{
Text = new LambdaValue<string>(ctx => String.Format(
"Salary statistics: minimum salary is {0:$0.00}, maximum salary is {1:$0.00}, average salary is {2:$0.00}",
stats.Get(ctx).MinSalary, stats.Get(ctx).MaxSalary, stats.Get(ctx).AvgSalary))
"Salary statistics: minimum salary is {0}, maximum salary is {1}, average salary is {2}",
stats.Get(ctx).MinSalary.ToString("$0.00", CultureInfo.InvariantCulture),
stats.Get(ctx).MaxSalary.ToString("$0.00", CultureInfo.InvariantCulture),
stats.Get(ctx).AvgSalary.ToString("$0.00", CultureInfo.InvariantCulture)))
}
},
};
Expand Down Expand Up @@ -458,11 +463,11 @@ private Activity CreateXamlSerializableCodeWorkflow()
{
new WriteLine()
{
Text = ExpressionServices.Convert<string>(ctx => e1.Get(ctx).FirstName + " " + e1.Get(ctx).LastName + " earns " + e1.Get(ctx).Salary.ToString("$0.00")),
Text = ExpressionServices.Convert<string>(ctx => e1.Get(ctx).FirstName + " " + e1.Get(ctx).LastName + " earns " + e1.Get(ctx).Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
},
new WriteLine()
{
Text = ExpressionServices.Convert<string>(ctx => e2.Get(ctx).FirstName + " " + e2.Get(ctx).LastName + " earns " + e2.Get(ctx).Salary.ToString("$0.00")),
Text = ExpressionServices.Convert<string>(ctx => e2.Get(ctx).FirstName + " " + e2.Get(ctx).LastName + " earns " + e2.Get(ctx).Salary.ToString("$0.00", CultureInfo.InvariantCulture)),
},
new Assign<double>()
{
Expand All @@ -482,8 +487,10 @@ private Activity CreateXamlSerializableCodeWorkflow()
new WriteLine()
{
Text = ExpressionServices.Convert<string>(ctx => String.Format(
"Salary statistics: minimum salary is {0:$0.00}, maximum salary is {1:$0.00}, average salary is {2:$0.00}",
stats.Get(ctx).MinSalary, stats.Get(ctx).MaxSalary, stats.Get(ctx).AvgSalary))
"Salary statistics: minimum salary is {0}, maximum salary is {1}, average salary is {2}",
stats.Get(ctx).MinSalary.ToString("$0.00", CultureInfo.InvariantCulture),
stats.Get(ctx).MaxSalary.ToString("$0.00", CultureInfo.InvariantCulture),
stats.Get(ctx).AvgSalary.ToString("$0.00", CultureInfo.InvariantCulture)))
}
},
};
Expand Down