[dotnet] allow RemoteWebDriver to access Selenium logs (#10671)

titusfortner · web-flow · commit 9e53690f4e74 · 2022-05-24T21:42:45.000-05:00
fixes #8229
diff --git a/dotnet/src/webdriver/Logs.cs b/dotnet/src/webdriver/Logs.cs
@@ -16,6 +16,7 @@
 // limitations under the License.
 // </copyright>
 
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
@@ -27,7 +28,6 @@ namespace OpenQA.Selenium
     public class Logs : ILogs
     {
         private WebDriver driver;
-        private bool isLogSupported = false;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RemoteLogs"/> class.
@@ -36,7 +36,6 @@ public class Logs : ILogs
         public Logs(WebDriver driver)
         {
             this.driver = driver;
-            this.isLogSupported = (this.driver as ISupportsLogs) != null;
         }
 
         /// <summary>
@@ -47,7 +46,7 @@ public ReadOnlyCollection<string> AvailableLogTypes
             get
             {
                 List<string> availableLogTypes = new List<string>();
-                if (this.isLogSupported)
+                try
                 {
                     Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAvailableLogTypes, null);
                     object[] responseValue = commandResponse.Value as object[];
@@ -59,6 +58,10 @@ public ReadOnlyCollection<string> AvailableLogTypes
                         }
                     }
                 }
+                catch (NotImplementedException)
+                {
+                    // Swallow for backwards compatibility
+                }
 
                 return availableLogTypes.AsReadOnly();
             }
@@ -73,7 +76,7 @@ public ReadOnlyCollection<string> AvailableLogTypes
         public ReadOnlyCollection<LogEntry> GetLog(string logKind)
         {
             List<LogEntry> entries = new List<LogEntry>();
-            if (this.isLogSupported)
+            try
             {
                 Dictionary<string, object> parameters = new Dictionary<string, object>();
                 parameters.Add("type", logKind);
@@ -92,6 +95,10 @@ public ReadOnlyCollection<LogEntry> GetLog(string logKind)
                     }
                 }
             }
+            catch (NotImplementedException)
+            {
+                // Swallow for backwards compatibility
+            }
 
             return entries.AsReadOnly();
         }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`// limitations under the License.`
`17`	`17`	`// </copyright>`
`18`	`18`
	`19`	`+using System;`
`19`	`20`	`using System.Collections.Generic;`
`20`	`21`	`using System.Collections.ObjectModel;`
`21`	`22`
`@@ -27,7 +28,6 @@ namespace OpenQA.Selenium`
`27`	`28`	`public class Logs : ILogs`
`28`	`29`	`{`
`29`	`30`	`private WebDriver driver;`
`30`		`- private bool isLogSupported = false;`
`31`	`31`
`32`	`32`	`/// <summary>`
`33`	`33`	`/// Initializes a new instance of the <see cref="RemoteLogs"/> class.`
`@@ -36,7 +36,6 @@ public class Logs : ILogs`
`36`	`36`	`public Logs(WebDriver driver)`
`37`	`37`	`{`
`38`	`38`	`this.driver = driver;`
`39`		`- this.isLogSupported = (this.driver as ISupportsLogs) != null;`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`/// <summary>`
`@@ -47,7 +46,7 @@ public ReadOnlyCollection<string> AvailableLogTypes`
`47`	`46`	`get`
`48`	`47`	`{`
`49`	`48`	`List<string> availableLogTypes = new List<string>();`
`50`		`- if (this.isLogSupported)`
	`49`	`+ try`
`51`	`50`	`{`
`52`	`51`	`Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAvailableLogTypes, null);`
`53`	`52`	`object[] responseValue = commandResponse.Value as object[];`
`@@ -59,6 +58,10 @@ public ReadOnlyCollection<string> AvailableLogTypes`
`59`	`58`	`}`
`60`	`59`	`}`
`61`	`60`	`}`
	`61`	`+ catch (NotImplementedException)`
	`62`	`+ {`
	`63`	`+ // Swallow for backwards compatibility`
	`64`	`+ }`
`62`	`65`
`63`	`66`	`return availableLogTypes.AsReadOnly();`
`64`	`67`	`}`
`@@ -73,7 +76,7 @@ public ReadOnlyCollection<string> AvailableLogTypes`
`73`	`76`	`public ReadOnlyCollection<LogEntry> GetLog(string logKind)`
`74`	`77`	`{`
`75`	`78`	`List<LogEntry> entries = new List<LogEntry>();`
`76`		`- if (this.isLogSupported)`
	`79`	`+ try`
`77`	`80`	`{`
`78`	`81`	`Dictionary<string, object> parameters = new Dictionary<string, object>();`
`79`	`82`	`parameters.Add("type", logKind);`
`@@ -92,6 +95,10 @@ public ReadOnlyCollection<LogEntry> GetLog(string logKind)`
`92`	`95`	`}`
`93`	`96`	`}`
`94`	`97`	`}`
	`98`	`+ catch (NotImplementedException)`
	`99`	`+ {`
	`100`	`+ // Swallow for backwards compatibility`
	`101`	`+ }`
`95`	`102`
`96`	`103`	`return entries.AsReadOnly();`
`97`	`104`	`}`