BX-69342: Unit Test expansion

rosette_api/ApiClient.cs

@@ -52,7 +52,7 @@ public class ApiClient : IDisposable
     /// </summary>
     /// <param name="apiKey">Required Rosette API key</param>
     public ApiClient(string apiKey) {
-        ArgumentNullException.ThrowIfNull(apiKey);
+        ArgumentException.ThrowIfNullOrWhiteSpace(apiKey);
         APIKey = apiKey;
         URI = "https://analytics.babelstreet.com/rest/v1/";
         Client = null;
@@ -70,6 +70,14 @@ public ApiClient(string apiKey) {
     /// <param name="urlString">Destination URL string</param>
     /// <returns>RosetteAPI object</returns>
     public ApiClient UseAlternateURL(string urlString) {
+        ArgumentException.ThrowIfNullOrWhiteSpace(urlString);
+
+        // Validate URL format by attempting to create Uri
+        if (!Uri.TryCreate(urlString, UriKind.Absolute, out _))
+        {
+            throw new UriFormatException($"Invalid URL format: {urlString}");
+        }
+
         URI = urlString.EndsWith("/") ? urlString : urlString + "/";
 
         return Prepare();
@@ -82,6 +90,7 @@ public ApiClient UseAlternateURL(string urlString) {
     /// <param name="client">A valid HttpClient</param>
     /// <returns>RosetteAPI object</returns>
     public ApiClient AssignClient(HttpClient client) {
+        ArgumentNullException.ThrowIfNull(client);
         Client = client;
 
         return Prepare();
@@ -131,10 +140,11 @@ public ApiClient SetDebug(bool state=true) {
     /// <param name="headerValue">Value of header</param>
     /// <returns>RosetteAPI object</returns>
     public ApiClient AddCustomHeader(string headerName, string headerValue) {
-        if (!headerName.StartsWith("X-RosetteAPI-", StringComparison.OrdinalIgnoreCase))
+        if (!headerName.StartsWith("X-RosetteAPI-", StringComparison.OrdinalIgnoreCase) ||
+            headerName.Length <= "X-RosetteAPI-".Length)
         {
             throw new ArgumentException(
-                $"Custom header name must begin with 'X-RosetteAPI-'. Provided: {headerName}",
+                $"Custom header name must begin with 'X-RosetteAPI-' and have additional characters. Provided: {headerName}",
                 nameof(headerName));
         }
         if (_customHeaders.ContainsKey(headerName) && headerValue == null) 
@@ -169,7 +179,10 @@ private ApiClient Prepare(bool forceUpdate=false) {
                 });
             _disposeClient = true;
         }
-        Client.Timeout = TimeSpan.FromSeconds(Timeout);
+        // HttpClient.Timeout must be > 0 or Infinite
+        Client.Timeout = Timeout == 0 
+            ? System.Threading.Timeout.InfiniteTimeSpan 
+            : TimeSpan.FromSeconds(Timeout);
 
         if (Client.BaseAddress == null) {
             Client.BaseAddress = new Uri(URI); // base address must be the rosette URI regardless of whether the client is external or internal

rosette_api/Models/JsonConverter/RecordSimilarityFieldConverter.cs

@@ -20,15 +20,6 @@ public override void Write(Utf8JsonWriter writer, RecordSimilarityField value, J
     {
         switch (value)
         {
-            case UnfieldedNameRecord unfieldedName:
-                writer.WriteStringValue(unfieldedName.Text);
-                break;
-            case UnfieldedDateRecord unfieldedDate:
-                writer.WriteStringValue(unfieldedDate.Date);
-                break;
-            case UnfieldedAddressRecord unfieldedAddress:
-                writer.WriteStringValue(unfieldedAddress.Address);
-                break;
             case FieldedNameRecord fieldedName:
                 JsonSerializer.Serialize(writer, fieldedName, options);
                 break;
@@ -38,24 +29,11 @@ public override void Write(Utf8JsonWriter writer, RecordSimilarityField value, J
             case FieldedAddressRecord fieldedAddress:
                 JsonSerializer.Serialize(writer, fieldedAddress, options);
                 break;
-            case NumberRecord numberRecord:
-                writer.WriteNumberValue(numberRecord.Number);
-                break;
-            case BooleanRecord booleanRecord:
-                writer.WriteBooleanValue(booleanRecord.Boolean);
-                break;
-            case StringRecord stringRecord:
-                writer.WriteStringValue(stringRecord.Text);
-                break;
-            case UnknownFieldRecord unknownField:
-                if (unknownField.Data != null)
-                {
-                    unknownField.Data.WriteTo(writer, options);
-                }
-                else
-                {
-                    writer.WriteNullValue();
-                }
+            // Unfielded records are handled by UnfieldedRecordSimilarityConverter
+            case UnfieldedNameRecord or UnfieldedDateRecord or UnfieldedAddressRecord:
+            case NumberRecord or BooleanRecord or StringRecord or UnknownFieldRecord:
+                // Use the UnfieldedRecordSimilarityConverter for these types
+                JsonSerializer.Serialize(writer, value, value.GetType(), options);
                 break;
             default:
                 JsonSerializer.Serialize(writer, value, value.GetType(), options);

rosette_api/Models/JsonConverter/UnfieldedRecordSimilarityConverter.cs

@@ -18,10 +18,13 @@ public UnfieldedRecordSimilarityConverter()
 
     public override bool CanConvert(Type typeToConvert)
     {
-        return typeToConvert == typeof(UnknownFieldRecord) ||
+        return typeToConvert == typeof(UnfieldedNameRecord) ||
+               typeToConvert == typeof(UnfieldedDateRecord) ||
+               typeToConvert == typeof(UnfieldedAddressRecord) ||
                typeToConvert == typeof(NumberRecord) ||
                typeToConvert == typeof(BooleanRecord) ||
-               typeToConvert == typeof(UnfieldedAddressRecord) ||
+               typeToConvert == typeof(StringRecord) ||
+               typeToConvert == typeof(UnknownFieldRecord) ||
                typeToConvert == typeof(object);
     }
 
@@ -31,9 +34,14 @@ public override bool CanConvert(Type typeToConvert)
         {
             JsonTokenType.Number => new NumberRecord { Number = reader.GetDouble() },
             JsonTokenType.True or JsonTokenType.False => new BooleanRecord { Boolean = reader.GetBoolean() },
-            JsonTokenType.String => typeToConvert == typeof(UnfieldedAddressRecord)
-                ? new UnfieldedAddressRecord { Address = reader.GetString() ?? string.Empty }
-                : reader.GetString(),
+            JsonTokenType.String => typeToConvert switch
+            {
+                Type t when t == typeof(UnfieldedNameRecord) => new UnfieldedNameRecord { Text = reader.GetString() ?? string.Empty },
+                Type t when t == typeof(UnfieldedDateRecord) => new UnfieldedDateRecord { Date = reader.GetString() ?? string.Empty },
+                Type t when t == typeof(UnfieldedAddressRecord) => new UnfieldedAddressRecord { Address = reader.GetString() ?? string.Empty },
+                Type t when t == typeof(StringRecord) => new StringRecord { Text = reader.GetString() ?? string.Empty },
+                _ => reader.GetString()
+            },
             JsonTokenType.StartObject => JsonSerializer.Deserialize<UnknownFieldRecord>(ref reader, options),
             _ => null
         };
@@ -43,18 +51,34 @@ public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOp
     {
         switch (value)
         {
+            case UnfieldedNameRecord unfieldedName:
+                writer.WriteStringValue(unfieldedName.Text);
+                break;
+            case UnfieldedDateRecord unfieldedDate:
+                writer.WriteStringValue(unfieldedDate.Date);
+                break;
             case UnfieldedAddressRecord unfieldedAddress:
                 writer.WriteStringValue(unfieldedAddress.Address);
                 break;
-            case UnknownFieldRecord unknownField:
-                JsonSerializer.Serialize(writer, unknownField.Data, options);
-                break;
             case NumberRecord numberRecord:
                 writer.WriteNumberValue(numberRecord.Number);
                 break;
             case BooleanRecord booleanRecord:
                 writer.WriteBooleanValue(booleanRecord.Boolean);
                 break;
+            case StringRecord stringRecord:
+                writer.WriteStringValue(stringRecord.Text);
+                break;
+            case UnknownFieldRecord unknownField:
+                if (unknownField.Data != null)
+                {
+                    unknownField.Data.WriteTo(writer, options);
+                }
+                else
+                {
+                    writer.WriteNullValue();
+                }
+                break;
             case string stringValue:
                 writer.WriteStringValue(stringValue);
                 break;

rosette_api/Utilities.cs

@@ -25,7 +25,7 @@ public static bool DictionaryEquals<TKey, TValue>(this IDictionary<TKey, TValue>
             {
                 return false;
             }
-            if (!kvp.Value.Equals(secondValue))
+            if (!EqualityComparer<TValue>.Default.Equals(kvp.Value, secondValue))
             {
                 return false;
             }