test: WebMessageReceived runtime test support for iOS/macOS

3f565437 · Martin Zikmund · 8072eccb · 3f565437
隐藏空白更改
内联并排

Showing with 15 addition and 14 deletion

src/Uno.UI.RuntimeTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs ...eTests/Tests/Microsoft_UI_Xaml_Controls/Given_WebView2.cs +15 -14

未找到文件。
--- 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
@@ -49,42 +49,43 @@ public class Given_WebView2
 		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;
+
+		string message = null;
+		webView.WebMessageReceived += (s, e) =>
+		{
+			message = e.WebMessageAsJson;
+		};
+
 		webView.NavigateToString(
 			"""
 			<html>
-				<body>
+				<head>
 					<script type="text/javascript">
 						function sendMessage(){
 							try{
 								const message = {"some": ['values',"in","json",1]};
 										
-								if (typeof chrome !== 'undefined' &&
-									chrome?.webview?.postMessage){
+								if (window.hasOwnProperty("chrome") && chrome?.webview?.postMessage){
 									chrome.webview.postMessage(message);
-								} else if (unoWebMessageHandler){
+								} else if (window.hasOwnProperty("unoWebMessageHandler")){
 									unoWebMessageHandler?.postMessage(JSON.stringify(message));
+								} else if (window.hasOwnProperty("webkit") && webkit?.messageHandlers?.unoWebView?.postMessage){
+									webkit.messageHandlers.unoWebView.postMessage(JSON.stringify(message));
 								}
 							}
 							catch (ex){
-								alert("wtf" + ex);
+								alert("Error occurred: " + ex);
 							}
 						}
 					</script>
+				</head>
+				<body onload="sendMessage();">
 					<div id='test' style='width: 100px; height: 100px; background-color: blue;' />
 				</body>
 			</html>
 			""");
-		await TestServices.WindowHelper.WaitFor(() => navigated);
-		string message = null;
-		webView.WebMessageReceived += (s, e) =>
-		{
-			message = e.WebMessageAsJson;
-		};
-		await webView.ExecuteScriptAsync("sendMessage()");

 		await TestServices.WindowHelper.WaitFor(() => message is not null);