CosmosNullReferenceException: Refactors CosmosNullReferenceException …

…to pass along InnerException property on parent NullReferenceException (#3713) (#3759) * Passed inner exception details to NullReferenceException ctor when instantiating CosmosNullReferenceException. * Added unit tests. * Addressed PR feedback. Co-authored-by: Abhijeet Mohanty <[email protected]>
Azure · Mar 13, 2023 · 83afe87 · 83afe87
1 parent 55d2d3a
commit 83afe87
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/Resource/CosmosExceptions/CosmosNullReferenceException.cs b/Microsoft.Azure.Cosmos/src/Resource/CosmosExceptions/CosmosNullReferenceException.cs
@@ -25,9 +25,10 @@ internal class CosmosNullReferenceException : NullReferenceException
         /// </summary>
         internal CosmosNullReferenceException(
             NullReferenceException originalException,
-            ITrace trace)
+            ITrace trace) 
+            : base(originalException?.Message ?? throw new ArgumentNullException(nameof(originalException)), originalException ?? throw new ArgumentNullException(nameof(originalException)))
         {
-            this.originalException = originalException ?? throw new ArgumentNullException(nameof(originalException));
+            this.originalException = originalException;
 
             if (trace == null)
             {

diff --git a/...soft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/CosmosNullReferenceExceptionTests.cs b/...soft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/CosmosNullReferenceExceptionTests.cs
@@ -37,9 +37,10 @@ public void CosmosNullRefWrapingTest()
                 trace);
 
             Assert.AreEqual(nullReferenceException.StackTrace, cosmosNullReferenceException.StackTrace);
-            Assert.AreEqual(nullReferenceException.InnerException, cosmosNullReferenceException.InnerException);
+            Assert.AreEqual(nullReferenceException, cosmosNullReferenceException.InnerException);
             Assert.AreEqual(nullReferenceException.Data, cosmosNullReferenceException.Data);
 
+
             Assert.IsTrue(cosmosNullReferenceException.Message.Contains(message));
             Assert.IsTrue(cosmosNullReferenceException.Message.Contains(rootTraceName));
             Assert.AreNotEqual(nullReferenceException.Message, cosmosNullReferenceException.Message);
@@ -48,5 +49,12 @@ public void CosmosNullRefWrapingTest()
             Assert.IsTrue(cosmosToString.Contains(message));
             Assert.IsTrue(cosmosToString.Contains(rootTraceName));
         }
+
+        [TestMethod]
+        [ExpectedException(typeof(ArgumentNullException))]
+        public void ExpectArgumentNullExceptionTest()
+        {
+            _ = new CosmosNullReferenceException(null, NoOpTrace.Singleton);
+        }
     }
 }