Fixed TextBox format test

riganti · May 22, 2021 · 4bc6a6d · 4bc6a6d
1 parent a08630f
commit 4bc6a6d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/DotVVM.Samples.Common/ViewModels/ControlSamples/TextBox/TextBoxFormatViewModel.cs b/src/DotVVM.Samples.Common/ViewModels/ControlSamples/TextBox/TextBoxFormatViewModel.cs
@@ -1,10 +1,15 @@
 using System;
+using System.Threading;
 using DotVVM.Framework.Hosting;
 
 namespace DotVVM.Samples.BasicSamples.ViewModels.ControlSamples.TextBox
 {
     public class TextBoxFormatViewModel : QueryStringLocalizableViewModel
     {
+        public TextBoxFormatViewModel()
+        {
+            BindingNumberValueNString = 0.ToString("N", Thread.CurrentThread.CurrentCulture);
+        }
         public DateTime DateValue { get; set; } = DateTime.Parse("2015-12-27T00:00:00.0000000");
         public DateTime? NullableDateValue { get; set; } = DateTime.Parse("2015-12-27T00:00:00.0000000");
         public double NumberValue { get; set; } = 123.123456789;
@@ -16,11 +21,13 @@ public class TextBoxFormatViewModel : QueryStringLocalizableViewModel
         public string DateResult3 => $"{DateTime.Parse("2018-01-01T00:00:00.0000000"):d}";
 
         public double BindingNumberValue { get; set; }
+        public string BindingNumberValueNString { get; set; }
         public double ResultNumberValue { get; set; }
 
         public void ChangedNumberValue()
         {
             ResultNumberValue = BindingNumberValue;
+            BindingNumberValueNString = BindingNumberValue.ToString("N", Thread.CurrentThread.CurrentCulture);
         }
     }
 }
diff --git a/src/DotVVM.Samples.Common/Views/ControlSamples/TextBox/TextBox_Format.dothtml b/src/DotVVM.Samples.Common/Views/ControlSamples/TextBox/TextBox_Format.dothtml
@@ -101,6 +101,7 @@
                      ClientIDMode="Static"
                      Text="{value: ResultNumberValue}">
         </dot:Literal>
+        <span ID="bindingNumberValueNString">{{value: BindingNumberValueNString}}</span>
     </p>
     <div>
         <h3>Switch language</h3>

diff --git a/src/DotVVM.Samples.Common/Views/ControlSamples/TextBox/TextBox_Format_Binding.dothtml b/src/DotVVM.Samples.Common/Views/ControlSamples/TextBox/TextBox_Format_Binding.dothtml
@@ -93,6 +93,7 @@
                      ClientIDMode="Static"
                      Text="{value: ResultNumberValue}">
         </dot:Literal>
+        <span ID="bindingNumberValueNString">{{value: BindingNumberValueNString}}</span>
     </p>
     <div>
         <h3>Switch language</h3>

diff --git a/src/DotVVM.Samples.Tests/Control/TextBoxTests.cs b/src/DotVVM.Samples.Tests/Control/TextBoxTests.cs
@@ -237,7 +237,8 @@ void ClearInput(IElementWrapper element)
                 IElementWrapper numberTextbox = null;
                 IElementWrapper numberValueText = null;
                 numberTextbox = browser.First("#bindingNumberFormatTextbox");
-                AssertUI.Attribute(numberTextbox, "value", 0.ToString("N", culture));
+                Func<string> referenceFormat = () => browser.First("#bindingNumberValueNString").GetText().Trim();
+                AssertUI.Attribute(numberTextbox, "value", referenceFormat());
 
                 numberValueText = browser.First("#resultNumberValueText");
                 AssertUI.InnerTextEquals(numberValueText, 0.ToString(culture));
@@ -250,7 +251,7 @@ void ClearInput(IElementWrapper element)
 
                 // check new values
                 AssertUI.InnerTextEquals(numberValueText, 42.ToString(culture));
-                AssertUI.Attribute(numberTextbox, "value", 42.ToString("N", culture));
+                AssertUI.Attribute(numberTextbox, "value", referenceFormat());
 
                 // send new values
                 ClearInput(numberTextbox);
@@ -260,7 +261,7 @@ void ClearInput(IElementWrapper element)
 
                 // check new values
                 AssertUI.InnerTextEquals(numberValueText, 123.456789.ToString(culture));
-                AssertUI.Attribute(numberTextbox, "value", 123.456789.ToString("N", culture));
+                AssertUI.Attribute(numberTextbox, "value", referenceFormat());
             });
         }