Add HasContent util

saucelabs · Mar 18, 2024 · 8a6fdd6 · 8a6fdd6
1 parent 419f846
commit 8a6fdd6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/visual-dotnet/SauceLabs.Visual/Utils/StringUtils.cs b/visual-dotnet/SauceLabs.Visual/Utils/StringUtils.cs
@@ -0,0 +1,13 @@
+using System.Linq;
+using GraphQL;
+
+namespace SauceLabs.Visual.Utils
+{
+    public static class StringUtils
+    {
+        public static bool HasContent(string? value)
+        {
+            return value != null && value.Trim().Length > 0;
+        }
+    }
+}
diff --git a/visual-dotnet/SauceLabs.Visual/VisualApi.cs b/visual-dotnet/SauceLabs.Visual/VisualApi.cs
@@ -22,7 +22,7 @@ internal class VisualApi<T> : IDisposable where T : IHasCapabilities, IHasSessio
         public VisualApi(T webdriver, Region region, string username, string accessKey, HttpClient? httpClient = null)
         {
 
-            if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(accessKey))
+            if (!StringUtils.HasContent(username) || !StringUtils.HasContent(accessKey))
             {
                 throw new VisualClientException(
                     "Invalid SauceLabs credentials. Please check your SauceLabs username and access key at https://app.saucelabs.com/user-setting");

diff --git a/visual-dotnet/SauceLabs.Visual/VisualClient.cs b/visual-dotnet/SauceLabs.Visual/VisualClient.cs
@@ -66,7 +66,7 @@ public VisualClient(WebDriver wd, Region region, CreateBuildOptions buildOptions
         /// <param name="buildOptions">the options of the build creation</param>
         public VisualClient(WebDriver wd, Region region, string? username, string? accessKey, CreateBuildOptions buildOptions)
         {
-            if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(accessKey))
+            if (!StringUtils.HasContent(username) || !StringUtils.HasContent(accessKey))
             {
                 throw new VisualClientException("Username or Access Key not set");
             }
@@ -155,12 +155,12 @@ private async Task<VisualBuild> FindBuildById(string buildId)
         /// <returns></returns>
         private async Task<VisualBuild?> GetEffectiveBuild(string? buildId, string? customId)
         {
-            if (!string.IsNullOrEmpty(buildId))
+            if (StringUtils.HasContent(buildId))
             {
                 return await FindBuildById(buildId!);
             }
 
-            if (!string.IsNullOrEmpty(customId))
+            if (StringUtils.HasContent(customId))
             {
                 return await TryFindBuildByCustomId(customId!);
             }