- Fixed a test that incorrectly consumes an exception when it shouldn't.

- Added diagnostics to Enclave tests that are failing to help diagnose the issues.

Author: paulmedynski

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/VirtualSecureModeEnclaveProvider.cs

@@ -153,7 +153,7 @@ public AttestationInfo(byte[] attestationInfo)
             EnclaveDHInfo = new EnclaveDiffieHellmanInfo(attestationInfo, offset);
             offset += Convert.ToInt32(EnclaveDHInfo.Size);
 
-            Debug.Assert(offset == attestationInfo.Length);
+            Debug.Assert(offset == attestationInfo.Length, $"{offset} == {attestationInfo.Length}");
         }
     }
 

src/Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/ApiShould.cs

@@ -559,6 +559,10 @@ public void TestExecuteNonQuery(string connection, bool isAsync)
                                 tryagain = true;
                                 break;
                             }
+                            else
+                            {
+                                throw;
+                            }
                         }
                         Assert.Equal(numberOfRows, rowsAffected);
                         tryagain = false;
@@ -3150,10 +3154,22 @@ private void TestCancellationToken(FieldInfo failpoint, SqlCommand sqlCommand, i
             }
             catch (AggregateException aggregateException)
             {
+                bool unexpected = false;
                 foreach (Exception ex in aggregateException.InnerExceptions)
                 {
-                    Assert.True(ex is SqlException, @"cancelling a command through cancellation token resulted in unexpected exception.");
-                    Assert.True(@"Operation cancelled by user." == ex.Message, @"cancelling a command through cancellation token resulted in unexpected error message.");
+                    if (ex is not SqlException)
+                    {
+                        unexpected = true;
+                        Console.WriteLine($"Cancellation produced non-SqlException: {ex}");
+                    }
+                    else
+                    {
+                        Assert.True(@"Operation cancelled by user." == ex.Message, @"cancelling a command through cancellation token resulted in unexpected error message.");
+                    }
+                }
+                if (unexpected)
+                {
+                    Assert.Fail("Unexpected exceptions encountered; see console for details.");
                 }
             }