From 19049bfea852fc7cf28882e951db9e1fb2d5c284 Mon Sep 17 00:00:00 2001
From: Atanas Korchev <akorchev@gmail.com>
Date: Sat, 26 Nov 2022 08:51:50 +0200
Subject: [PATCH] Fix failing tests.

---
 Radzen.Blazor.Tests/DataGridTests.cs   | 13 ++++++-------
 Radzen.Blazor.Tests/DatePickerTests.cs | 16 ++++++++--------
 Radzen.Blazor.Tests/LinkTests.cs       |  6 ++++--
 Radzen.Blazor.Tests/LoginTests.cs      |  9 +++++++--
 Radzen.Blazor/RadzenLogin.razor.cs     |  6 +++---
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/Radzen.Blazor.Tests/DataGridTests.cs b/Radzen.Blazor.Tests/DataGridTests.cs
index a35f874f..4df77c8f 100644
--- a/Radzen.Blazor.Tests/DataGridTests.cs
+++ b/Radzen.Blazor.Tests/DataGridTests.cs
@@ -74,11 +74,11 @@ namespace Radzen.Blazor.Tests
                 });
             });
 
-            var markup = new Regex(@"\s\s+").Replace(component.Markup, "").Trim();
+            var data = component.FindAll(".rz-cell-data");
 
-            Assert.Contains(@$"<span class=""rz-cell-data"">1</span>", markup);
-            Assert.Contains(@$"<span class=""rz-cell-data"">2</span>", markup);
-            Assert.Contains(@$"<span class=""rz-cell-data"">3</span>", markup);
+            Assert.Equal("1", data[0].TextContent.Trim());
+            Assert.Equal("2", data[1].TextContent.Trim());
+            Assert.Equal("3", data[2].TextContent.Trim());
         }
 
         [Fact]
@@ -99,9 +99,8 @@ namespace Radzen.Blazor.Tests
                 });
             });
 
-            var markup = new Regex(@"\s\s+").Replace(component.Markup, "").Trim();
-
-            Assert.Contains(@$"<span class=""rz-column-title"">MyId</span>", markup);
+            var title = component.Find(".rz-column-title");
+            Assert.Equal("MyId", title.TextContent.Trim());
         }
 
         [Fact]
diff --git a/Radzen.Blazor.Tests/DatePickerTests.cs b/Radzen.Blazor.Tests/DatePickerTests.cs
index 47a026f8..702cc189 100644
--- a/Radzen.Blazor.Tests/DatePickerTests.cs
+++ b/Radzen.Blazor.Tests/DatePickerTests.cs
@@ -49,7 +49,7 @@ namespace Radzen.Blazor.Tests
 
             var component = ctx.RenderComponent<RadzenDatePicker<DateTime>>();
 
-            component.SetParametersAndRender(parameters => { 
+            component.SetParametersAndRender(parameters => {
                 parameters.Add<bool>(p => p.ShowTime, true);
                 parameters.Add<bool>(p => p.ShowSeconds, true);
             });
@@ -93,7 +93,7 @@ namespace Radzen.Blazor.Tests
 
             component.SetParametersAndRender(parameters => {
                 parameters.Add(p => p.DateFormat, format);
-                parameters.Add<object>(p => p.Value, DateTime.Now); 
+                parameters.Add<object>(p => p.Value, DateTime.Now);
             });
 
             Assert.Contains(@$"value=""{string.Format("{0:" + format + "}", DateTime.Now)}""", component.Markup);
@@ -146,7 +146,7 @@ namespace Radzen.Blazor.Tests
 
             component.SetParametersAndRender(parameters => {
                 parameters.Add<object>(p => p.Value, DateTime.Now);
-                parameters.Add<bool>(p => p.AllowClear, true); 
+                parameters.Add<bool>(p => p.AllowClear, true);
             });
 
             Assert.Contains(@$"<i class=""rz-dropdown-clear-icon rzi rzi-times""", component.Markup);
@@ -320,12 +320,12 @@ namespace Radzen.Blazor.Tests
             DateTime previousDay = DateTime.Today.AddDays(-1);
 
             using var ctx = new TestContext();
-            ctx.JSInterop.Mode = JSRuntimeMode.Loose;            
+            ctx.JSInterop.Mode = JSRuntimeMode.Loose;
 
             var component = ctx.RenderComponent<RadzenDatePicker<DateTime>>();
-            
+
             var raised = false;
-            object newValue = null;            
+            object newValue = null;
 
             component.SetParametersAndRender(parameters => {
                 parameters.Add(p => p.ValueChanged, args => { raised = true; newValue = args; })
@@ -378,14 +378,14 @@ namespace Radzen.Blazor.Tests
             Assert.True(raised);
             Assert.Null(newValue);
         }
-        
+
         [Fact]
         public void DatePicker_Respects_DateTimeMaxValue()
         {
             using var ctx = new TestContext();
             ctx.JSInterop.Mode = JSRuntimeMode.Loose;
             ctx.JSInterop.SetupModule("_content/Radzen.Blazor/Radzen.Blazor.js");
-            
+
             var component = ctx.RenderComponent<RadzenDatePicker<DateTime>>(parameters =>
             {
                 parameters.Add(p => p.Value, DateTime.MaxValue);
diff --git a/Radzen.Blazor.Tests/LinkTests.cs b/Radzen.Blazor.Tests/LinkTests.cs
index 7fcee78f..02aad33c 100644
--- a/Radzen.Blazor.Tests/LinkTests.cs
+++ b/Radzen.Blazor.Tests/LinkTests.cs
@@ -30,8 +30,10 @@ namespace Radzen.Blazor.Tests
 
             component.SetParametersAndRender(parameters => parameters.Add(p => p.Text, text));
 
-            Assert.Contains(@$">{text}</span>", component.Markup);
-            Assert.Contains(@$"class=""rz-link-text""", component.Markup);
+            var textElement = component.Find(".rz-link-text");
+
+            Assert.NotNull(textElement);
+            Assert.Equal(text, textElement.TextContent.Trim());
         }
 
         [Fact]
diff --git a/Radzen.Blazor.Tests/LoginTests.cs b/Radzen.Blazor.Tests/LoginTests.cs
index 4c3956a3..88a57d84 100644
--- a/Radzen.Blazor.Tests/LoginTests.cs
+++ b/Radzen.Blazor.Tests/LoginTests.cs
@@ -26,7 +26,12 @@ namespace Radzen.Blazor.Tests
 
             var component = ctx.RenderComponent<RadzenLogin>();
 
-            Assert.Contains(@$"<label class=""rz-label"" for=""username"">Username</label>", component.Markup);
+            component.SetParametersAndRender(p => {
+                p.AddUnmatched("id", "login");
+            });
+
+            var label = component.Find($@"label[for=""login-username""]");
+            Assert.NotNull(label);
         }
 
         [Fact]
@@ -63,7 +68,7 @@ namespace Radzen.Blazor.Tests
             component.SetParametersAndRender(parameters => {
                 parameters.Add(p => p.Username, "user");
                 parameters.Add(p => p.Password, "pwd");
-                parameters.Add(p => p.Login, args => { clicked = true; }); 
+                parameters.Add(p => p.Login, args => { clicked = true; });
             });
 
             component.Find("button").Click();
diff --git a/Radzen.Blazor/RadzenLogin.razor.cs b/Radzen.Blazor/RadzenLogin.razor.cs
index bf0d868e..7005f38e 100644
--- a/Radzen.Blazor/RadzenLogin.razor.cs
+++ b/Radzen.Blazor/RadzenLogin.razor.cs
@@ -200,17 +200,17 @@ namespace Radzen.Blazor
         {
             if (parameters.DidParameterChange(nameof(Username), Username))
             {
-                username = Username;
+                username = parameters.GetValueOrDefault<string>(nameof(Username));
             }
 
             if (parameters.DidParameterChange(nameof(Password), Password))
             {
-                password = Password;
+                password = parameters.GetValueOrDefault<string>(nameof(Password));
             }
 
             if (parameters.DidParameterChange(nameof(RememberMe), RememberMe))
             {
-                rememberMe = RememberMe;
+                rememberMe = parameters.GetValueOrDefault<bool>(nameof(RememberMe));
             }
 
             await base.SetParametersAsync(parameters);