Stricter test

Author: campersau

CefSharp.BrowserSubprocess.Core/JavascriptBindingSettings.h

@@ -21,9 +21,9 @@ namespace CefSharp
             JavascriptBindingSettings()
             {
                 LegacyBindingEnabled = false;
+                JavascriptBindingApiEnabled = true;
                 JavascriptBindingPropertyName = "CefSharp";
                 JavascriptBindingPropertyNameCamelCase = "cefSharp";
-                JavascriptBindingApiEnabled = true;
                 JavascriptBindingApiHasAllowOrigins = false;
                 JavascriptBindingApiAllowOrigins = nullptr;
             }
@@ -39,11 +39,11 @@ namespace CefSharp
             }
 
             property bool LegacyBindingEnabled;
+            property bool JavascriptBindingApiEnabled;
 
             property String^ JavascriptBindingPropertyName;
             property String^ JavascriptBindingPropertyNameCamelCase;
 
-            property bool JavascriptBindingApiEnabled;
             property bool JavascriptBindingApiHasAllowOrigins;
             property CefRefPtr<CefListValue> JavascriptBindingApiAllowOrigins
             {

CefSharp.Test/JavascriptBinding/JavascriptBindingTests.cs

@@ -107,18 +107,51 @@ public async Task ShouldWorkWhenUsingCustomGlobalObjectNameInMultipleBrowsers()
             await browser2.WaitForInitialLoadAsync();
             await browser3.WaitForInitialLoadAsync();
 
-            var result1 = await browser1.EvaluateScriptAsync("typeof window.bindingApiObject1 === 'undefined'");
-            var result2 = await browser2.EvaluateScriptAsync("typeof window.bindingApiObject2 === 'undefined'");
-            var result3 = await browser3.EvaluateScriptAsync("typeof window.cefSharp === 'undefined'");
+            // Assert browser1
+            {
+                var result1 = await browser1.EvaluateScriptAsync("typeof window.bindingApiObject1 === 'undefined'");
+                var result2 = await browser1.EvaluateScriptAsync("typeof window.bindingApiObject2 === 'undefined'");
+                var result3 = await browser1.EvaluateScriptAsync("typeof window.cefSharp === 'undefined'");
+
+                Assert.True(result1.Success, result1.Message);
+                Assert.False((bool)result1.Result);
+
+                Assert.True(result2.Success, result2.Message);
+                Assert.True((bool)result2.Result);
+
+                Assert.True(result3.Success, result3.Message);
+                Assert.True((bool)result3.Result);
+            }
+            // Assert browser2
+            {
+                var result1 = await browser2.EvaluateScriptAsync("typeof window.bindingApiObject1 === 'undefined'");
+                var result2 = await browser2.EvaluateScriptAsync("typeof window.bindingApiObject2 === 'undefined'");
+                var result3 = await browser2.EvaluateScriptAsync("typeof window.cefSharp === 'undefined'");
 
-            Assert.True(result1.Success, result1.Message);
-            Assert.False((bool)result1.Result);
+                Assert.True(result1.Success, result1.Message);
+                Assert.True((bool)result1.Result);
 
-            Assert.True(result2.Success, result2.Message);
-            Assert.False((bool)result2.Result);
+                Assert.True(result2.Success, result2.Message);
+                Assert.False((bool)result2.Result);
 
-            Assert.True(result3.Success, result3.Message);
-            Assert.False((bool)result3.Result);
+                Assert.True(result3.Success, result3.Message);
+                Assert.True((bool)result3.Result);
+            }
+            // Assert browser3
+            {
+                var result1 = await browser3.EvaluateScriptAsync("typeof window.bindingApiObject1 === 'undefined'");
+                var result2 = await browser3.EvaluateScriptAsync("typeof window.bindingApiObject2 === 'undefined'");
+                var result3 = await browser3.EvaluateScriptAsync("typeof window.cefSharp === 'undefined'");
+
+                Assert.True(result1.Success, result1.Message);
+                Assert.True((bool)result1.Result);
+
+                Assert.True(result2.Success, result2.Message);
+                Assert.True((bool)result2.Result);
+
+                Assert.True(result3.Success, result3.Message);
+                Assert.False((bool)result3.Result);
+            }
         }
 
         [Theory]