Add options and code refactoring

Author: shrinishLT

LambdaTest.Sdk.Utils/SmartUI.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using System.Collections.Generic;
@@ -10,7 +9,7 @@ namespace LambdaTest.Sdk.Utils
 {
     public static class SmartUI
     {
-        private static readonly HttpClient HttpClient = new HttpClient();
+        private static readonly HttpClient HttpClient = new();
         private static readonly ILogger SdkUtilsLogger = Logger.CreateLogger("LambdaTest.Sdk.Utils");
 
         public static async Task<bool> IsSmartUIEnabled()
@@ -47,22 +46,24 @@ public static async Task<string> FetchDomSerializer()
             }
         }
 
-        public static async Task<string> PostSnapshot(DomObject snapshot, string pkg,  object additionalParams = null)
+        public static async Task<string> PostSnapshot(DomObject snapshot, string pkg,  object options = null)
         {
             try
             {     
-                var json = JsonSerializer.Serialize(new
+                object snapshotObject = new
                 {
-                    snapshot = new
-                    {
-                        dom = snapshot.Dom,
-                        name = snapshot.Name,
-                        url = snapshot.Url,
-                    },
-                    testType = pkg
-                });
+                    dom = snapshot.Dom,
+                    name = snapshot.Name,
+                    url = snapshot.Url
+                };
 
+                var jsonObject = new
+                {
+                    snapshot = options != null ? new { dom = snapshot.Dom, name = snapshot.Name, url = snapshot.Url, options } : snapshotObject,
+                    testType = pkg
+                };
 
+                var json = JsonSerializer.Serialize(jsonObject);
                 var content = new StringContent(json, System.Text.Encoding.UTF8, "application/json");
                 var response = await HttpClient.PostAsync($"{Constants.GetSmartUIServerAddress()}/snapshot", content);
                 response.EnsureSuccessStatusCode();
@@ -80,21 +81,6 @@ public static async Task<string> PostSnapshot(DomObject snapshot, string pkg,  o
                 throw new Exception("post snapshot failed", e);
             }
         }
-        static Dictionary<string, object> CreateDictionary(string name, Dictionary<string, object> additionalParams)
-        {
-            var result = new Dictionary<string, object>
-            {
-                { "name", name }
-            };
-
-            // Add the additional parameters to the result dictionary
-            foreach (var kvp in additionalParams)
-            {
-                result[kvp.Key] = kvp.Value;
-            }
-
-            return result;
-        }
         public class DomContent 
         {
             public string html { get; set; } = string.Empty;

LambdaTest.Selenium.Driver/SmartUI.cs

@@ -26,34 +26,40 @@ public static async Task CaptureSnapshot(IWebDriver driver, string name, object?
 
             try
             {
-                var resp = await LambdaTest.Sdk.Utils.SmartUI.FetchDomSerializer();
+                var domSerializerResponse = await LambdaTest.Sdk.Utils.SmartUI.FetchDomSerializer();
 
-                var optionsSer = new JsonSerializerOptions
+                if (domSerializerResponse == null)
                 {
-                    PropertyNameCaseInsensitive = true
-                };
-                var responseObject = JsonSerializer.Deserialize<FetchDomSerializerResponse>(resp, optionsSer);
+                    throw new Exception("Failed to fetch DOM serializer script repsonse.");
+                }
+
+                var domSerializerScript = JsonSerializer.Deserialize<FetchDomSerializerResponse>(domSerializerResponse, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
 
-                if (responseObject?.Data?.Dom == null)
+                if (domSerializerScript?.Data?.Dom == null)
                 {
-                    throw new Exception("Failed to fetch DOM serializer script.");
+                    throw new Exception("Failed to json serialize the DOM serializer script.");
                 }
 
-                string script = responseObject.Data.Dom;
+                string script = domSerializerScript.Data.Dom;
 
                 ((IJavaScriptExecutor)driver).ExecuteScript(script);
 
-                var optionsJson = JsonSerializer.Serialize(options);
+                var optionsJSON = JsonSerializer.Serialize(options);
                 var snapshotScript = @"
-                    var options = " + optionsJson + @";
+                    var options = " + optionsJSON + @";
                     return JSON.stringify({
                         dom: SmartUIDOM.serialize(options),
                         url: document.URL
                     });";
 
-                var domJson = (string)((IJavaScriptExecutor)driver).ExecuteScript(snapshotScript);
+                var domJSON = (string)((IJavaScriptExecutor)driver).ExecuteScript(snapshotScript);
+
+                if (domJSON == null)
+                {
+                    throw new Exception("Failed to capture DOM object.");
+                }
 
-                var domContent = JsonSerializer.Deserialize<DomDeserializerResponse>(domJson, optionsSer);
+                var domContent = JsonSerializer.Deserialize<DomDeserializerResponse>(domJSON, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
 
                 if (domContent == null)
                 {
@@ -73,13 +79,12 @@ public static async Task CaptureSnapshot(IWebDriver driver, string name, object?
                     Url = domContent.Url
                 };
 
-                var resJson = await LambdaTest.Sdk.Utils.SmartUI.PostSnapshot(dom, "lambdatest-selenium-driver", options);
-                SmartUILogger.LogInformation($"HERE IS RES_JSON: {resJson}");
-                var res = JsonSerializer.Deserialize<ApiResponse>(resJson);
+                var apiResponseJSON = await LambdaTest.Sdk.Utils.SmartUI.PostSnapshot(dom, "Lambdatest.Selenium.Driver", options);
+                var apiResponse = JsonSerializer.Deserialize<ApiResponse>(apiResponseJSON);
 
-                if (res?.Data?.Warnings != null && res.Data.Warnings.Count > 0)
+                if (apiResponse?.Data?.Warnings != null && apiResponse.Data.Warnings.Count > 0)
                 {
-                    foreach (var warning in res.Data.Warnings)
+                    foreach (var warning in apiResponse.Data.Warnings)
                     {
                         SmartUILogger.LogWarning(warning);
                     }