Improved string representation of AppManagerOptions

MADE-Apps · Jun 18, 2021 · e699e8a · e699e8a
1 parent 9e485e1
commit e699e8a
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 4 deletions.
diff --git a/src/Legerity.Core/Android/AndroidAppManagerOptions.cs b/src/Legerity.Core/Android/AndroidAppManagerOptions.cs
@@ -1,6 +1,7 @@
 namespace Legerity.Android
 {
     using System;
+    using System.Collections.Generic;
     using OpenQA.Selenium.Appium;
     using OpenQA.Selenium.Appium.Enums;
 
@@ -270,7 +271,34 @@ public void Configure((string, object)[] additionalOptions)
         /// <returns>A string that represents the current object.</returns>
         public override string ToString()
         {
-            return $"{base.ToString()}, App ID [{this.AppId}]";
+            return $"Platform [Android], {base.ToString()}, {this.GetOptionDetails()}";
+        }
+
+        private string GetOptionDetails()
+        {
+            var options = new List<string>();
+
+            if (!string.IsNullOrWhiteSpace(this.AppId))
+            {
+                options.Add($"App ID [{this.AppId}]");
+            }
+
+            if (!string.IsNullOrWhiteSpace(this.AppPath))
+            {
+                options.Add($"App Path [{this.AppPath}]");
+            }
+
+            if (!string.IsNullOrWhiteSpace(this.DeviceId))
+            {
+                options.Add($"Device ID [{this.DeviceId}]");
+            }
+
+            if (!string.IsNullOrWhiteSpace(this.DeviceName))
+            {
+                options.Add($"Device Name [{this.DeviceName}]");
+            }
+
+            return string.Join(", ", options);
         }
     }
 }
diff --git a/src/Legerity.Core/IOS/IOSAppManagerOptions.cs b/src/Legerity.Core/IOS/IOSAppManagerOptions.cs
@@ -1,5 +1,6 @@
 namespace Legerity.IOS
 {
+    using System.Collections.Generic;
     using OpenQA.Selenium.Appium;
     using OpenQA.Selenium.Appium.Enums;
 
@@ -119,7 +120,29 @@ public void Configure((string, object)[] additionalOptions)
         /// <returns>A string that represents the current object.</returns>
         public override string ToString()
         {
-            return $"{base.ToString()}, App ID [{this.AppId}]";
+            return $"Platform [IOS], {base.ToString()}, {this.GetOptionDetails()}";
+        }
+
+        private string GetOptionDetails()
+        {
+            var options = new List<string>();
+
+            if (!string.IsNullOrWhiteSpace(this.AppId))
+            {
+                options.Add($"App ID [{this.AppId}]");
+            }
+
+            if (!string.IsNullOrWhiteSpace(this.DeviceId))
+            {
+                options.Add($"Device ID [{this.DeviceId}]");
+            }
+
+            if (!string.IsNullOrWhiteSpace(this.DeviceName))
+            {
+                options.Add($"Device Name [{this.DeviceName}]");
+            }
+
+            return string.Join(", ", options);
         }
     }
 }
diff --git a/src/Legerity.Core/Web/WebAppManagerOptions.cs b/src/Legerity.Core/Web/WebAppManagerOptions.cs
@@ -1,5 +1,6 @@
 namespace Legerity.Web
 {
+    using System.Collections.Generic;
     using System.Drawing;
 
     /// <summary>
@@ -48,7 +49,19 @@ public WebAppManagerOptions(WebAppDriverType driverType, string driverDirectoryP
         /// <returns>A string that represents the current object.</returns>
         public override string ToString()
         {
-            return $"{base.ToString()}, App URL [{this.Url}]";
+            return $"Platform [{this.DriverType}], {base.ToString()}, {this.GetOptionDetails()}";
+        }
+
+        private string GetOptionDetails()
+        {
+            var options = new List<string>();
+
+            if (!string.IsNullOrWhiteSpace(this.Url))
+            {
+                options.Add($"URL [{this.Url}]");
+            }
+
+            return string.Join(", ", options);
         }
     }
 

diff --git a/src/Legerity.Core/Windows/WindowsAppManagerOptions.cs b/src/Legerity.Core/Windows/WindowsAppManagerOptions.cs
@@ -1,5 +1,6 @@
 namespace Legerity.Windows
 {
+    using System.Collections.Generic;
     using Helpers;
     using OpenQA.Selenium.Appium;
 
@@ -86,7 +87,19 @@ public void Configure((string, object)[] additionalOptions)
         /// <returns>A string that represents the current object.</returns>
         public override string ToString()
         {
-            return $"{base.ToString()}, App ID [{this.AppId}]";
+            return $"Platform [Windows], {base.ToString()}, {this.GetOptionDetails()}";
+        }
+
+        private string GetOptionDetails()
+        {
+            var options = new List<string>();
+
+            if (!string.IsNullOrWhiteSpace(this.AppId))
+            {
+                options.Add($"App ID [{this.AppId}]");
+            }
+
+            return string.Join(", ", options);
         }
     }
 }