Test - Add Test to verify workaround for issue #3470

amaitland · amaitland · commit d5c74771f142 · 2021-04-06T13:12:44.000+10:00
diff --git a/CefSharp.Example/CefExample.cs b/CefSharp.Example/CefExample.cs
@@ -38,6 +38,7 @@ public static class CefExample
         public const string DragDropCursorsTestUrl = BaseUrl + "/DragDropCursorsTest.html";
         public const string CssAnimationTestUrl = BaseUrl + "/CssAnimationTest.html";
         public const string CdmSupportTestUrl = BaseUrl + "/CdmSupportTest.html";
+        public const string HelloWorldUrl = BaseUrl + "/HelloWorld.html";
         public const string BindingApiCustomObjectNameTestUrl = BaseUrl + "/BindingApiCustomObjectNameTest.html";
         public const string TestResourceUrl = "http://test/resource/load";
         public const string RenderProcessCrashedUrl = "http://processcrashed";
diff --git a/CefSharp.Example/CefSharp.Example.csproj b/CefSharp.Example/CefSharp.Example.csproj
@@ -163,6 +163,7 @@
     <Content Include="Resources\BindingApiCustomObjectNameTest.html" />
     <Content Include="Resources\BindingTestSingle.html" />
     <Content Include="Resources\DragDropCursorsTest.html" />
+    <Content Include="Resources\HelloWorld.html" />
     <Content Include="Resources\JavascriptCallbackTest.html" />
     <Content Include="Resources\LegacyBindingTest.html" />
     <Content Include="Resources\CdmSupportTest.html" />
diff --git a/CefSharp.Example/CefSharpSchemeHandlerFactory.cs b/CefSharp.Example/CefSharpSchemeHandlerFactory.cs
@@ -59,7 +59,8 @@ static CefSharpSchemeHandlerFactory()
                 { "/UnocodeExampleEqualTo32kb.html", Resources.UnocodeExampleEqualTo32kb },
                 { "/JavascriptCallbackTest.html", Resources.JavascriptCallbackTest },
                 { "/BindingTestsAsyncTask.html", Resources.BindingTestsAsyncTask },
-                { "/BindingApiCustomObjectNameTest.html", Resources.BindingApiCustomObjectNameTest }
+                { "/BindingApiCustomObjectNameTest.html", Resources.BindingApiCustomObjectNameTest },
+                { "/HelloWorld.html", Resources.HelloWorld }
             };
         }
 
diff --git a/CefSharp.Example/Properties/Resources.Designer.cs b/CefSharp.Example/Properties/Resources.Designer.cs
diff --git a/CefSharp.Example/Properties/Resources.resx b/CefSharp.Example/Properties/Resources.resx
@@ -232,4 +232,7 @@
   <data name="BindingTestNetCore" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\BindingTestNetCore.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="HelloWorld" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\HelloWorld.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
 </root>
diff --git a/CefSharp.Example/Resources/HelloWorld.html b/CefSharp.Example/Resources/HelloWorld.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+    <title>Hello World</title>
+</head>
+<body>
+    <p>Hello World</p>
+</body>
+</html>
diff --git a/CefSharp.Test/JavascriptBinding/IntegrationTestFacts.cs b/CefSharp.Test/JavascriptBinding/IntegrationTestFacts.cs
@@ -4,8 +4,10 @@
 
 using System.Diagnostics;
 using System.Threading.Tasks;
+using CefSharp.Event;
 using CefSharp.Example;
 using CefSharp.Example.JavascriptBinding;
+using CefSharp.Internals;
 using CefSharp.OffScreen;
 using Xunit;
 using Xunit.Abstractions;
@@ -157,5 +159,26 @@ public async Task JsBindingRenderProcessId(string script)
                 }
             }
         }
+
+        [Fact]
+        //Issue https://github.com/cefsharp/CefSharp/issues/3470
+        //Verify workaround passes
+        public async Task CanCallCefSharpBindObjectAsyncWithoutParams()
+        {
+            using (var browser = new ChromiumWebBrowser(CefExample.HelloWorldUrl))
+            {
+                await browser.LoadPageAsync();
+
+                //TODO: See if we can avoid GetAwaiter().GetResult()
+                var evt = Assert.Raises<JavascriptBindingEventArgs>(
+                    x => browser.JavascriptObjectRepository.ResolveObject += x,
+                    y => browser.JavascriptObjectRepository.ResolveObject -= y,
+                    () => { browser.EvaluateScriptAsync("CefSharp.BindObjectAsync({ IgnoreCache: true });").GetAwaiter().GetResult(); });
+
+                Assert.NotNull(evt);
+
+                Assert.Equal(JavascriptObjectRepository.AllObjects, evt.Arguments.ObjectName);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ static CefSharpSchemeHandlerFactory()`
`59`	`59`	`{ "/UnocodeExampleEqualTo32kb.html", Resources.UnocodeExampleEqualTo32kb },`
`60`	`60`	`{ "/JavascriptCallbackTest.html", Resources.JavascriptCallbackTest },`
`61`	`61`	`{ "/BindingTestsAsyncTask.html", Resources.BindingTestsAsyncTask },`
`62`		`- { "/BindingApiCustomObjectNameTest.html", Resources.BindingApiCustomObjectNameTest }`
	`62`	`+ { "/BindingApiCustomObjectNameTest.html", Resources.BindingApiCustomObjectNameTest },`
	`63`	`+ { "/HelloWorld.html", Resources.HelloWorld }`
`63`	`64`	`};`
`64`	`65`	`}`
`65`	`66`