test: Add additional test to cover WebView-specific behavior on InvokeScriptAsync

0b526e70 · Martin Zikmund · 4c936569 · 0b526e70 · 0b526e70
2 changed file
--- a/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs
@@ -84,6 +84,47 @@ public class Given_WebView2
 		Assert.AreEqual("{\"color\":\"red\"}", color);
 	}

+	[TestMethod]
+	public async Task When_ExecuteScriptAsync_String()
+	{
+		var border = new Border();
+		var webView = new WebView2();
+		webView.Width = 200;
+		webView.Height = 200;
+		border.Child = webView;
+		TestServices.WindowHelper.WindowContent = border;
+		bool navigated = false;
+		await TestServices.WindowHelper.WaitForLoaded(border);
+		await webView.EnsureCoreWebView2Async();
+		webView.NavigationCompleted += (sender, e) => navigated = true;
+		webView.NavigateToString("<html></html>");
+		await TestServices.WindowHelper.WaitFor(() => navigated);
+		var script = "(1 + 1).toString()";
+
+		var result = await webView.ExecuteScriptAsync($"eval(\"{script}\")");
+		Assert.AreEqual("\"2\"", result);
+	}
+
+	[TestMethod]
+	public async Task When_ExecuteScriptAsync_Non_String()
+	{
+		var border = new Border();
+		var webView = new WebView2();
+		webView.Width = 200;
+		webView.Height = 200;
+		border.Child = webView;
+		TestServices.WindowHelper.WindowContent = border;
+		bool navigated = false;
+		await TestServices.WindowHelper.WaitForLoaded(border);
+		await webView.EnsureCoreWebView2Async();
+		webView.NavigationCompleted += (sender, e) => navigated = true;
+		webView.NavigateToString("<html></html>");
+		await TestServices.WindowHelper.WaitFor(() => navigated);
+		var script = "(1 + 1)";
+
+		var result = await webView.ExecuteScriptAsync($"eval(\"{script}\")");
+		Assert.AreEqual("2", result);
+	}

 	[TestMethod]
 	public async Task When_WebMessageReceived()

--- a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_WebView.cs
+++ b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_WebView.cs
@@ -72,5 +72,45 @@ public class Given_WebView

 		Assert.AreEqual("red", color);
 	}
+
+	[TestMethod]
+	public async Task When_ExecuteScriptAsync_String()
+	{
+		var border = new Border();
+		var webView = new WebView();
+		webView.Width = 200;
+		webView.Height = 200;
+		border.Child = webView;
+		TestServices.WindowHelper.WindowContent = border;
+		bool navigated = false;
+		await TestServices.WindowHelper.WaitForLoaded(border);
+		webView.NavigationCompleted += (sender, e) => navigated = true;
+		webView.NavigateToString("<html></html>");
+		await TestServices.WindowHelper.WaitFor(() => navigated);
+		var script = "(1 + 1).toString()";
+
+		var result = await webView.InvokeScriptAsync("eval", new[] { script });
+		Assert.AreEqual("2", result);
+	}
+
+	[TestMethod]
+	public async Task When_ExecuteScriptAsync_Non_String()
+	{
+		var border = new Border();
+		var webView = new WebView();
+		webView.Width = 200;
+		webView.Height = 200;
+		border.Child = webView;
+		TestServices.WindowHelper.WindowContent = border;
+		bool navigated = false;
+		await TestServices.WindowHelper.WaitForLoaded(border);
+		webView.NavigationCompleted += (sender, e) => navigated = true;
+		webView.NavigateToString("<html></html>");
+		await TestServices.WindowHelper.WaitFor(() => navigated);
+		var script = "(1 + 1)";
+
+		var result = await webView.InvokeScriptAsync("eval", new[] { script });
+		Assert.AreEqual("", result);
+	}
 }
 #endif