[dotnet] Fallback result parsing of script execution to expected type (#11930)

nvborisenko · diemol · web-flow · commit 79e3f9e6f0c2 · 2023-04-24T11:26:35.000+02:00
Fallback result parsing of script execution

Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;
diff --git a/dotnet/src/support/Extensions/WebDriverExtensions.cs b/dotnet/src/support/Extensions/WebDriverExtensions.cs
@@ -101,13 +101,20 @@ public static T ExecuteJavaScript<T>(this IWebDriver driver, string script, para
                     throw new WebDriverException("Script returned null, but desired type is a value type");
                 }
             }
-            else if (!type.IsInstanceOfType(value))
+            else if (type.IsInstanceOfType(value))
             {
-                throw new WebDriverException("Script returned a value, but the result could not be cast to the desired type");
+                result = (T)value;
             }
             else
             {
-                result = (T)value;
+                try
+                {
+                    result = (T)Convert.ChangeType(value, type);
+                }
+                catch(Exception exp)
+                {
+                    throw new WebDriverException("Script returned a value, but the result could not be cast to the desired type", exp);
+                }
             }
 
             return result;

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,20 @@ public static T ExecuteJavaScript<T>(this IWebDriver driver, string script, para`
`101`	`101`	`throw new WebDriverException("Script returned null, but desired type is a value type");`
`102`	`102`	`}`
`103`	`103`	`}`
`104`		`- else if (!type.IsInstanceOfType(value))`
	`104`	`+ else if (type.IsInstanceOfType(value))`
`105`	`105`	`{`
`106`		`- throw new WebDriverException("Script returned a value, but the result could not be cast to the desired type");`
	`106`	`+ result = (T)value;`
`107`	`107`	`}`
`108`	`108`	`else`
`109`	`109`	`{`
`110`		`- result = (T)value;`
	`110`	`+ try`
	`111`	`+ {`
	`112`	`+ result = (T)Convert.ChangeType(value, type);`
	`113`	`+ }`
	`114`	`+ catch(Exception exp)`
	`115`	`+ {`
	`116`	`+ throw new WebDriverException("Script returned a value, but the result could not be cast to the desired type", exp);`
	`117`	`+ }`
`111`	`118`	`}`
`112`	`119`
`113`	`120`	`return result;`